[oe-commits] Richard Purdie : base.bbclass: Fix staging paths for native recipes ( from Poky)
git version control
git at git.openembedded.org
Tue Nov 10 11:59:42 UTC 2009
Module: openembedded.git
Branch: rpurdie/work-in-progress
Commit: dacea36ffbfdfafe9cab771bb399c0dfb75a4443
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=dacea36ffbfdfafe9cab771bb399c0dfb75a4443
Author: Richard Purdie <rpurdie at linux.intel.com>
Date: Sun Nov 8 20:45:10 2009 +0000
base.bbclass: Fix staging paths for native recipes (from Poky)
Signed-off-by: Richard Purdie <rpurdie at linux.intel.com>
---
classes/base.bbclass | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/classes/base.bbclass b/classes/base.bbclass
index c9a965c..49bb814 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(bb.data.expand('cp -pPR ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}/* ${STAGING_DIR_TARGET}/', d))
+ os.system(bb.data.expand('cp -pPR ${SYSROOT_DESTDIR}${TMPDIR}/* ${TMPDIR}/', d))
bb.utils.unlockfile(lock)
}
More information about the Openembedded-commits
mailing list