From: Richard Purdie <rpurdie@linux.intel.com>
Date: Tue, 3 Nov 2009 00:38:53 +0000 (+0000)
Subject: base.bbclass: Fix staging for native and non-native packages
X-Git-Tag: Release-2010-05/1~1728^2~19^2~21
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab35aa34f3de37365d46692555c8a2ec3667da56;p=openembedded.git

base.bbclass: Fix staging for native and non-native packages

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---

diff --git a/classes/base.bbclass b/classes/base.bbclass
index d33ef343c7..49bb8144d2 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -1045,6 +1045,8 @@ def is_legacy_staging(d):
         legacy = False
     elif stagefunc.strip() == "do_stage_native" and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1":
         legacy = False
+    elif bb.data.getVar('NATIVE_INSTALL_WORKS', d, 1) == "1":
+        legacy = False
     if bb.data.getVar('PSTAGE_BROKEN_DESTDIR', d, 1) == "1":
         legacy = True
     return legacy
@@ -1110,7 +1112,7 @@ python do_populate_staging () {
         bb.build.exec_func("packagedstaging_fastpath", d)
 
         lock = bb.utils.lockfile(lockfile)
-        os.system('cp -pPR %s/* /' % (sysrootdest))
+        os.system(bb.data.expand('cp -pPR ${SYSROOT_DESTDIR}${TMPDIR}/* ${TMPDIR}/', d))
         bb.utils.unlockfile(lock)
 }