[oe-commits] Richard Purdie : base.bbclass: Fix staging paths for native recipes ( from Poky)

[git version control]

Module: openembedded.git
Branch: rpurdie/work-in-progress
Commit: 7213df0bcd47d4d96364cee84edc10f4db0adf5f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=7213df0bcd47d4d96364cee84edc10f4db0adf5f

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 c203f66..cb8f900 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -1071,6 +1071,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
@@ -1136,7 +1138,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)
 }