[oe-commits] Joshua Lock : packaged-staging: Fix packagaging of cross packages

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: f94496c1c245882df0e2f8c9fb94774c8c9b3ce0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f94496c1c245882df0e2f8c9fb94774c8c9b3ce0

Author: Joshua Lock <josh at linux.intel.com>
Date:   Thu Mar  4 22:34:20 2010 +0000

packaged-staging: Fix packagaging of cross packages

packagedstaging_fastpath() was only copying the contents of CROSS_DIR to
PSTAGE_TMPDIR resulting in the folders contents being packaged and then
installed incorrectly at the top level of CROSS_DIR rather than in HOST_ARCH
specific sub directories.

This patch fixes that issue by copying the directory and its contents rather
than just the directory contents.

Signed-off-by: Joshua Lock <josh at linux.intel.com>
Signed-off-by: Richard Purdie <rpurdie at linux.intel.com>

---

 classes/packaged-staging.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index da9d0f3..f755d23 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -298,7 +298,7 @@ packagedstaging_fastpath () {
 		mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/
 		mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/
 		cp -fpPR ${SYSROOT_DESTDIR}${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true
-		cp -fpPR ${SYSROOT_DESTDIR}${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/ || /bin/true
+		cp -fpPR ${SYSROOT_DESTDIR}${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/ || /bin/true
 	fi
 }