aboutsummaryrefslogtreecommitdiffstats
path: root/classes/packaged-staging.bbclass
AgeCommit message (Collapse)Author
2010-07-28packaged-staging, native{,sdk}: Rework OVERRIDES to check PSTAGING_DISABLEDTom Rini
When the function to set PSTAGING_ACTIVE is an anon python function OVERRIDES is not set so we cannot set things to disabled in the context of BBCLASSEXTEND recipes. To fix this we need to have native/nativesdk set OVERRIDES outside of the anon function context. We then make a COW of the data at this point in packaged-staging's anon function and evaluate so we know what will be in OVERRIDES and check. While we're in here drop a duplicate test in populate_sysroot_postamble and check nativesdk along with the rest of the classes that need mangling. Signed-off-by: Tom Rini <tom_rini@mentor.com>
2010-07-27Revert "packaged-staging: Make setting PSTAGING_ACTIVE be a named python func"Tom Rini
This has some unintended consequences, revert for now. This reverts commit 9a0e95f37639d9856ad41b8fc301f9b00369a797.
2010-07-27packaged-staging: Make setting PSTAGING_ACTIVE be a named python funcTom Rini
When the function to set PSTAGING_ACTIVE is an anon python function overrides are not set so we cannot set things to disabled in the context of BBCLASSEXTEND recipes. Call this function before we check PSTAGING_ACTIVE. In the case of packagedstaging_fastpath it's cleaner to convert to a full python function. While we're in here drop a duplicate test in populate_sysroot_postamble and make do_package_stage check PSTAGING_ACTIVE for == 0 rather than != 1, like the rest of the functions do. Signed-off-by: Tom Rini <tom_rini@mentor.com>
2010-07-27packaged-staging: Place cross/native/etc into the normal pathTom Rini
With the changes to move ${CROSS_DIR} into sysroots/ we now $ORIGIN-mangle cross packages (and already were native) so change the comment from cross.bbclass while we're at this and then put these recipes into the usual packaged-staging cache. Signed-off-by: Tom Rini <tom_rini@mentor.com>
2010-07-22classes,bitbake.conf: Remove CROSS_DIR, install cross-packages into native ↵Khem Raj
sysroot * Update references to CROSS_DIR in classes and bitbake.conf. * This patch is based on Joshua Lock's work in poky. Signed-off-by: Khem Raj <raj.khem@gmail.com> Acked-by: Tom Rini <tom_rini@mentor.com> Acked-by: Richard Purdie <rpurdie@rpsys.net> Ackef-by: Chris Larson <clarson@kergoth.com> Acked-by: Martin Jansa <Martin.Jansa@gmail.com> Acked-by: Koen Kooi <koen@openembedded.org>
2010-06-23packaged-staging.bbclass: Change PSTAGE_PKGARCH to something dynamicTom Rini
Currently, we make all pstage packages be locked to BUILD_SYS which causes annoying warnings in some cases and doesn't allow for sharing between say 32 and 64bit (which is valid for target bits). We now change to ${PACKAGE_ARCH}-${HOST_OS} for everything except for cross where we need to encode HOST_SYS into the name as well. Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Tom Rini <tom_rini@mentor.com>
2010-06-17Indentation fixups, caught by python -tChris Larson
Signed-off-by: Chris Larson <chris_larson@mentor.com>
2010-06-10Add a rm -rf utility function and use it in packaged-staging.bbclassChris Larson
Signed-off-by: Chris Larson <chris_larson@mentor.com>
2010-06-10packaged-staging.bbclass: fix typo, it's PSTAGE_TMPDIR_STAGE, not ↵Chris Larson
PSTAGE_TMDPDIR_STAGE Signed-off-by: Chris Larson <chris_larson@mentor.com>
2010-06-07packaged-staging.bbclass: fix issue with no SRC_URICliff Brake
Currently with srctree, we get errors like the following: | + srcuri= | + '[' '' == '' ']' | + srcuri=OpenEmbedded | + echo 'Source: ' | ++ find /scratch/oe/oe-build/oe/build/angstrom-2008.1/tmp/work/armv5te-angstrom-linux-gnueabi/autotools-demo-1.0-28-g3a96627-r0/staging-pkg '(' -name '*.la' -o -name '*-config' ')' -type f | + stage-manager-ipkg-build -o 0 -g 0 /scratch/oe/oe-build/oe/build/angstrom-2008.1/tmp/work/armv5te-angstrom-linux-gnueabi/autotools-demo-1.0-28-g3a96627-r0/staging-pkg /scratch/oe/oe-build/oe/build/angstrom-2008.1/tmp/pstage/angstromglibc | *** Error: CONTROL/control is missing field Source | The Source field contain the URL's or filenames of the source code and any patches | used to build this package. Either gnu-style tarballs or Debian source packages | are acceptable. Relative filenames may be used if they are distributed in the same | directory as the .ipk file. | | ipkg-build: Please fix the above errors and try again. | ERROR: Function staging_packager failed NOTE: package autotools-demo-1.0-28-g3a96627-r0: task do_package_stage: Failed ERROR: TaskFailed event exception, aborting This patch fixes that issue. Acked-by: Chris Larson <chris_larson@mentor.com> Acked-by: Koen Kooi <k-kooi@ti.com> Acked-by: Khem Raj <raj.khem@gmail.com
2010-05-27packaged-staging.bbclass: added missing space in find callEnrico Scholz
Old find statement failed with something like $ find . \( -name XXX\) find: invalid expression; I was expecting to find a ')' somewhere but did not see one. Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Acked-by: Chris Larson <clarson@kergoth.com> Acked-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Khem Raj <raj.khem@gmail.com>
2010-05-21packaged-staging: fixed deadlockEnrico Scholz
Acked-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Koen Kooi <koen@openembedded.org>
2010-05-05packaged-staging.bbclass: Remove hardcoded paths in binconfig files for ↵Joshua Lock
target packages Amend the default PSTAGE_SCAN_CMD, as used when scanning target packages, to include binconfig scripts in the results and remove their hardcoded paths. Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-05-05packaged-staging: enhancements from Poky for fetching and relocatabilityJoshua Lock
Firstly adds tooling from Poky to scan packages and fix up paths in libtool files, we then build on this to further post-process native packages (native, cross, sdk) and fix up any references to the STAGING_DIR in non-binary files. Secondly adds support for fetching packaged staging packages from a mirror by setting PSTAGE_MIRROR to point to the root of a pstaging directory. Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-05-05bitbake.conf/base.bbclass: Rename the staging directory to sysroots and the ↵Joshua Lock
populate_staging task to populate_sysroot This change, pulled from Poky, makes the purpose of the staging directory more obvious and the taskname more true to what it now actually does. The layout version number is increased due to the change in layout but code to convert existing directories and insert a symlink for backwards compatibility is included. This patch also includes fixes for all recipes which reference the directory. Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-05-05packaged-staging: Fix mkdir to actually create destinationJoshua Lock
Patch from Poky fixes fallout from recent packaged-staging fix for cross packages. Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-04-14packaged-staging.bbclass: use 'os.unlink()' instead of spawning 'rm'Enrico Scholz
Doing a '-c clean' operation on a staged package with very much files (e.g. glibc) took several minutes because * every removed file was reported * an 'rm' instance was spawned for every file This patch uses the native 'os.unlink()' method for removing files and reports only the removed root directory instead of the single files. Based upon maillist discussion, reporting happens with 'debug' level instead of 'note' one, and only error conditions due to non-existing files will be ignored. Other (e.g. permission denied) errors will now abort the build while they were silently ignored previously. Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Acked-by: Sebastian Spaeth <Sebastian@SSpaeth.de> Acked-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Tom Rini <tom_rini@mentor.com>
2010-04-08Using NotHandled/Handled in event handlers is deprecatedChris Larson
Signed-off-by: Chris Larson <chris_larson@mentor.com>
2010-03-17packaged-staging: Fix packagaging of cross packagesJoshua Lock
packagedstaging_fastpath() was only copying the contents of CROSS_DIR to PSTAGE_TMPDIR resulting in the folders contents being packaged and then installed incorrectly at the top level of CROSS_DIR rather than in HOST_ARCH specific sub directories. This patch fixes that issue by copying the directory and its contents rather than just the directory contents. Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-03-16packaged-staging: Grab the staging lock before we copy and test the stamps soTom Rini
that we don't have other threads try and validate or install based on them being valid. This is a potential issue for certain BB_STAMP_POLICY (such as the default) values and enough concurrent threads. Signed-off-by: Tom Rini <tom_rini@mentor.com>
2010-02-03packaged-staging.bbclass: removed two superfluous slashesFrans Meulenbroeks
${SYSROOT_DESTDIR} ends on a / but there is also a / after the variable and a slash as the first character of the next variable. This patch removes the / that is explicitly added so in the generated code we get // instead of the even sillier looking (and probably more confusing) /// Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
2010-02-03Revert "packaged-staging.bbclass: removed two few superfluous slashes"Frans Meulenbroeks
Accidently tagged another file to this commit, sorry This reverts commit b977bbd442f3d00c884b68c1307bd9b14fb96446.
2010-02-03packaged-staging.bbclass: removed two few superfluous slashesFrans Meulenbroeks
${SYSROOT_DESTDIR} ends on a / but there is also a / after the variable and a slash as the first character of the next variable. This patch removes the / that is explicitly added so in the generated code we get // instead of the even sillier looking (and probably more confusing) /// Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
2010-02-03packaged-staging.bbclass: added missing $DISTRO_PR}'sFrans Meulenbroeks
This file was not updated when DISTRO_PR was introduced. Result of it was that packages were not properly added to the packaged staging package (due to faulty filenames being generated). This patch adds ${DISTRO_PR} to the filenames involved Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
2009-11-20packaged-staging.bbclass: Add method to disable packaged-staging from recipesRichard Purdie
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-16classes: Drop a number of unneeded import calls (from Poky)Richard Purdie
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-15packaged-staging.bbclass: Fix references to libdir which should be ↵Richard Purdie
libdir_native to remove multiple status files Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-11classes: Drop some random import bb/os statementsRichard Purdie
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-10base.bbclass: Add stubs for functions when package-staging isn't active and ↵Richard Purdie
fix a typo Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-10base.bbclass: Rework staging function to use a DESTDIR style configuration ↵Richard Purdie
based on the data from the do_install step (from Poky). This falls back to any standard do_stage function if defined, see the mailing list for more info. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-10packaged-staging.bbclass: Use a variable for the location of the staging ↵Richard Purdie
lock file (from Poky) Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-10Start removal of layout_* variables and replace these with new mechanisms to ↵Richard Purdie
allow nextgen SDK generation (from Poky) Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-09-18packaged-staging: fix populate_staging_postamble after staging-split by base ↵Andrea Adami
package arch (introduced by f876463527bd9ae92a09159fdb4899b4a4d19121)
2009-06-24packaged-staging.bbclass: use ?= for PSTAGE_PKG.Chris Larson
Signed-off-by: Chris Larson <clarson@mvista.com>
2009-05-14Shorten some full paths printed to the user.Chris Larson
Adds a base_path_out convenience function, which prepares a full path for display to the user. The initial implementation just makes it relative to ${TOPDIR}. This function is then used for some messages outputted to the user (packaged-staging, patch application, clean, unpack tasks). Signed-off-by: Chris Larson <clarson@mvista.com>
2009-05-14First pass of cleanup of messages outputted to the user.Chris Larson
OpenEmbedded outputs a lot of messages that the user is likely to never care about. We should only output something when it reflects upon their recipe (i.e. unpacking their sources, applying their patches), or is quite significant or unusual. Signed-off-by: Chris Larson <clarson@mvista.com>
2009-03-19packaged-staging.bbclass: Add rpm package coverage (from Poky)Richard Purdie
git-svn-id: https://svn.o-hand.com/repos/poky@5382 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-10-27packaged-staging.bbclass: Set the extra staging paths to a sane defaultRichard Purdie
If either DISTRO_PR and OELAYOUT_ABI staging packages become superseeded therefore add these to the default extra paths variables although distros are free to override this if they know better.
2008-10-01packaged-staging bbclass: make relinking workKoen Kooi
2008-07-24packed-staging.bblcass: change DEPLOY_DIR_PSTAGE from "=" to "?=" to be ableThomas Kunze
to override it in local.conf
2008-07-19conf/bitbake.conf: Merge in multimachine making it the standard layout as ↵Richard Purdie
discussed on the mailing list. Anyone wanting the previous layout can INHERIT the new singlemachine class
2008-06-17packaged-staging.bbclass: Make sure opkg's libdir exists in all cases for ↵Richard Purdie
lockfiles (from poky)
2008-05-24packaged-staging.bbclass: Sync with Poky for a number of updates. In ↵Richard Purdie
summary: Support using opkg, ipkg and an internal shell script version of ipkg as the package manager allowing removal of a large number of build dependencies. Correctly install packages into staging creating the .list and .control files. Remove accidental install outside the locking in the build package function. Correctly handle error codes in the postamble function. Add code to work correctly with the whitelist stamp policy in bitbake.
2008-05-05packaged-staging.bbclass: Merge in fixes/improvements from Poky and use new ↵Richard Purdie
setscene task
2008-04-11packaged-staging.bbclass: protect against empty SRC_URIKoen Kooi
2008-03-28packaged-staging.bbclass: Put ipk/deb files in the correct directoriesRichard Purdie
2008-03-18various: move over to opkg, as discussed on the mailinglistKoen Kooi
* death to ipkg!
2008-03-17packaged-staging.bbclass: Switch architecture to BUILD_SYS, inject the ↵Richard Purdie
target triplet into the package name so staging remains multimachine compatible, fix problems with packages with split PR, use DEPLOY_DIR_IPK and DEPLOY_DIR_DEB variables
2008-03-14packaged-staging.bbclass: Switch to including stamps files in the staging ↵Richard Purdie
package so the timestamps are preserved exactly
2008-03-14packaged-staging bbclass: make PSTAGE_EXTRAPATH overridable Koen Kooi