summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
Commit message (Collapse)AuthorAgeFilesLines
* 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: Add cachedpath optimisationRichard Purdie2013-03-181-24/+32
| | | | | | | | | | | | | | | | | | 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>
* 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.bbclass: Ensure all .so files get strippedRichard Purdie2013-03-051-1/+4
| | | | | | | | | | | | It was realised that .so files which were not marked as executable were not gettings stripped. This was wasting space in images. This patch ensures they do get processed by the code correctly. [YOCTO #3973] (From OE-Core rev: 725354886ae3650a7a4875d4c0bffcfab7e8cc40) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Fix do_package variable dependenciesRichard Purdie2013-03-051-1/+1
| | | | | | | | | | | | When the do_package function was split into different sections, the vardeps were not updated to match meaning some function changes weren't reflected in the sstate checksums. Fix this. [YOCTO #3980] (From OE-Core rev: 2e7ddbcca3f613c3b5725dcc3d457985d41e5f16) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* pakcage.bbclass:use a better way to cut -dev/-dbg suffixSong.Li2013-02-221-4/+4
| | | | | | | | | | | | In pakcage.bbclass,function replace('-dev', '') is used to cut '-dev' suffix. but it will cause the name "lib32-device-dev" to "lib32ice", so change it to [:-4]. (From OE-Core rev: 91a3a48798029ca88a46a528200f4c5252f245e9) Signed-off-by: Song.Li <Song.Li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes: Drop none package specific packaging variable accessesRichard Purdie2013-02-171-11/+8
| | | | | | (From OE-Core rev: 24cbe88429ba021d7c461e0271b67106d11d5eb2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: support dangling path componentsEnrico Scholz2013-02-111-6/+2
| | | | | | | | | | | | | | Commit ec2aab09769f4b6817d74d2175afa2b7c7598750 introduced a regression on packages which contain symlinks with unresolvable path components (e.g. lsof-dbg). While assigning a variable, an exception was raised and the exception handler accessed this variable. Patch deals both with the dangling path components by assuming them as valid directories and by avoiding the broken assignment. (From OE-Core rev: 579369b0fb27fad6d628746a50b9b798078500f6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: use oe.path.realpath()Enrico Scholz2013-02-111-11/+5
| | | | | | | | | | | | | | | | | | | | oe.path.realpath() provides are common and more correct implementation for resolving symlinks within sysroot. Use it. Old implementation suffered from lot of problems; e.g. * redundant code * calls 'os.stat()' which references files on host; this can give wrong results about existing/non-existing and can cause EPERM (instead of the catched ENONENT) exceptions * does not deal with special cases like '..' leaving the sysroot. (From OE-Core rev: ec2aab09769f4b6817d74d2175afa2b7c7598750) Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Replace undefined 'src' with valid variableKhem Raj2013-02-061-1/+1
| | | | | | | | | | | After rewrite of split_and_strip_files src var is no longer available here where it is used so we should replace it with a valid value (From OE-Core rev: b07e79ea049d341a5a0a7e4bb72151f49336c5bc) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Ensure package_get_auto_pr is run at the correct pointRichard Purdie2013-02-061-1/+2
| | | | | | | | | This needs to run before PKGR and other variables using PRAUTO are used, including the expansion optimisations. (From OE-Core rev: eb09ebc9680eb50e23778dcc1c2697d13cf073ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: return list of packages created in do_split_packagesMartin Jansa2013-02-061-0/+3
| | | | | | | | | | | | | * sometimes it's useful to do something with packages created by do_split_packages later in do_package_prepend, e.g. in: http://lists.linuxtogo.org/pipermail/openembedded-devel/2013-February/043824.html I have .bbclass which adds some postinst, postrm and RDEPENDS, but ttf-mplus is using do_split_packages to create those packages (From OE-Core rev: 5aa52c6882d2929b2e530c4fa297c6d3e97d4f9f) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Pre-expand some variables to save timeRichard Purdie2013-02-061-0/+14
| | | | | | (From OE-Core rev: fc5bff0145d8f5db1c09be61f5de209ac4016ed1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Better document the different phases of operationRichard Purdie2013-02-061-0/+16
| | | | | | | | | Add headers to document the different phases of do_package and make the steps clearer. (From OE-Core rev: b6438c94035a014902ec89af63ff3787cd8c67f6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Add PACKAGESPLITFUNCS variableRichard Purdie2013-02-061-0/+6
| | | | | | | | | | | | | | Prepending to populate_packages is rather ugly and means its hard to trace errors and also profiling informaiton is summed together in one function. This patch starts to split out the prepends to become separate functions to avoid these issues. This is generally a neater way to write functions than prepending to where there can sometimes be variable scope issues and we've been bitten by whitespace issues in the past. (From OE-Core rev: 4f9963d1d82ee896fe9491d6a8b32be42cd06f14) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Simplify empty directory removalRichard Purdie2013-02-061-5/+1
| | | | | | | | | Rather than an exec() per directory, we might as well exec one command and be done with it. (From OE-Core rev: 82ae9cfb09ee5c0aa6402c972d71e2b64d1ce8bc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Various minor performance tweaksRichard Purdie2013-02-061-8/+6
| | | | | | | | | | | | * Call getVar outside the loop * Drop unneeded PATH export (bitbake does this already) * Drop unused variable * Simplify if statement nesting * Simplify variable expandion to a getVar call (expand would just call getVar) (From OE-Core rev: 52b506145bcddc133ca93a8c9f7343de69d10907) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Make use of cleandirs and dirs function flagsRichard Purdie2013-02-061-5/+3
| | | | | | | | | | We can use the cleandirs and dirs flags for the fuctions to handle directory cleaning and creation at the bitbake level rather than using these calls within the functions (From OE-Core rev: 4b31d6f6f0a2a6b9e504ffae0d3b2099cbd7dddc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Rewrite split_and_strip_filesRichard Purdie2013-02-061-105/+97
| | | | | | | | | | | | | | | | The split_and_strip_files funciton was hard to follow and its usage of prefixes to strings was unusual. This rewrites it to use a list of hardlinks, symlinks and elffiles where each list is iterated over at the correct point. This means we can avoid creating dandling symlinks for example so we can simply delete the cleanup code for this. The isfile() check is also removed which gives a significant improvement in speed. Its uneeded since os.walk will have already checked things in files are files. (From OE-Core rev: 0cd295d8cdc8cc39d6b6c7d26ea8a2a10a979d7c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Fix up bb.mkdirhier/bb.copyfile usageRichard Purdie2013-02-061-7/+7
| | | | | | | | | These are in bb.utils so lets the correct function and avoid the overhead of the fixup/warning for the deprecated usage. (From OE-Core rev: d17329db4842c50af1a3d7f5f20e692c89913fba) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: use the multiprocess pool from bitbakeRichard Purdie2013-02-061-2/+2
| | | | | | (From OE-Core rev: 7e880a95840db82f4035959b03630ba2a96c0311) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package: Process package stripping in parallelRichard Purdie2013-02-061-45/+13
| | | | | | (From OE-Core rev: 981fed49ee80560fb067b3f47aeada1fdee792ca) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package: Don't export PATHRichard Purdie2013-02-061-9/+5
| | | | | | | | | PATH is already exported, we don't need to do this each time we run something, its just noise and overhead. (From OE-Core rev: 060f617cea4ea0a5af28d31ea19c0387e9773fce) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Multithread per file dependency generation codeRichard Purdie2013-02-061-60/+32
| | | | | | (From OE-Core rev: b659eb0f2070149d9516c129b3853b41fbbd1033) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Allow per-package SKIP_FILEDEPSPeter Seebach2013-02-041-0/+2
| | | | | | | | | | | | | | | | The existing check for SKIP_FILEDEPS can be overridden per recipe using SKIP_FILEDEPS_pn-${PN}. However, there's no mechanism for letting a single package within a recipe use SKIP_FILEDEPS. This patch adds SKIP_FILEDEPS_<pkg>, by analogy to FILES_<pkg>. Note that it only works one way; if the recipe has SKIP_FILEDEPS = 1, the checks for individual packages will never be reached. (From OE-Core rev: 94557b500ad38a49aec40629015ed0b24e167f76) Signed-off-by: Peter Seebach <peter.seebach@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Use expanded RDEPENDS in read_shlibdepsRichard Purdie2013-02-011-1/+1
| | | | | | | | | | | | We may as well expand the RDEPENDS when reading and writing as this function does. if we don't do this, we could accidentally duplicate data and it also turns out to be much less efficient. (From OE-Core rev: d62a3151e7b252911c172a605b3089de355663c5) (From OE-Core rev: 8f602e84e6ae4e346acef7cf5473343039fa352a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package: Create global package file list and use throughout PACKAGEFUNCSRichard Purdie2013-02-011-37/+41
| | | | | | | | | | | | | 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>
* 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>
* Split do_packagedata task from do_packageRichard Purdie2013-01-251-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | 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-251-5/+3
| | | | | | | | | | | | | | - 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>
* 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>
* 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>
* 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>
* package.bbclass: Skip testing "packages" a second time.Robert P. J. Day2013-01-071-1/+1
| | | | | | | | | | | | | | | | | | Since the "packages" variable is already tested a few lines above in the same routine: if len(packages) < 1: bb.debug(1, "No packages to build, skipping do_package") return there is no point testing it again, and the error message doesn't even refer to "packages", anyway. (From OE-Core rev: 371fbacff47828cfff99f1152f9e269e27c474da) Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: don't prepend MLPREFIX to LOCALEBASEPNConstantin Musca2013-01-071-1/+1
| | | | | | | | | | | | | - all the recipes that overwrite LOCALEBASEPN must consider also the MLPREFIX - if the LOCALEBASEPN variable is not overwritten then it will have the correct prefix (LOCALEBASEPN ??= "${PN}") (From OE-Core rev: 855d64a3091c5358e2e1a7f4247929515b068708) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* multilib: fix allarch/kernel/module-base multilib issuesConstantin Musca2012-12-311-0/+30
| | | | | | | | | | | | | | | | | | | | | | | - skip the non-packagegroup allarch recipes in multilib_virtclass_handler - extend PROVIDES/RPROVIDES for allarch recipes which are not packagegroups - use variants from MULTILIB_GLOBAL_VARIANTS (lib32 lib64 libx32) to create additional pkgdata files for multilib allarch: ${pkgdatadir}/${variant}-${PN} and ${pkgdatadir}/runtime/${variant}-${pkg} - use variants from MULTILIB_VARIANTS to create additional pkgdata files for multilib kernel/module-base recipes - add a sanity check to determine if the current multilib is in MULTILIB_GLOBAL_VARIANTS [YOCTO #2918] [YOCTO #3440] [YOCTO #3565] [YOCTO #3568] (From OE-Core rev: bc4da2573dfb59ea2fc4af359701818df20f7663) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: prepend MLPREFIX to LOCALEBASEPNConstantin Musca2012-12-111-1/+1
| | | | | | | | | | | | We need to prepend MLPREFIX to LOCALEBASEPN in order to fully enable multilib [YOCTO #3440] (From OE-Core rev: 91fe09a9a8b317d27145efff4201f1138d6a45d4) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: make do_split_packages handle non-existent root directoriesRoss Burton2012-12-111-1/+7
| | | | | | | | | | | | | | | | | | This function has different behaviour if the split directory doesn't exist depending on the recursive argument: non-recursive uses os.listdirs which throws an exception, recursive uses os.walk which doesn't. do_split_packages should silently handle non-existent directories because it's mainly used for plugin directories, which may end up being empty though changing the distro configuration (for example, connman without wifi distro feature). So, add an early exit if the split root doesn't exist. (From OE-Core rev: 937101e3fdd6afd00f6f8a8be411a67110c4ae78) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* prs: use the PRServer to replace the BB_URI_LOCALCOUNT functionalityConstantin Musca2012-12-061-0/+4
| | | | | | | | | | | | | | | | | | | | | - adapt the PRServer to generate an incremental number for every revision set associated with a (PN, PV) - use one incrementing value rather than several - PV becomes 0.1+gitAUTOINC+deadbeefdecafbad_decafbaddeadbeef - if PV contains 'AUTOINC' set PKGV to the same thing with AUTOINC replaced with the "auto PR" value - if the PRServer isn't running replace AUTOINC with 0 (no package feeds, but usual image creation would work) - use the PR table with "AUTOINC-${PV-without-SRCREVs}" as key - modify prexport/primport to address the generated srcrev entries - this patch addresses the following proposal: http://lists.linuxtogo.org/pipermail/bitbake-devel/2012-November/003878.html (From OE-Core rev: b27b438221e16ac3df6ac66d761b77e3bd43db67) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-22 11:48:23 +0000