summaryrefslogtreecommitdiffstats
path: root/meta/classes
Commit message (Collapse)AuthorAgeFilesLines
* classes/sstate: avoid traceback when no files have been stagedPaul Eggleton2013-04-031-1/+4
| | | | | | | | | | | | If no files have been staged we want to continue without error instead of showing a traceback. Fixes [YOCTO #4056]. (From OE-Core rev: ca36be708e54c0c86535bc8512295c76c48f6cf5) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_deb.bbclass: fix 'armel' overrideBogdan Marinescu2013-04-031-3/+5
| | | | | | | | | | | | | | | The 'armel' override for DKPG_ARCH was causing the meta-toolchain build to fail. The assignment was moved to an anonymous fragment of Python code, so it doesn't affect the assignments in cross-canadian.bbclass anymore, thus fixing the issue. [YOCTO #4080] (From OE-Core rev: 6f86fe5d66e401377bccd9f635270033b99a9f4b) Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* archiver: fix srpm archiving build errorsKevin Strasser2013-04-034-52/+27
| | | | | | | | | | | | | | | | | | | | srpm archiving doesn't need to be handled as a different case when deciding what archive tasks to add. When srpm is selected as the archiving type, the scripts and logs archive staging directory ${WORKDIR}/script-logs is cleaned, and its contents moved out to ${WORKDIR}. Now that we are including ${WORKDIR}/script-logs in sstate-inputdirs, the directory must be preserved. [YOCTO #4032] (From OE-Core rev: 0c80286a3383b436a0a63a0b00eb357dd9dea4fb) Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* base.bbclass: Update the preferred_ml_updatesMark Hatle2013-04-031-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | When processing the blacklists, we should avoid cross-canadian packages, as they will not have any multilib prefixes to expand. Similarly look for "virtual/nativesdk-" in addition to the existing "nativesdk-". These items should also be ignored. Finally, in order to avoid undeterministic variable key expansion, such as: MYVAR = "foo" PREFERRED_PROVIDER_${MYVAR} = "bar" PREFERRED_PROVIDER_foo = "foobar" during the multilib processing of PREFERRED_VERSION and PREFERRED_PROVIDER, the code was changed to rename the variable key, to the final key. This along with the existing code avoids the problems. (From OE-Core rev: 1416613e94af46c6e74532bca0f026d1540becbb) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* update-rc.d, systemd: redirect also stderr from typeMartin Jansa2013-04-022-4/+4
| | | | | | | | | | * different shells different behavior? bash prints 'type: update-rc.d: not found' on stderr busybox's sh on stdout (From OE-Core rev: 45e22312c48b23480bd6dff98702b0691a48f7d1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* remove gtk-update-icon-cache-native virtualsAndreas Müller2013-04-021-1/+1
| | | | | | | | | gtk-update-icon-cache-native is the only provider now (From OE-Core rev: 7e437aa3e0ec862aac69a4434be0b2b652d26972) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sstate.bbclass: remove reference to gtk+-nativeAndreas Müller2013-04-021-1/+1
| | | | | | | (From OE-Core rev: 13bc0117a0a18165e83e2bcdd880e704a0df5e3f) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sstate: add -f to mv when moving sstate files into placeJeff Polk2013-04-021-1/+1
| | | | | | | | | | | Under some conditions (ACLs enabled, NFS) mv can interactively prompt before overwriting files. Avoid hanging builds in that case by using -f which should be harmless in other cases. (From OE-Core rev: b1a085db9d8ad2a3117af6f50e510bc9c2f9407b) Signed-off-by: Jeff Polk <jeff.polk@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel-yocto: use KBRANCH as default build branchBruce Ashfield2013-04-021-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | commit 61001aa [kernel-yocto: respect SRC_URI modified branch selection] changed branch processing such that a branch specified in the SRC_URI would set the branch forced as the build branch. This change broke compatibility with the yocto-bsp, linux-yocto-custom based recipes. These recipes specify the branch to be built via KBRANCH, but allow the fetcher to use master for keeping the repository up to date. This means that no explicit branch is set in the SRC_URI and the routines return the default branch of 'master', which is not what is set in KBRANCH. To support this case, we simply pass a default branch into the routine returning the branch to build, and ensure that the default is KBRANCH so if no branch is passed in the SRC_URI, KBRANCH is always built. [YOCTO #4145] (From OE-Core rev: 0c389f41d7ea0697a5468c73cce295a2fa64e9e0) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packageinfo.bbclass : extended functionalityAndrei Dinu2013-03-291-0/+21
| | | | | | | | | | | | | Extended the functionality of packageinfo.bbclass so that the sistem retrieves information about the files brought in by each package. This is done (without activating buildhistory) by parsing the packages-split directory for each package. (From OE-Core rev: 108bae276fe7e462378073207a3bdca7326f8e57) Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* image_types.bbclass: Replace squashfs-lzma with squashfs-xzMarc Ferland2013-03-291-3/+3
| | | | | | | | | | | | | | | | | | | Booting an image generated with squashfs-lzma results in a kernel error: "Filesystem uses "lzma" compression. This is not supported". Currently (well at least in Linux 3.8) the officially supported decompressors are: * LZO * XZ * ZLIB This change makes sure we use a supported compression algorithm for squashed root filesystems. (From OE-Core rev: d915e2e084257830c43f7f21af3aec24b7e1a211) Signed-off-by: Marc Ferland <ferlandm@sonatest.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/buildhistory: improve SRCREV recordingPaul Eggleton2013-03-291-6/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Collect SRCREV information in a separate task and write it out in a format which is more consistent with the rest of the buildhistory output. Using a task means that SRCREV values will also be recorded for native recipes and not just target ones, and the new formatting also correctly handles multiple entries in SRC_URI. Also adds scripts/buildhistory-collect-srcrevs which will report on all of the recorded SRCREV values in a format suitable for use in global configuration (e.g. local.conf or a distro inc file) to override AUTOREV values to a fixed set of revisions. Example output: # emenlow-poky-linux SRCREV_machine_pn-linux-yocto = "b5c37fe6e24eec194bb29d22fdd55d73bcc709bf" SRCREV_emgd_pn-linux-yocto = "caea08c988e0f41103bbe18eafca20348f95da02" SRCREV_meta_pn-linux-yocto = "c2ed0f16fdec628242a682897d5d86df4547cf24" # core2-poky-linux SRCREV_pn-kmod = "62081c0f68905b22f375156d4532fd37fa5c8d33" SRCREV_pn-blktrace = "d6918c8832793b4205ed3bfede78c2f915c23385" SRCREV_pn-opkg = "649" Some notes on using this script: * By default only values where the SRCREV was not hardcoded (usually i.e. AUTOREV was used) are reported - use the -a option to see all SRCREV values. * The output statements may not have any effect in the face of overrides applied elsewhere; use the -f option to add the forcevariable override to each output line to work around this. * The script does not do any special handling for multiple machines; however it does place a comment before each set of values specifying which triplet they belong to as shown above. Relates to [YOCTO #3041]. (From OE-Core rev: 2179db89436d719635f858c87d1e098696bead2a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: split out run-postinstsZhenhua Luo2013-03-291-3/+1
| | | | | | | | | | | | 1. Split out run-postinsts script into separated package, sometimes only the postinsts script is required to run all postinsts scripts in /etc/rpm-postinsts/ instead of the whole rpm package. 2. Set ROOTFS_PKGMANAGE_BOOTSTRAP to rpm-postinsts (From OE-Core rev: 056490ddbfdbb6cc6fa0d8ff8716d64819d6b16c) Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* base.bbclass: When we use fakeroot, also use it for devshellRichard Purdie2013-03-281-0/+2
| | | | | | | | | | | | Its generally useful for devshell to end up in the fakeroot environment. If a user needs to exit it, PSEUDO_UNLOAD=1 <command> works, its usually harder to enter the envionment. [YOCTO #3374] (From OE-Core rev: e6ffc747a8ca5142c9bc6fbd2b06b5808bb38b02) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/buildhistory: ensure SDK package lists include complementary pkgsPaul Eggleton2013-03-271-2/+3
| | | | | | | | | | We need to get in after complementary package installation, so use _append instead of +=. (From OE-Core rev: 8be32b8f30f63691f6b7a9592361b0975c6f8d7a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* update-rc.d/systemd: change communication variable nameRoss Burton2013-03-262-9/+10
| | | | | | | | | | Rename SYSTEMD_BBCLASS_ENABLED to INHIBIT_UPDATERCD_BBCLASS to reflect the action, for clarity. (From OE-Core rev: cf43320c343437659aee94acd005bf7712f273cd) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: check for systemctl first, and don't force systemd to be installed.Ross Burton2013-03-261-16/+11
| | | | | | | | | | With both sysvinit and systemd features enabled these postinsts may actually run on a target without systemd, so check that systemctl is present before using it. (From OE-Core rev: ac00e56cb9daacef17a6fdebe7b8ca1667b7e1c4) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* update-rcd: drop depends to recommends, check for update-rcd in scriptsRoss Burton2013-03-261-5/+10
| | | | | | | (From OE-Core rev: 2c403979c03898c679c5a1e1092aec784dbeb77c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* update-rcd.bbclass: handle both sysvinit and systemd features being presentRoss Burton2013-03-261-3/+6
| | | | | | | | | | | | Run the helper if the sysvinit feature is present, or if the systemd feature is present but the systemd class hasn't been inherited. We want to run in the latter case as systemd has sysvinit compatibility, but we don't want to always run so that pure systemd images don't have redundant sysvinit files. (From OE-Core rev: a3856ab19f1d4ae312f559521785ad4384700729) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/rm_work: rename RM_WORK_WHITELIST to RM_WORK_EXCLUDE1.4_M5.rc2Paul Eggleton2013-03-261-5/+5
| | | | | | | | | | | This really functions as a blacklist, not a whitelist, since we are listing recipes to exclude. To avoid any possibility of confusion, since this was a recent addition, rename the variable. (From OE-Core rev: 4d56de8018d550b3d181d451900cbfb698d64141) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemuimagetest: collect and print runqemu outputPaul Eggleton2013-03-261-0/+1
| | | | | | | | | | | If runqemu (or qemu itself) fails we need to know why, so tee out to a log file and print it when we can't find the qemu process or determine its IP address. (From OE-Core rev: 827106a57ca88760a19f9309d859b500c5c4fe97) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Correctly handle /usr/src/debug file ownershipRichard Purdie2013-03-261-0/+1
| | | | | | | | | | | After the recent cached path operation improvements, we need to tell the cache about directory changes. /usr/src/debug was was cached as not created and this was leading to bugs in file ownership. This change updates the cache and avoids this issue. (From OE-Core rev: 553a8010e81448629a94ab04fd989e6e49066f2b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Ensure debug source file is generated correctlyRichard Purdie2013-03-251-0/+2
| | | | | | | | | | The command for generating debug sources appends to the file, therefore we need to ensure it does not exist before we run the command else we end up doing more work that we should have to. (From OE-Core rev: 48dfd61901ce07491ef913cf04dbd9de9a52759f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Handle subprocess errors correctlyRichard Purdie2013-03-251-6/+26
| | | | | | | | | | | | If an error occurs in subprocess.call() we currently don't catch it. In particular we have issues where debugedit is segfaulting unnoticed. This fixes up various code paths to catch the errors. [YOCTO #4089] (From OE-Core rev: 262a69ffd33e9d001a7a15fc73671a015e3b5dd1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package/populate_sdk: Move functions from package_* to populate_sdk_*Richard Purdie2013-03-236-69/+63
| | | | | | | | | | | This fixes build failures introduced with "classes/buildhistory: implement history collection for SDK" by moving the functions to files where only the specific image type which is enabled is inherited. The failures occured when multiple PACKAGE_CLASSES were enabled. (From OE-Core rev: 9a414a57ad69a426a8d8a2970c42ca7427240615) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagegroup-core-tools-debug: split out Eclipse packagesPaul Eggleton2013-03-231-0/+2
| | | | | | | | | | Split out the packages added for Eclipse remote debugging to a separate package group so that we can avoid pulling them in if not using Eclipse. Fixes [YOCTO #3251]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/buildhistory: trim trailing spaces in file listingsPaul Eggleton2013-03-231-1/+1
| | | | | | | | | | These are mildly annoying when viewing git diffs of the buildhistory repository, so let's just get rid of them. (From OE-Core rev: c257f292bf75061647e380889487c7e2625592de) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/buildhistory: implement history collection for SDKsPaul Eggleton2013-03-2311-105/+165
| | | | | | | | | | | | | | | | | | | | | | SDKs are constructed in a similar manner to images, and the contents can be influenced by a number of different factors, thus tracking the contents of produced SDKs when buildhistory is enabled can help detect the same kinds of issues as with images. This required adding POPULATE_SDK_POST_HOST_COMMAND and SDK_POSTPROCESS_COMMAND variables so that data collection functions can be injected at the appropriate points in the SDK construction process, as well as moving the list_installed_packages and rootfs_list_installed_depends functions from the rootfs_{rpm,ipk,deb} to the package_{rpm,ipk,deb} classes so they can also be called during do_populate_sdk as well as do_rootfs. Implements [YOCTO #3964]. (From OE-Core rev: c3736064483d4840e38cb1b8c13d2dd3a26b36aa) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* fix march sanity check issueZhenhua Luo2013-03-221-3/+6
| | | | | | | | | | | | | | | | | | | | | 1. check if gcc_test is really generate before os.remove("gcc_test") to avoid following error: ERROR: Execution of event handler 'check_sanity_eventhandler' failed Traceback (most recent call last): File "check_sanity_eventhandler(e)", line 4, in check_sanity_eventhandler(e=<bb.event.ConfigParsed object at 0x3151450>) File "sanity.bbclass", line 107, in check_sanity(sanity_data=<bb.data_smart.DataSmart object at 0x11ba110>) File "sanity.bbclass", line 22, in check_gcc_march(sanity_data=<bb.data_smart.DataSmart object at 0x11ba110>) OSError: [Errno 2] No such file or directory: 'gcc_test' 2. set result to False when build failed with -march=native to ensure -march=native is appended to BUILD_CFLAGS when host gcc really supports this flag, otherwise following error appears when build native packages. | cap_text.c:1: error: bad value (native) for -march= switch | cap_text.c:1: error: bad value (native) for -mtune= switch (From OE-Core rev: 4a4228fe250c8b23a5deeb25825d61c6e84a47a2) Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_{ipk, deb, rpm}: drop the TARGET_OS conditionalChristopher Larson2013-03-223-23/+10
| | | | | | | | | | | The tclibc file for uclibc already empties IMAGE_LINGUAS, so there's no point to this conditional as far as I can tell, and it can cause issues for certain values of TARGET_OS. (From OE-Core rev: 0fdda5840452c7715ed775d5d18d9f850396f483) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_deb: don't install glibc-localedata-i18n separatelyChristopher Larson2013-03-221-4/+0
| | | | | | | | | | This was removed from package_rpm and package_ipk years ago, and shouldn't be needed, installing the packages from package_linguas should be sufficient. (From OE-Core rev: e9485c7077e5a9508371bbbbebdaaf1e9685da61) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* distrodata.bbclass: added some more git processingEmilia Ciobanu2013-03-221-5/+27
| | | | | | | | | | * Truncated all git MD5 sums to 7 digits * Added regex checking for git packages as well (From OE-Core rev: bc830ab3f6e9704c830e934c6f39c85ef11f867d) Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* syslinux.bbclass: Add a default serial console option and real boot menu supportJason Wessel2013-03-181-79/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous syslinux menu code did not support using both a serial and vga console, but this has worked for years in syslinux so there is no reason not to take advantage of it. The previous menu looked like: ------------------------------------------------------- Linux Boot Menu The following targets are available on this image: boot: None install: None ------------------------------------------------------- This commit makes it look something more like a traditional grub menu on both the serial console and vga console as well as providing the option to continue on using either the serial or vga console with the correct kernel arguments. You can see the screen shots attached to the bugzilla. https://bugzilla.yoctoproject.org/show_bug.cgi?id=3944 [ YOCTO #3944 ] (From OE-Core rev: 7032d559c04bae09e6b7c39ddeb1bf35acc0584c) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package: Add cachedpath optimisationRichard Purdie2013-03-182-25/+33
| | | | | | | | | | | | | | | | | | Currently, various standard library operations like os.walk(), os.path.isdir() and os.path.islink() each call stat or lstat which involves a syscall into the kernel. There is no caching since they could conceivably have changed on disk. The result is that for something like the do_package task of the kernel we're spending over two minutes making 868,000 individual stat calls for 23,000 files. This is suboptimal. This patch adds lib/oe/cachedpath.py which are a set of replacement functions for these operations which use cached stat data rather than hitting the kernel each time. It gives a nice performance improvement halving the build time of the kernel do_package. (From OE-Core rev: 556dee0c4d6d8a87c0cddbd2f60fe5917d009f18) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* image_types.bbclass: only create links if the target existsAndreas Oberritter2013-03-181-1/+3
| | | | | | | | | | When creating images containing many partitions, rootfs.$type may not be available. (From OE-Core rev: cf8e9d8942fdddaac21fca46137120da959c814c) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* binconfig: Handle the case where ${B} != ${S}Richard Purdie2013-03-181-1/+1
| | | | | | | | This change allows ${B} != ${S} builds to work which use binconfig. (From OE-Core rev: dc175a20d3a269c08691d92ecf13afff8c1340dd) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel bbclass: return to original directory in do_deployChase Maupin2013-03-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * During the base kernel_do_deploy function the directory is changed to DEPLOYDIR in order to do some cleanup and symlinking. However, the directory is not changed back to the original starting directory ${S} at the end. For append functions this means that the starting directory is not ${S} as expected but instead ${DEPLOYDIR}. For functions like the do_deploy_append in recipes-kernel/linux/linux-dtb.inc there is an assumption that you are still in the source directory and not the DEPLOYDIR. Without this change the .dtb files are not copied because the check for the existence of ${DTS_FILE} which is a relative path from the ${S} directory fails. This means that the .dtb files are not copied into the deploy directory and subsequently the deploy/images directory. In the log.do_deploy file you will see lines like: Warning: arch/arm/boot/dts/xxxxx.dts is not available! (From OE-Core rev: fd5d80ab1a405cb4ef94f2cde25f8c251da490f0) Signed-off-by: Chase Maupin <Chase.Maupin@ti.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rm_work.bbclass: inhibit rm_work per recipeChen Qi2013-03-181-0/+13
| | | | | | | | | | | | | | | | | | | | | | Use RM_WORK_WHITELIST to inhibit rm_work per recipe. In this way, one can use rm_work for the most of the recipes but still keep the work area for the recipe(s) one is working on. As an example, the following settings in local.conf will inhibit rm_work for icu-native, icu and busybox. INHERIT += "rm_work" RM_WORK_WHITELIST += "icu-native icu busybox" If we comment out the RM_WORK_WHITELIST line and do a rebuild, the working area of these recipes will be cleaned up. [YOCTO #3675] (From OE-Core rev: 6c930c3c06f2e698540626c87bd7f7f571df35ef) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* archiver: fix archive filtering behaviorKevin Strasser2013-03-184-18/+25
| | | | | | | | | | | | | | | | | | | With the addition of sstate, ensure that archiving tasks are only added to the build if they produce output in the directory specified by the 'sstate-inputdirs' flag. Move calls to 'tar_filter' and 'not_tarball' out to archive-*-source.bbclass in order to filter out packages before their archiving tasks are added to the build. Additionally, negate the return value of copyleft_should_include in tar_filter, so that packages that do not pass are in turn filtered out. (From OE-Core rev: 392562a21d9f2deb6fe6f8bb5378b09f4c5918d4) Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* archive-*-source.bbclass: fix scripts_with_logs build errorKevin Strasser2013-03-183-6/+9
| | | | | | | | | | | | | | | Log and script archives are only generated when explicitly enabled by setting the environment variable SOURCE_ARCHIVE_LOG_WITH_SCRIPTS to 'logs_with_scripts'. When left disabled, the path specified to be handled by sstate is never created, resulting in a build error. Only attempt to archive scripts and logs when explicitly enabled. (From OE-Core rev: 7f1f3e6b6db9a50f5e68bc8dff95549e692153b1) Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* image.bbclass: Drop legacy export of IMAGE_BASENAMERichard Purdie2013-03-181-2/+0
| | | | | | | | | | We used to export this in the days an external script handled the image generation. This is no longer the case and hence we no longer need this export. (From OE-Core rev: 919613c0e75362ee0eace99b51cc77d34a05372f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* populate_sdk_base: search for perl scripts after symlinks are relocatedLaurentiu Palcu2013-03-161-5/+5
| | | | | | | | | | | grep will throw "No such file or directory" errors for all invalid symlinks. To overcome this, move the search after the symlinks have been changed to point to the new location. (From OE-Core rev: 239a43fc4037bfe941bb60dd077ee477de177b7c) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm: Ensure PV manipulations are correctRichard Purdie2013-03-161-1/+1
| | | | | | | | | | | | | The previous change to this function fixed one manipuation at the expense of the other, depending on ow expanded the versioned dependency string was when the AUTOINC substitution was made. This update ensures we cover both cases and ensures the classextended version works as as well as the normal case. (From OE-Core rev: 0f8447a7d99d2645b932eac1c24149f0c2d3791e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* icecc: improve interaction with sstateMartin Jansa2013-03-151-0/+6
| | | | | | | | | | | | | | | | | | | | * exclude ICECC_PARALLEL_MAKE (like PARALLEL_MAKE is) * add ICECC_DISBLED to be able to disable whole icecc functionality while keeping icecc enabled. This is useful when you want multiple builders sharing same sstate-cache, but only some of them using icecc. * inheriting icecc changes all checksums because of do_*_prepends calls, but because icecc should not influence binary output of task we should get same checksums for tasks build with and without icecc * ICECC_DISABLED when set (to any non-empty value will disable icecc env modifications but while keeping same sstate checksum (From OE-Core rev: f46cf86d0ec3b80ce526b4dad1b1eac5995969ec) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: add debug-without-src PACKAGE_DEBUG_SPLIT_STYLEMartin Jansa2013-03-151-0/+6
| | | | | | | | | | * same as original and default version, but does not package source files in PN-dbg (From OE-Core rev: 3c8452c3abae74a42989c0fbd5ba303788528750) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm: Ensure package dependencies have correct version numbersRichard Purdie2013-03-141-2/+3
| | | | | | | | | | | | | | | | | | | | If a recipe has versioned dependencies on another package within the same recipe, there are potentially races where the version remapping may not happen correctly. This issue triggered with neard in multilib builds since it uses a "-" character in its PV which is illegal in an rpm version field. The remapping to "+" was not occuring. It only triggers in the multilib case since in this case, expansion of the datastore happens at slightly different points. The correct fix is to search for PV, not PKGV but substitute the PV value. (From OE-Core rev: bd03014c8fd080e04dd0a96a6b4b9211568c1cf1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rootfs_xxx.bbclass: fix bitbake -S hashes mismatch errorRobert Yang2013-03-123-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bitbake -S <image> has errors, e.g.: NOTE: Reparsing files to collect dependency data ERROR: Bitbake's cached basehash does not match the one we just generated (/buildarea/lyang1/poky/meta/recipes-core/images/core-image-minimal.bb.do_rootfs)! ERROR: The mismatched hashes were 8e44f2296f2d6cdf2ccb0236910ef59b and 46357d5e36713646b47b0fe2233e3c8c This is caused by the BUILDNAME which is defined in cooker.py: if not self.configuration.data.getVar("BUILDNAME"): self.configuration.data.setVar("BUILDNAME", time.strftime('%Y%m%d%H%M')) The time changes during the first parsing and reparsing, so there is the error, we already have: do_rootfs[vardepsexclude] += "BUILDNAME" but what we need is rootfs_xxx_do_rootfs[vardepsexclude] += "BUILDNAME" The do_rootfs doesn't depend on BUILDNAME directly, but indirectly, the depends tree is: do_rootfs -> rootfs_xxx_do_rootfs -> BUILDNAME So add BUILDNAME to rootfs_xxx_do_rootfs[vardepsexclude] would fix the problem. [YOCTO #3299] (From OE-Core rev: 9d039f482c84dde264564fde93f39764113cc0d3) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* base.bbclass: don't backfill features that already existRoss Burton2013-03-101-2/+2
| | | | | | | | | | | It's too easy to cause rebuilds because the DISTRO_FEATURES have changed in meaningless ways (such as re-ordering or duplicate items). Help stop this by checking if the feature to be back-filled is already present. (From OE-Core rev: 63c7192119d54b92d908441109ed4e4fff761cba) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_deb.bbclass: set DPKG_ARCH_arm to "armel"Constantin Musca2013-03-101-0/+1
| | | | | | | | | | | - the system should be using "armel" by default, not "arm" [YOCTO #3741] (From OE-Core rev: 74c671a609172a3801e53fe93e2853c4f0eb93b1) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* core-image.bbclass: support read-only rootfsChen Qi2013-03-071-0/+4
| | | | | | | | | | | | | The hook function is appended to ROOTFS_POSTPROCESS_COMMAND properly to support the 'read-only-rootfs' image feature. [YOCTO #3406] (From OE-Core rev: 05182ee354a9f773c8ab2f4cd7f1fdf552e7fcda) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>