This reverts commit 508ff624fea705eb93cf2cc1e0c9c42cb817acf8. RP
accidentally pulled the wrong commit in, it was supposed to be a
*package*history bbclass change.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Create a new build output history reporting class, using testlab.bbclass
from meta-oe and packagehistory.bbclass as a base. This records information
from packages and images output from the build process in text files
structured suitably for tracking within a git repository, thus enabling
monitoring of changes over time.
Build history collection can be enabled simply by adding the following
to your local.conf:
INHERIT += "buildhistory"
The output after a build can then be found in BUILDHISTORY_DIR (defaults to
TMPDIR/buildhistory). If you set up this directory as a git repository and
set BUILDHISTORY_COMMIT to "1" in local.conf, the build history data will
be committed on every build.
(From OE-Core rev: 508ff624fea705eb93cf2cc1e0c9c42cb817acf8)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Split out a new function get_layers_branch_rev() which returns a list
of the metadata layers and their revisions. This enables reuse in other
places, such as buildhistory.bbclass.
(From OE-Core rev: c1bca5d95051362320008f16d8f5acd87faa34ac)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Based on suggestions from RP
libc-uclibc and libc-glibc overrides are for denoting
system C library in use on the target and not for the
host therefore we make sure that the override only takes
effect for target recipes only.
(From OE-Core rev: 6e2b53f47da0e97271fb51b281d24da1e1d549cc)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the configure script isn't found, report the explicit path tried.
This can help debug subtle errors where the ${S} sourcedir may not
be exactly what is expected.
(From OE-Core rev: 8cdee4c9b8ffcba69134258eff72eede61acd12f)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Condition building PCBIOS legacy images on MACHINE_FEATURES containing "pcbios"
or not containing "efi". This ensures existing BSPs will continue to get the
old PCBIOS legacy-only images. New BSPs can add "efi", "pcbios", or both. The
images created likewise support one or the other or both.
EFI-only ISO images are untested.
(From OE-Core rev: be3fc8c07e84c654f55c5d09934dfbdc7ff7e2b6)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Create a new grub-efi.bbclass and integrate it into bootimg alongside the
syslinux support. This new class uses the output from the grub-efi-native
recipe. Thanks goes to Josef Ahmad <josef.ahmad@intel.com> for the original
build_grub_cfg() routine.
The EFI features are only added to the image if MACHINE_FEATURES contains
"efi". The resulting images are therefor either legacy boot only (like they
were originally) or legacy boot and EFI boot.
A new "dummy.bbclass" was added to allow for the conditional include
of grub-efi. This makes it so if efi support is not to be built in, we
don't spend time building grub-efi-native just because the include adds
the dependency.
There is a bug in the mkdosfs tool from the dosfstools package which causes
it to crash when the directory passed with the -d parameter contains
sub-directories. An /EFI/BOOT directory is required for a proper EFI
installation. Until it is fixed, we install to the top level directory
for the hddimg.
(From OE-Core rev: be95f54495bf9e03062f86b929c66cab6e385a03)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Josef Ahmad <josef.ahmad@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Working towards a more generic bootimg.bbclass, pull out all
syslinux specific bits and let syslinux.bbclass manage them
directly. This introduces no functional changes to the images
constructed and the behavior remains unchanged.
(From OE-Core rev: 1915293688d348a765aa0bcdf01168c9fecd9842)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Separate the construction of the ISO image from that of the hddimg.
This is part of the groundwork for creating a much more flexible
live image builder.
(From OE-Core rev: 2da25c7c6649757350782a939bcc7553c5c86570)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This class currently only works with eglibc. Since
it adds dependencies explicitly on eglibc when using
uclibc this creates problems. So we make sure that
it checks for TCLIBC to determine system C library
in use
(From OE-Core rev: 2278f891a9bd204d82abbd6998cf0921908f1d14)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Complete the bb.data.getVar/setVar replacements with accesses
directly to the data store object.
(From OE-Core rev: 2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The method of resolving the patch should not effect the sstate-cache
signature.
(From OE-Core rev: b64cbe0b511de8d8943ce34cbb4901239d9f0cb0)
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If we just use print, the bitbake logging functions don't see the message
and it can get lost if bitbake is for example logging messages to disk.
(From OE-Core rev: 73a3d0d337e26c2be89c215efb8a2c3dd5d5994d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without these changes, gconf will use the hardcoded backend directory meaning
we can see errors when building if the binary was relocated.
(From OE-Core rev: aaa2a70f7f1b8a299f31626d61d7ea27f29fb9e2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The gconf .m4 files use the path encoded into the gconf-native tools
by default to populate this variable. This doesn't work if we're
relocating the gconf-native binaries. By setting this variable we
ensure that the m4 files always pick up the correct path.
This fixes errors seen on the yocto autobuilder.
(From OE-Core rev: 5680bf11f2e5877782d0101d5b8a5ed24d1ddbce)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Since we clean out do_populate_sysroot if do_configure runs, don't
allow do_populate_sysroot_setscene functions if we're going to
run do_configure.
(From OE-Core rev: 5f1dc1991f97037692193572298eb7f7a5640760)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If rpm-native was built in an alternative location, it may not relocate correctly
unless the rpmpopt and macros paths are explicitly specified.
This fixes errors seen on the Yocto autobuilder where pkgconfig
"provides" entries could disappear leading to image dependency failures.
(From OE-Core rev: fb01bd81197057e62106aac966f9ebc4c5054f97)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* relative links for elf files like ../foo.so ends up in the
debugdir with ../.debug/foo.so, this causes infinite fileaccessloops
fix it by adding an extra "../" to the link path
(From OE-Core rev: 27cf695f1cf259f8c79214e95a0c4bc2c0779b81)
Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this change we can end up looking for <stamp>.${MACHINE}
instead of the expected expanded value.
(From OE-Core rev: 9f743b5033177216fe0e1d3e43ba831f356df08e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this change, dbus-native can end up depending upon base-passwd
for example. This change mirrors the existing nativesdk code.
Based on a patch from Henning Heinold <heinold@inf.fu-berlin.de>
but with some additions from me.
(From OE-Core rev: eba81d1c606ec29ffb793c1cb3cfed9562d552bc)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It's possible to create an "hybrid" iso image that you can both burn
to a CD-Rom and dd to a USB key. isohybrid will create a valid boot
sector for the USB key case.
[YOCTO #1763]
(From OE-Core rev: 321a7dc9d934f31aae27828ff8c56d6c69ecc665)
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If PACKAGE_CLASSES does not set package_rpm as the first item, the root filesystem
will not be generated based on rpm. We need remove rpm/zypper tests against
non-rpm filesystem.
[YOCTO #1757]
(From OE-Core rev: 43adb8dcf4461b68a7ce0ba9d8acdb2012a70416)
Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Occasionally we keep seeing "unable to open temp file" messages during
do_package_write_rpm tasks. This appears to happen when multiple
processes are writing rpm files and is likely due to using the
shared system temp directory. This patch changes the tmp path
to the package work directory meaning conflicts should become
a non-issue.
(From OE-Core rev: b2ef543284c8c8d0d3badb2e1bcadad1106982d2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
x32 abi of x86_64 has 32bit userspace and the kernel is 64bit.
The qa checking code was reporting this as errors for x32 kernel
files and modules.
This commit extends the condition in the checking code to avoid
throwing the bitsize not matched error for x32 kernel files.
(From OE-Core rev: c9963542b17537f18548616c9ad4f1d92f42bffb)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this, if rpmddeps came from a sstate package which was relocated
it might not find its magic file and if that happens, requires/provides
in packages could get corrupted. This leads to failures at rootfs time
during builds with messages like:
libdbus-1.so.3 is needed by libdbus-glib-1-2-0.92-r1.armv5te
since the provides would be missing in the dbus package.
(From OE-Core rev: abe2a948905a997314c61a8fcd35e2b42a3f4408)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* in some cases this could cause circual dependency (ie if we decide to
apr_svn.bb or something like that before subversion-native in dependency
tree), Saul said he had such case, but I wasn't able to reproduce it
here (here it builds subversion-native-1.7.0 fine).
(From OE-Core rev: 820bb7f4a0ced61ae62886bc7c5168151db919ea)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Before this patch, nautilus would fail with:
ERROR: Error executing a python function in /home/connor/angstrom/sources/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb:
NameError: global name 'dgetVar' is not defined
(From OE-Core rev: e7090743df6b38e9ce73743b5bbdd8ab6e9cada4)
Signed-off-by: Connor Abbott <cwabbott0@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently bad recommendations are added to the status file with status
"ok". After a single opkg command, whilst it will ignore the recommendation,
the status changes to "installed" even if the recommended package was not
installed. Whilst this is likely a glitch in opkg's logic, the correct
way to persist the information in the status file is to set the status
to "hold" as deinstall packages with that status remain. With this change
the bad recommendations persist accross multiple opkg runs and the system
behaves as expected.
[YOCTO #1758]
(From OE-Core rev: 215ff6b2e9676c8c7dd8acfd696151bcd0f1490f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Disable script debugging, as the log files become huge and take a
long time to process during the log check step. This results in a
performance improvement.
(From OE-Core rev: a7e70227bac72c4f7d3419f94f6915da4c7e3f43)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[YOCTO #1755]
We change the want the RPM rootfs install works to install pre and post install
scripts. The new method uses a script helper that is invoked by RPM outside
of the normal chroot.
The wrapper is dynamically generated prior to the install starting. It will
check the return code of the script. If the script fails, it will store a copy
to be executed on the first system boot. This is similar to the previous
mechanism.
In addition, a line of debug was added to the scripts as written by package_rpm
to list which package and which script for later debugging, if necessary.
(From OE-Core rev: 3e7120d6a9fd5e46214673d0a6e1085a7314ff42)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We've had the check for dash as /bin/sh for a long time. Dash has been
around long enough now that most major issues have been identified and
fixed from build perspective.
This patch fixes a bashism in the openjade-native recipe. It also
adjusts libtool so that the header at the script is used and not the
value of $SHELL. This is because many Makefiles change $SHELL so dash
can get used to execute what is otherwise configured as a bash shell
script. Since we don't need to execute scripts this way on any system I'm
aware of us building upon, the simplest fix is just to remove $SHELL.
With these two changes the dash check can be removed and we can allow
builds with dash as /bin/sh
(From OE-Core rev: 07ded02ffd37b4fe60a6210dbf56490ea306f0b6)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[Note: I know I need to add the description of the libtool change above
into the prefix.patch]
Without this rootfs generation fails as an RDEPENDS is added
but the package might not have bneen built.
(From OE-Core rev: bfe70c6446e6686f826f01040ba74c7d7d28bf42)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Exclude the addition of user/group code and RDEPENDS changes for
-nativesdk packages.
(From OE-Core rev: 2f057dd905ccb497890ce73ac4e4c256edcf0351)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previously we injected the user/group preinstall script into all
output packages. This fixes that so that only packages listed in
USERADD_PACKAGES get modified.
It also removes the USERADDPN variable, which is no longer needed.
(From OE-Core rev: 2f73466eb5018040a123ccb0e2af8c519525f958)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch pulls in the gnome related classes from oe-core which
adds extra packaging rules and functionality whilst modularising things
so that one can get a subset of gnome functionality without adding a lot
of extra dependencies.
These aren't an exact copy of the classes from meta-openembedded, notable
differences are:
* gnome.bbclass - I dropped the BBCLASSEXTEND
* mime.bbclass:
- updated coding style
- use which to find update-mime-database program rather than hard coded
- fix typo in populate_packges_append such that it's actually called
CC: Koen Kooi <koen@dominion.thruhere.net>
CC: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 6ead00eba265211eae5a2423c155403c8c6d54d0)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Our current assumption (based on the behaviour of opkg) when writing
recipes is that prerm and postrm do not get called during an upgrade.
When using rpm however, these are mapped to the rpm "preun" and "postun"
events which occur after postinst for upgrades, and when these contain
removal type operations (such as update-alternatives --remove) this
causes problems.
This patch wraps each preun and postun script for rpm in a check that
determines whether or not the script is being called during an upgrade,
and skips the entire script if it is, which mimics the behaviour of opkg
under the same conditions.
Fixes [YOCTO #1760]
(From OE-Core rev: 1d3f37dc9a43ba6d6beb7b4530c077f239032b99)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Allows us to import classes only for images and not to the global
namespace
(From OE-Core rev: 49dcb301ab39327554d86d23cf6f8d435d7a7351)
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* without this patch, building dbus-nativesdk leads to a missing
dependency on 'base-passwd-nativesdk'
This was added by commit 46e6c3fa8034b12d178d605f3f5d7efe69671a13
* this patch handle the nativesdk case in the class useradd
* close bug 1702 http://bugzilla.pokylinux.org/show_bug.cgi?id=1702
* v2 from Scott Garman with Richard Purdie's tricks
(From OE-Core rev: 140a3507fb5c14cd9bcebe4304f491aa1c5c47a2)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There should just be a single IMAGE_INSTALL variable. If the package
backends need this split into different multilib components they should
be responsible for doing this, not the user.
This commit removes the MULTILIB_IMAGE_INSTALL variable.
[YOCTO #1564]
(From OE-Core rev: 7736862a74c92fe1afe42e170822be13117575c2)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix bug where only packages named PN included base-passwd in
RDEPENDS.
This fixes [YOCTO #1727]
(From OE-Core rev: 2c55d51afd71d708a54afc8377e10c4f80f810e3)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
