summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-03 00:38:53 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-10 13:46:42 +0000
commitab35aa34f3de37365d46692555c8a2ec3667da56 (patch)
tree65e0db42f86cd83d75d38223411dd4b2151cd731
parent0c0889223c330b8a3c9e122581805e2c3d9a7bd4 (diff)
base.bbclass: Fix staging for native and non-native packages
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--classes/base.bbclass4
1 files changed, 3 insertions, 1 deletions
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)
}