From: Tom Rini <tom_rini@mentor.com>
Date: Fri, 20 Aug 2010 18:20:09 +0000 (-0700)
Subject: staging, packaged-staging.bbclass: Update call to fastpath
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82088cc7fcf7c01a0c702e25146f6a01bb369215;p=openembedded.git

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@mentor.com>
---

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 88472438ff..85f08ee143 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 e80644961c..b871226811 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))