[oe-commits] Tom Rini : staging, packaged-staging.bbclass: Update call to fastpath
git version control
git at git.openembedded.org
Fri Aug 20 18:21:53 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 82088cc7fcf7c01a0c702e25146f6a01bb369215
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=82088cc7fcf7c01a0c702e25146f6a01bb369215
Author: Tom Rini <tom_rini at mentor.com>
Date: Fri Aug 20 11:20:09 2010 -0700
staging, packaged-staging.bbclass: Update call to fastpath
Call fastpath if pstageactive, and don't need to check it again in
pstaging's fastpath.
Signed-off-by: Tom Rini <tom_rini at mentor.com>
---
classes/packaged-staging.bbclass | 6 ++----
classes/staging.bbclass | 3 ++-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 8847243..85f08ee 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -324,10 +324,8 @@ populate_sysroot_postamble () {
}
packagedstaging_fastpath () {
- if [ "$PSTAGING_ACTIVE" = "1" ]; then
- mkdir -p ${PSTAGE_TMPDIR_STAGE}/sysroots/
- cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/sysroots/ || /bin/true
- fi
+ mkdir -p ${PSTAGE_TMPDIR_STAGE}/sysroots/
+ cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/sysroots/ || /bin/true
}
do_populate_sysroot[dirs] =+ "${PSTAGE_DIR}"
diff --git a/classes/staging.bbclass b/classes/staging.bbclass
index e806449..b871226 100644
--- a/classes/staging.bbclass
+++ b/classes/staging.bbclass
@@ -168,7 +168,8 @@ python do_populate_sysroot () {
#os.system('cp -pPR %s/* %s/' % (dest, sysrootdest))
for f in (bb.data.getVar('SYSROOT_PREPROCESS_FUNCS', d, True) or '').split():
bb.build.exec_func(f, d)
- bb.build.exec_func("packagedstaging_fastpath", d)
+ if pstageactive:
+ bb.build.exec_func("packagedstaging_fastpath", d)
lock = bb.utils.lockfile(lockfile)
os.system(bb.data.expand('cp -pPR ${SYSROOT_DESTDIR}${TMPDIR}/* ${TMPDIR}/', d))
More information about the Openembedded-commits
mailing list