Commit Graph

58 Commits

Author SHA1 Message Date
Richard Purdie 049aaa0233 staging: Remove now unused legacy staging code
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-07-30 14:41:45 +01:00
Richard Purdie 897a8b5abc stagemanager: Move functionality into the scripts directory
Since scripts is now in PATH thanks to the layer functionality there is
no longer any need to have this recipe full of special cases, the scripts
can just be placed there.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-07-22 11:44:28 +01:00
Joshua Lock c7f6eab8b1 packaged-staging.bbclass: fix typo in scan_cmd
it's PSTAGE_TMPDIR_STAGE, not PSTAGE_TMDPDIR_STAGE spotted by Chris Larson
<chris_larson@mentor.com>

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-11 14:43:58 +01:00
Joshua Lock 6a7549ff00 packaged-staging.bbclass: Use a differnet opkg.conf for each TARGET_ARCH
Assembling an appropriate opkg.conf in the pstage_helper is difficult when
building for multiple target architectures in one Poky directory, work around
this by generating an appropriate opkg.conf for the TARGET_ARCH and using an
${TARGET_ARCH}-opkg.conf for packaged staging.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-10 11:36:23 +01:00
Joshua Lock 8f367b6930 packaged-staging: Add the correct architectures to the opkg conf
Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-04 20:02:09 +01:00
Joshua Lock c22ab5fc9f Install cross-packages into the native sysroot
Cross is no longer required so can go away, we now install cross packages into
the native sysroot and use them from there.

This patch includes updates to classes and some recipes which reference
CROSS_DIR. Others still need fixing an image can be built and run with this
patch applied.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-04-27 18:29:57 +01:00
Joshua Lock e866ea68c7 packaged-staging.bbclass: Fix architecture field
The packages architecture field is incorrect, this patch changes it to:
native - build machine architecture
cross - build and target machine architectures
target - target machine architecture

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-04-27 16:58:42 +01:00
Joshua Lock 572f86ce5b packaged-staging.bbclass: Remove hardcoded paths in binfiles for 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-04-08 16:41:24 +01:00
Richard Purdie 0449c26e97 packaged-staging.bbclass: Revert accidental damage
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-03-23 21:59:06 +00:00
Richard Purdie 9ce619897c packaged-staging.bbclass: Fix mkdir to actually create the destination directory
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-03-23 21:56:21 +00:00
Joshua Lock 28f7dd3ca7 packaged-staging: tweak previous fix to accomodate possible changes to CROSS_DIR
This change, suggested by Chris Larson, ensures that the fix works even if the
definition of CROSS_DIR changes.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-03-05 08:35:46 +00:00
Joshua Lock 538087d203 packaged-staging: Fix packagaging of cross packages
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>
2010-03-04 16:53:00 +00:00
Joshua Lock 211f928e08 packaged-staging: Fix typo, grep not qrep ...
Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-03-03 17:43:40 +00:00
Joshua Lock cb8ae04ebe packaged-staging: post-process non-binary files to fix paths in native packages
Extend the existing libtool hack so that native packages (native, cross, sdk)
have all non-binary files scanned and the STAGING_DIR fixed up.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-02-26 12:33:34 +00:00
Joshua Lock 50ffb99417 packaged-staging: basic support for pulling staging packages from a mirror
Add simple support for trying to fetch staging packages from a http, https  or
ftp mirror if they do not already exist in PSTAGE_DIR.

As documented in local.conf.sample
"Poky can try and fetch packaged-staging packages from a http, https or ftp
mirror. Set this variable to the root of a pstage directory on a server."

If the PSTAGE_MIRROR variable is not set, or the package cannot be found on
the mirror it will be built as usual.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-01-29 12:33:46 +00:00
Joshua Lock b2c8430898 packaged-staging: Move packaged staging directory outside of DEPLOY_DIR
Rename DEPLOY_DIR_PSTAGE to PSTAGE_DIR and move it outside of deploy.
Do soft assignment of a default variable inside bitbake.conf as
${OEROOT}/tmp/pstage.
Use a separate directory, PSTAGE_WORKDIR, to store transient packaged
staging files such as the stamp files and opkg.conf

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-01-29 12:33:45 +00:00
Joshua Lock 9ff304510e packaged-staging: fix up handling of crosssdk packages
The packaged-staging class already special cases native packages for ensuring
the package is only reused if the path doesn't change.

This patch ensures the special casing is also done for crosssdk packages.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-01-29 12:33:45 +00:00
Richard Purdie 43bee8b735 Disable packaged-staging for cross-linkage/staging-linkage and external-poky-toolchain
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-19 13:37:11 +00:00
Richard Purdie 7096a54436 packaged-staging.bbclass: Fix staging reference -> sysroots
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-16 22:37:39 +00:00
Richard Purdie 7da2f8c51d packaged-staging: Fix libdir references to use libdir_native
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-16 10:09:01 +00:00
Richard Purdie b772c8cde5 bitbake.conf/base.bbclass: Rename the staging directory to sysroots and the populate_staging task to populate_sysroot
This change 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.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-13 12:15:42 +00:00
Richard Purdie c54117458a classes: Remove and sanitise import statements
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-13 12:15:28 +00:00
Richard Purdie 379bc4788f classes: Various staging improvement fixups
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-13 12:15:23 +00:00
Richard Purdie d7399bd56c base.bbclass: Rework staging function to use a DESTDIR style configuration based on the data from the do_install step. 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-13 12:15:23 +00:00
Richard Purdie a1d93ee326 packaged-staging.bbclass: Use a variable for the location of the staging lock file
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-13 12:15:22 +00:00
Richard Purdie 83a64003f8 packaged-staging: Whitelist the empty base_do_stage function as it does nothing and locks need not be held
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-10-28 15:22:37 +00:00
Richard Purdie 00127b3744 packaged-staging.bbclass Use libdir_native for opkg paths in directory creation
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-09-17 22:25:23 +01:00
Richard Purdie af85ce4b4e Remove layout_* variables
Remove layout_* variables and replace them with variables specific to the
different classes. The layout variables were only useful for the native/cross
classes and caused more confusion than they solved. They didn't scale to the
sdk class. It now clear a small set of native/cross variables fulfil the needs.

This patch also changes native.bbclass to use "/" as the STAGING_DIR which makes
sense since we're installing binaries into the locations we're compiling them for.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-09-17 22:24:36 +01:00
Richard Purdie 2684b195bc packaged-staging.bbclass: Fix for packages which don't stage anything
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-06-12 15:55:11 +01:00
Richard Purdie 3a309d20f2 packaged-staging.bbckass: Add option of setting PSTAGE_BROKEN_DESTDIR to disable packaged staging acceleration for packages with broken DESTDIR handling
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-06-11 16:10:28 +01:00
Richard Purdie d684d4385d packaged-staging.bbclass: Turn off debug
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-06-11 15:04:33 +01:00
Richard Purdie 5a4c688958 packaged-staging.bbclass: Detect when we're using autotools_stage_all and don't hold the lock for as long when that is the case giving a significant performance boost with less lock contention and staging area file timestamp checking required
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-06-11 14:46:17 +01:00
Richard Purdie f1619b3567 packaged-staging.bbclass: Fix accidental debug addition
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-06-08 17:36:08 +01:00
Richard Purdie 1a21e6e2d5 packaged-staging.bbclass: Add support for mangling .la files so the staging directory path can change. Someday libtool will support sysroot but until then...
Signed-off-by: Richard Purdie <richard@ted.(none)>
2009-06-04 20:46:09 +01:00
Richard Purdie e0dab8bda5 packaged-staging.bbclass: Ignore errors resulting from parallel threads clashing 2008-11-04 17:34:45 +00:00
Richard Purdie 4f083a4ada packaged-staging.bbclass: Make sure target directory exists, fixing build failures 2008-11-03 17:03:27 +00:00
Robert Bradford 7ddbeb2931 packaged-staging.bbclass: Avoid removing the staging.lock lock file.
The pstage_manualclean function can be called on a directory containing an
actively held lock on staging. Removing the lock file whilst the lock is held
results in a failure when the lock is released.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5553 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-10-20 14:58:47 +00:00
Richard Purdie 096b0cd292 packaged-staging.bbclass: Add rpm package coverage
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5382 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-10-02 15:22:10 +00:00
Richard Purdie e0fdf7f653 packaged-staging.bbclass: Add OELAYOUT_ABI to the package paths so staging packages become abi specific
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4939 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-07-24 11:14:33 +00:00
Richard Purdie df39b9e2c3 cross.bbclass: Preserve BASE_PACKAGE_ARCH variable when chaging HOST_ARCH
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4894 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-07-19 12:22:08 +00:00
Richard Purdie ba539abf0b bitbake.conf: Set MULTIMACH_ARCH to a default value
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4861 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-07-17 21:28:03 +00:00
Marcin Juszkiewicz 4a38dabbbf packaged-staging.bbclass: force symlinking as ipkg->opkg link can be present
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4758 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-07-02 07:45:51 +00:00
Marcin Juszkiewicz 7f8da38b3e packaged-staging: allow to set DEPLOY_DIR_PSTAGE in local.conf
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4754 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-07-01 10:33:06 +00:00
Richard Purdie 9745db65a7 packaged-staging.bbclass: Fix indentation
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4647 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-06-13 16:21:28 +00:00
Ross Burton 168fda493a packaged-staging.bbclass: create the opkg directories as required (from Richard)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4646 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-06-13 16:15:47 +00:00
Richard Purdie dedaeb4fcb packaged-staging.bbclass: Tweak package install command
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4598 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-06-06 09:52:53 +00:00
Richard Purdie 820845f6b7 packaged-staging.bbclass: The staging_packager function should not be installing the package, that is the job of the staging_package_installer() function which is called with the correct locks held
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4531 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-05-21 22:00:10 +00:00
Richard Purdie 7d4beb21d5 packaged-staging.bbclass: Make the class compatible with opkg, ipkg and ipkg-sh and allow auto switching between whichever is available. Fix task dependencies in BB_STAMP_POLICY == whitelist case. Remove now unneeded basic dependencies.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4492 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-05-18 21:24:41 +00:00
Richard Purdie f0e154b9f9 packaged-staging.bbclass: Execute staging_helper earlier to make sure the configuration file exists when needed. When installing the package after building make sure the control and list files are created. Use stage-manager-ipkg-build instead of needing ipkg-utils-native
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4488 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-05-18 14:12:15 +00:00
Richard Purdie 4c664f698c packaged-staging.bbclass: Improve postamble exit code handling
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4484 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-05-16 07:18:42 +00:00