summaryrefslogtreecommitdiffstats
path: root/meta/classes
Commit message (Collapse)AuthorAgeFilesLines
* package: Create global package file list and use throughout PACKAGEFUNCSRichard Purdie2013-02-014-61/+60
| | | | | | | | | | | | | Currently we do a signficant amount of tree traversal in many different places which in inefficient. We can assume that the files don't change and cache the file list which gives an efficiency improvement which this patch does using a global variable. (From OE-Core rev: 2d7608842d2dab07065e60aab729a5c8fd6b7907) (From OE-Core rev: 5c7c8347eb1bc25d194be6f4be142ba0924e2600) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Improve package_fixsymlinksRichard Purdie2013-02-011-7/+12
| | | | | | | | | | | Improve package_fixsymlinks so we don't handle RDEPENDS for every single package in PACKAGES. (From OE-Core rev: 20ff8feb95d54e4db646f8c0cb006ce187e288af) (From OE-Core rev: ca2ee871f82dd0ba4122a8373e4efd21cec5722b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Tweak PACKAGEFUNCSRichard Purdie2013-02-011-3/+3
| | | | | | | | | | | | Move package_rename_hook call into PACKAGEFUNCS and also move package_get_auto_pr to a more appropriate execution point, grouping package metadata handling functions together. (From OE-Core rev: a3f41cfbc8923e54198d10db292a11ef2edda4d7) (From OE-Core rev: 96d268166ab0d4640767bf3a0886358dcb663d0f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Split out package_fixsymlinks functionRichard Purdie2013-02-011-5/+12
| | | | | | | | | | | | The symlink handling code doesn't need to being part of populate_packages and is logically separate so split it out into a separate function, package_fixsymlinks. (From OE-Core rev: fc964ed2b558b08327e2bc8c93ada80ca9d97337) (From OE-Core rev: 08a194c13857b02a2febf9b1484b3cdd67a18160) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Move PKG handling code to emit_pkgdataRichard Purdie2013-02-011-6/+5
| | | | | | | | | | | We only use the PKG variable in emit_pkgdata so we might as well move the fallback code there, allowing restructuring of other parts of the metadata. (From OE-Core rev: 0136ae9a5f719f0e7ba6e00bfd366c0e61b3b3f2) (From OE-Core rev: df38695f0fbea10289e85fdcb7c2bdf566990577) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Avoid copying the datastore for FILES handlingRichard Purdie2013-02-011-10/+1
| | | | | | | | | | | | There is no real point in adjusting overrides and creating a copy of the datastore, just to access a single variable. We can do this just as easily with a slightly more complicated getVar call. This improves performance. (From OE-Core rev: 69f4351809359a0c7c38e8f233f3e3f7680ed2e2) (From OE-Core rev: b5d65f5d5e5b26d3a2c673e899114c90bcaf6bc8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Check FILES once, not once per loop iterationRichard Purdie2013-02-011-3/+3
| | | | | | | | | | | There is no need to check FILES in each loop iteration, we can just check it once at the start when we read the variable. (From OE-Core rev: 1bcc5cba12cbb1b846b433719d1b0820f5a97105) (From OE-Core rev: 40542f7a46bfb8431e31eca9af06adb4b343d810) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Add a shortcut exit from the mkdir functionRichard Purdie2013-02-011-0/+2
| | | | | | | | | | | | The mkdir function iterates over strings with many different operations, even if ultimately the target already exists. This adds a check to the start of the function so we don't waste time when the target already exists. (From OE-Core rev: 06e188e673313f1eb9ae7d85ae64467c8d2a94b3) (From OE-Core rev: 9509627e06ab4cf18c5bbf3f405ecf19a9f40287) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Improve kernel module handlingRichard Purdie2013-02-011-21/+16
| | | | | | | | | | | | Currently the kernel module handling consists of several special cases and has its own path walking. This refactors the code to handle them in a more standardised way which is also a bit more efficient. (From OE-Core rev: ad51b54f0afe8c56033137b7cf9ba398877b2651) (From OE-Core rev: cb24a72e97afb43de5e1e79ff807fd9e184df6a2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package: Rename splitfile functions to something more descriptiveRichard Purdie2013-02-011-12/+9
| | | | | | | | | | | | The splitfile and splitfile2 function names are confusing and the comments are also misleading, hard to understand or plain incorrect. This tries to improve things. (From OE-Core rev: 46f3050a1f46f814e2d031e7e71600b2932d631c) (From OE-Core rev: bc6f7085b42d8137957795e800e8b46d2f1eddac) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* multilib: skip packages that provide virtual/kernelBruce Ashfield2013-02-011-1/+3
| | | | | | | | | | | | | | | | | | Rather than keying on recipes that inherit kernel.bbclass, we should be checking for providers of virtual/kernel when skipping kernel recipes in multlib builds. Not all providers of virtual/kernel inherit kernel.bbclass (notably linux-dummy), so checking on the provider is a more complete check. We need to be sure to check for inheritance of module-base as well, this allows for packages that provides modules to avoid the multilib renaming. (From OE-Core rev: dc7d181ab03ceab87a24d932130109003334dbf8) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel: avoid copying unnecessary files during do_installMark Asselstine2013-02-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | kernel_do_install() populates $kerneldir with files needed to build external modules. To accomplish this there are several copy commands to get source from the kernel source tree and build trees after which a 'clean' is performed. Since we are copying from the build tree we get about 1G of .o and .cmd files copied over only to have them removed when we clean. This adds additional IO overhead as well as overhead caused by pseudo. By avoiding copying these files in the first place we get multiple gains: * avoid initial copy * avoid file deletes during clean * reduce pseudo overhead Additionally we are making use of cpio vs cp which tends to be significantly faster at performing copies. With these changes I observe a 15-30% decrease in the time to complete the do_install() operation on the kernel. [YOCTO #3517] (From OE-Core rev: c753f9d59f4d0a5af4ea5deb6e2b9609e05314e2) Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* insane.bbclass: removing outdated commentLukas Bulwahn2013-02-011-2/+0
| | | | | | | | | | | | This commit removes an outdated comment that recorded an issue that has been resolved in the commits 1c75a5df6845090480deff20f469f177501d2182 and d2d5456cd3b3bd3e52a5dedccca4d46e3a7986d1. Probably, the comment was missed when changing the behavior in those commits. (From OE-Core rev: fb1b51e902186b6a7d05e511fe3c3f03c10e3444) Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_ipk/deb/rpm: Ensure deploy staging directory is empty before ↵Richard Purdie2013-01-303-0/+3
| | | | | | | | | | | rerunning task If we don't do this, stale files can build up, particularly with the PR server. (From OE-Core rev: c30ae39229b35d72e2205040d76754b5120fa878) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* insane.bbclass: Fix incorrect getVar callRichard Purdie2013-01-301-1/+1
| | | | | | | | | | | | | On a trace I was a bit puzzled why getVar was making 180 calls to len(d). This is an expensive operation that should be very rarely called and certainly not by getVar. In perl's do_package it was resulting in ~1.5 million function calls from those 180 cases. Ultimately this typo was why. Lets fix it and save the CPU cyles. (From OE-Core rev: a8ba821d0002e4395fc5c80649fe14f93a7971fe) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sstate: Move debug comment to more logical placeRichard Purdie2013-01-301-1/+1
| | | | | | | | | | The same log message gets output multiple times in the log which look confusing and is rather pointless. Move the log message to the correct level. (From OE-Core rev: 3917409004a830e7ad0646f05ad7421385cbd1de) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* module.bbclass: Don't add pkg_postinst/pkg_prerm to all packages in recipeSaul Wold2013-01-301-2/+2
| | | | | | | | | | | | | | | | | | The code in module.bbclass was appending the pkg_postinst and pkg_prerm to all packages that are part of a given recipe, meaning that the -lic, -dev, -doc, ... packages all got the scriptlet This change uses only which macthes with the RDEPENDS and FILES already used in module.bbclass. The failure was that rootfs creation would fail due to the -lic package being installed before the kernel and the script would fail. [YOCTO #3803] (From OE-Core rev: cf05c4578c99c0cb885cf2706f7f2b39b100aeb8) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rootfs_rpm: Escape the backtick to ensure the ls runs on the targetSaul Wold2013-01-301-1/+1
| | | | | | | | | | | | | | | | | | This change ensures that the ls /etc/rpm-postinsts runs in the target at first boot time, rather than at the creation time of the script on the host. This was causing the following error in the rootfs log: + install -d /srv/ssd/sgw/machines/fri2/tmp/work/fri2-poky-linux/core-image-minimal/1.0-r0/rootfs//etc/rcS.d + i= + ls /etc/rpm-postinsts/ ls: cannot access /etc/rpm-postinsts/: No such file or directory (From OE-Core rev: e893cf0b3843701e80f5c9f47be04d1a88e5ed68) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* migrate_localcount.bbclass: use PRAUTOINX instead of PN & PVConstantin Musca2013-01-281-5/+4
| | | | | | | | | | | | - we need to use PRAUTOINX (it covers all cases) - it addresses bumped PE issues [YOCTO #3071] (From OE-Core rev: ec81b985bb29a8562366f5343171e68a1f9cc4e9) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: remove RRECOMMENDS on base packages for locale packagesAndreas Müller2013-01-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As long as we support only one locale package per recipe this leads to unwanted packages in images. This patch was motivated by samba (meta-oe): only wanting libsmbclient one gets full samba server into the image. For my standard image the follwing package were removed by this patch: -acl_2.2.51-r3_armv7a-vfp-neon.ipk -alsa-states_0.2.0-r3_armv7a-vfp-neon.ipk -alsa-utils_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-aconnect_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-alsaconf_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-alsactl_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-alsaloop_1.0.25-r3_armv7a-vfp-neon.ipk alsa-utils-alsamixer_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-alsaucm_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-amixer_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-aplay_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-aseqdump_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-aseqnet_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-iecset_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-midi_1.0.25-r3_armv7a-vfp-neon.ipk -alsa-utils-speakertest_1.0.25-r3_armv7a-vfp-neon.ipk -attr_2.4.46-r4_armv7a-vfp-neon.ipk -avahi_0.6.31-r7.1_armv7a-vfp-neon.ipk -gtk-engines_2.20.2-r3_armv7a-vfp-neon.ipk -pulseaudio_2.1-r15_armv7a-vfp-neon.ipk -samba_3.6.8-r6_armv7a-vfp-neon.ipk -vte_0.28.2-r5_armv7a-vfp-neon.ipk -xz_5.1.2alpha-r0_armv7a-vfp-neon.ipk Strange effect: For samba buildhistory's depends.dot says: -samba -> libc6; -samba -> libgcc1; -samba -> libreadline6; -samba -> libtalloc2; -samba -> libtdb1; -samba -> libwbclient0; -samba -> libz1; -samba -> update_rc_d; -samba_locale_de -> samba [style=dotted]; samba_locale_de -> virtual_locale_de [style=dotted]; -samba_locale_fr -> samba [style=dotted]; -samba_locale_fr -> samba [style=dotted]; This is conflicts to buildhistory's result on samba package not mentioning any changes for samba package. (From OE-Core rev: 50354ebece43a6c13f9ca592e7d230765a26fdf8) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* buildhistory.bbclass: track also complementary package informationAndreas Müller2013-01-281-0/+5
| | | | | | | | (From OE-Core rev: ffdb003590d5c1d49d6c6a6710adf71397e4fb9b) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gtk-immodules-cache.bbclass:fix support postrm at image creation timeHongxu Jia2013-01-281-1/+12
| | | | | | | | | | | | | Let postrm use the same logic as the postinst to run on both build machine and target [YOCTO #3633] (From OE-Core rev: dc1bb7a5532411bc9cb7e8678bc540c44fd2cd63) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gtk-icon-cache.bbclass:fix support postrm at image creation timeHongxu Jia2013-01-281-0/+18
| | | | | | | | | | | | | | When use postrm on the build machine, it installs the hook in intercept-scripts directory and exit 0, the hook will be later invoked and it will properly call gtk-update-icon-cache. [YOCTO #3633] (From OE-Core rev: 6ae0b8339134300d0c179bd47dc3062e0e1f2f0b) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* license.bbclass: package license texts to PN-lic when LICENSE_CREATE_PACKAGE ↵Martin Jansa2013-01-281-0/+34
| | | | | | | | | | | | is enabled [YOCTO #3743] (From OE-Core rev: dc78ef91a2bf01efb8028c9afbe69e506e016265) 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>
* license.bbclass: extract functionality to find license files to separate ↵Martin Jansa2013-01-281-18/+26
| | | | | | | | | | | | | | | function * move it from do_populate_lic to find_license_files so we can reuse it to populate license in package itself [YOCTO #3743] (From OE-Core rev: 833f8c239aa475b3e0cacbd448a90079ac287468) 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>
* staging: Drop obsolete commentsRichard Purdie2013-01-251-9/+0
| | | | | | (From OE-Core rev: 44a2374dcfd68c8e158e0c901d75dbd7327652a5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sstate: Add optimisation for useradd injected dependenciesRichard Purdie2013-01-251-0/+8
| | | | | | | | | | | useradd.bbclass adds sstate dependencies on base-passwd, shadow-native and shadow-sysroot. Due to the way these are injected, they interact badly with the other dependency validation logic and end up pulling in dependencies we don't actually need. This patch adds code to optimise those cases out. (From OE-Core rev: 784ca68fcca4ffb34390d55d9343570cfdf0305f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Split do_packagedata task from do_packageRichard Purdie2013-01-259-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Currently, do_rootfs has a dependency on all the do_package output being present due to its usage of the pkgdata directories. This means that if you run: bitbake xxxx-image -c rootfs you end up having to fetch and unpack all the do_package data which is usually large and inefficient. It also means rm_work has to leave all the do_package data lying around so rootfs works. This patch splits the actual creation of the pkgdata directory off into a separate task, "packagedata" which happens immediately after do_package. We can then remap the dependencies so this task is depended upon, not do_package. Sstate can then be programmed not to require do_package at the appropriate times. Whilst this patch doesn't do so, it opens the possibility of rm_work wiping out the do_package output from WORKDIR as long as it also removed the do_package stamp (both normal and setscene variants) and allowing more space savings with rm_work which has been regularly requested. (From OE-Core rev: 6107ee294afde395e39d084c33e8e94013c625a9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* prserv: change PRSERV_HOST semanticsConstantin Musca2013-01-252-6/+4
| | | | | | | | | | | | | | - remove PRSERV_PORT variable - use 'hostname:port' as PRSERV_HOST format - remove USE_PR_SERV variable - one can activate PRS by setting PRSERV_HOST [YOCTO #3744] (From OE-Core rev: e00f49de8b1f79c3e07b887d257bd75a46052fa0) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* base.bblass : Add support for cmake to PACKAGECONFIG.Philip Balister2013-01-251-1/+4
| | | | | | | | | | The cmake class uses EXTRA_OECMAKE to adjust the cmake configuration. This patch adds support for this, if the cmake class is used by the recipe. (From OE-Core rev: d8c0ce5a4a27c8aa1d07fc15d6e000af725a51e6) Signed-off-by: Philip Balister <philip@balister.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cpan_build: Fix cmaker Build.PL module buildsRichard Purdie2013-01-251-1/+6
| | | | | | | | | | | | | | | | | Certain cpan Build.PL based modules were failing to build due to the host's config information being used instead of the targets. This patch sets the appropriate variables to ensure the modules get the correct configuration from the target config_heavy.pl script. It also ensures the linker is CCLD, not LD since the LDFLAGS contain -Wl,XXX options and build failures result if LD is used. libencode-detect-perl is a module which tests this class extensively. (From OE-Core rev: 7fac8bffcd250aec90c0b675aeb2bbe7896d0ae1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/image-swab: remove zypper-related referencesPaul Eggleton2013-01-241-3/+0
| | | | | | | | | | Remove references to libzypp, zypper and sat-solver which have been removed. (From OE-Core rev: cc9144f99844a8485b2b96182bdf40429286ae66) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagedata: Add error message if multiple recipes try to write the same packageRichard Purdie2013-01-241-1/+6
| | | | | | | | | | | | If multiple recipes try and write the same package it resulted in a rather confusing traceback and unintuitive error. This patch prints a human readable error instead. [YOCTO #3645] (From OE-Core rev: 6f817779af77fdb0b861297f0f43c4c6607ce6f0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sanity.bbclass: Ensure tmpdir exists when running the checkRichard Purdie2013-01-241-0/+1
| | | | | | | | | | | This avoids tracebacks from bitbake if the directory doesn't already exist. [YOCTO #3640] (From OE-Core rev: 1a60e96b21d328fe936e594f3061459e8f2f1b5e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* core-image: Add hwcodecs IMAGE_FEATURERichard Purdie2013-01-241-0/+4
| | | | | | | | | | | Currently hardware codecs are being injected in rather ugly ways and end up either in no or all images. This adds a dedicated IMAGE_FEATURE for them based on the MACHINE_HWCODECS variable. We may need to refine this in due course but this patch at least illustrates the concept. (From OE-Core rev: 1cb370587fd72e3f0f69678748108cc4116767fb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* base: make feature backfilling happen earlierRichard Purdie2013-01-241-0/+2
| | | | | | | | | | | | | | | | | Backfilling DISTRO_FEATURES and MACHINE_FEATURES with _append statements happens too late to use those variables with conditional inherits, like this: inherit ${@base_contains('DISTRO_FEATURES','sysvinit','update-rc.d_real','',d)} Instead, do the backfilling at ConfigParse time so that it happens earlier in the parse, which results in that inherit behaving as expected when sysvinit was backfilled. (From OE-Core rev: 22429cdf79ed952072707a929643c7386fa7e056) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* prserv: add LOCALCOUNT to AUTOINCs migration feature1.4_M3.rc1Constantin Musca2013-01-221-0/+47
| | | | | | | | | | | | | | | - use migrate_localcount.bbclass to generate AUTOINC entries which are exported to LOCALCOUNT_DUMPFILE - import the generated AUTOINC entries - one can migrate LOCALCOUNT to AUTOINC by executing: bitbake-prserv-tool migrate_localcount [YOCTO #3071] (From OE-Core rev: ffab86f13cafb10d8d6273b6af8cd9a3c84eae20) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rootfs_rpm.bbclass: fix the unexpected postinst errorChen Qi2013-01-221-1/+2
| | | | | | | | | | | | | | | | If the /etc/rpm-postinsts/ directory was empty, the following error would occur at system startup. ERROR: postinst /etc/rpm-postinsts/* failed This patch fixes this issue. [YOCTO #3767] (From OE-Core rev: 202263aeca837dc7b6615a3dc34569c199163733) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* populate_sdk_base.bbclass: Allow installation of ix86 SDK on x86_64 hostWolfgang Denk2013-01-221-3/+6
| | | | | | | | | | | | | | | | | Commit c04f5435 "populate_sdk_base.bbclass: use SDK_ARCH instead of SDKMACHINE" prevents not only the installation of 64 bit SDK configurations on 32 bit hosts (which indeed cannot work), but also the legitimate installation of a 32 bit SDK on a 64 bit host. Fix this. While there, also make sure we use the same patterns ("i[3-6]86" resp. "x86[-_]64" to get unified strings for both INST_ARCH and SDK_ARCH. (From OE-Core rev: 7ddd97b9b09fe7a327916ea88908a63375556ae6) Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gtk-doc: parameterise the documentation directoryRoss Burton2013-01-211-1/+4
| | | | | | | | | | Not every package puts the gtk-doc infrastructure into ${S}, so allow this to be overridden. (From OE-Core rev: 40353c9ef83f986a0d49cc6eb654b3ace6ef4dc4) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: drop unnecessary and broken packages.remove()Christopher Larson2013-01-211-1/+0
| | | | | | | (From OE-Core rev: 5480371d0473482437ce4350e6593f006101ef40) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* update-alternatives: Add a build-time dependencyMark Hatle2013-01-201-0/+13
| | | | | | | | | | | | | | | | | | | We need to add a build time dependency on virtual/update-alternatives, however we can't just do DEPENDS +=, or we end up with various problems. To work around this, in the anonymous python space we ensure we only do the addition when the package does not provide virtual/update-alternatives and it is a target package. Also the system wide PREFERRED_PROVIDER was incorrect. It references a runtime package, and not the recipe it should have. This has been corrected. [YOCTO #3691] (From OE-Core rev: 56a59ef12936dcc6464cf1d43dda6957a5aa8c65) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Tested-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* populate_sdk_rpm: Re-add a few system provides to the SDKMark Hatle2013-01-201-1/+3
| | | | | | | | | | | | | | When building the target SDK portion, we can safely ignore various package rdepends. These dependencies are not required on a build only environment like an SDK. [YOCTO #3691] (From OE-Core rev: 1edd44bed9e9829f7c2466928bc3f45be102b84b) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Tested-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cpan_build: Fix bashismRichard Purdie2013-01-201-1/+1
| | | | | | | | | Fix a build failure caused by a bashism and improve quoting whilst in the area. (From OE-Core rev: 9eb78340c61acddb0c2012e25c76c18735febb4d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Fix shlibs cross package-arch contaminationRichard Purdie2013-01-201-2/+4
| | | | | | | | | | | | | | | I found that if I had two packages architectures built (say core2 and i586), that the shlibs data from i586 was being used in the core2 build. This lead to odd dependency issues if the i586 build was out of date and core2 was being targetted. When loading shlibs files, the last loaded wins so we need to iterate the lists from least to strongest weighting, not the other way around. With this patch applied, the contamination issue is resolved. (From OE-Core rev: acd7b1c2ee9f3ff84c45a723dba5e0bc5f6a100c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* populate_sdk_base.bbclass: Work around bugs with gnu tar < 1.24Jason Wessel2013-01-201-3/+2
| | | | | | | | | | | | | | | | | | | | | | | The gnu tar versions less than 1.24 pose a problem with the SDK extraction. A typical SDK will have hard links. The SDK is created with a newer version of tar but extracted with the host version of tar which may be much older. The specific defect is that older version of gnu tar do not properly handle the "--strip-components=" argument when processing hard links and the paths do not get properly truncated and hooked up with the corresponding real file payloads. This leads to errors like the following during the SDK install: tar: sysroots/qemux86-yocto-linux/usr/bin/getconf: Cannot hard link to `./opt/yocto/SDK-qemux86/sysroots/qemux86-yocto-linux/usr/bin/POSIX_V6_ILP32_OFFBIG': No such file or directory The simple way to work around the problem is to just not save the path information that is going to get chopped off anyway. This has the added benefit that it saves a small amount of space in the tar archive as well. (From OE-Core rev: 0f4112016bac07f0294f2a4d0fde4659c0fed2d2) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: replace AUTOINC directly in PKGVEnrico Scholz2013-01-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b27b438221e16ac3df6ac66d761b77e3bd43db67 introduced a regression when PKGV is modified by the recipe. E.g. when having something like | PV = "1.7.33+gitr${SRCPV}" | PKGV = "1.7.33+gitr${GITPKGV}" | RDEPENDS_${PN}-subpkg += "${PN} (= ${EXTENDPKGV})" | inherit gitpkgv The resulting core package has | Version: 1.7.33+git234+cd01e8c-r11 and because the subpackage has | Depends: vdr (= 1.7.33+git0+cd01e8c18d494150730214f033f84e5282ce7639-r11) image build fails with | * satisfy_dependencies_for: Cannot satisfy the following dependencies ... | * vdr (= 1.7.33+git0+cd01e8c18d494150730214f033f84e5282ce7639-r11) Patch avoids the 'PKGV = "cleanup(${PV})"' operation and replaces AUTOINC directly within PKGV. This might introduce a regression too when 'AUTOINC' is added to PKGV intentionally but impact is small and can be fixed trivially by using another string. (From OE-Core rev: 6e46664085fa49bc204fc944ca23ed6383e2ec51) Signed-off-by: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> Cc: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel.bbclass, module-base.bbclass: Use CC to form KERNEL_CCKhem Raj2013-01-203-31/+14
| | | | | | | | | | | | | | | | | | | kernel compiler is not special and we currently have it so we want to pass -march and -mtune options as CFLAGS to kernel build so that compiler picks the right subarch flags when compiling assembly files in particular. Otherwise defaults are chosen which may not be right in many case e.g. when compiling kernel for collie machine we should use arch=armv4 but it uses toolchain/as defaults which is armv5te in some case e.g. thumb1 we know that kernel can not be compiled in thumb1 mode so we can provide that information e.g. -marm option through KERNEL_HOST_CC_ARCH variable as we do now (From OE-Core rev: c49f967384ccbfe131bbb33ee518014f3fc4b38f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* update-rc.d: disable update-rc.d.bbclass when systemd enabledRadu Moisan2013-01-202-89/+90
| | | | | | | | | | | update-rc.d is not necessary when systemd is enabled, systemctl is the replacement (From OE-Core rev: eaa82c842d3197e0251a887ba16028c22f9d8d94) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel-yocto: add KBUILD_OUTPUT to OE_TERMINAL_EXPORTSBruce Ashfield2013-01-181-1/+2
| | | | | | | | | | | | Since linux-yocto based recipes have a split build and source directory, we should export KBUILD=${B} to the devshell. This allows the kernel to be incrementally build within the shell and not dirty the source directory (which breaks subsequent full builds). (From OE-Core rev: 88f88a22dfa730161168b0f228e3954178b74c6a) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>