diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-02 20:40:34 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-10 13:46:39 +0000 |
commit | 5b28d571177ba2c9d16c89a03f7c645a0e7050fb (patch) | |
tree | b002427474acc0ba818e8a74f441aa113c053e5f /classes/packaged-staging.bbclass | |
parent | 5c7d389a900e2c821a5e5572f7a1bc568f86be18 (diff) |
base.bbclass: Rework staging function to use a DESTDIR style configuration 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>
Diffstat (limited to 'classes/packaged-staging.bbclass')
-rw-r--r-- | classes/packaged-staging.bbclass | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index cb4d1b0a96..77faedb9f1 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -174,6 +174,7 @@ python packagestage_scenefunc () { bb.build.exec_func("staging_helper", d) removepkg = bb.data.expand("${PSTAGE_PKGPN}", d) + pstage_cleanpackage(removepkg, d) stagepkg = bb.data.expand("${PSTAGE_PKG}", d) @@ -292,13 +293,21 @@ populate_staging_postamble () { fi } -do_populate_staging[lockfiles] = "${SYSROOT_LOCK}" +packagedstageing_fastpath () { + if [ "$PSTAGING_ACTIVE" = "1" ]; then + mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/ + mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/ + cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true + cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true + fi +} + do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}" -python do_populate_staging_prepend() { +python populate_staging_prehook() { bb.build.exec_func("populate_staging_preamble", d) } -python do_populate_staging_append() { +python populate_staging_posthook() { bb.build.exec_func("populate_staging_postamble", d) } |