From df39b9e2c3e0d0284d54904993a53d0e8c788c0c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Sat, 19 Jul 2008 12:22:08 +0000
Subject: cross.bbclass: Preserve BASE_PACKAGE_ARCH variable when chaging
 HOST_ARCH

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4894 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/classes/cross.bbclass            | 7 +++++--
 meta/classes/packaged-staging.bbclass | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'meta/classes')

diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 89cb3e9569..9dddca127a 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -3,8 +3,11 @@
 EXCLUDE_FROM_WORLD = "1"
 
 # Save PACKAGE_ARCH before changing HOST_ARCH
-OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
-PACKAGE_ARCH = ${OLD_PACKAGE_ARCH}
+OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${OLD_PACKAGE_ARCH}"
+# Also save BASE_PACKAGE_ARCH since HOST_ARCH can influence it
+OLD_BASE_PACKAGE_ARCH := "${BASE_PACKAGE_ARCH}"
+BASE_PACKAGE_ARCH = "${OLD_BASE_PACKAGE_ARCH}"
 
 PACKAGES = ""
 
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index ed94790b1d..3e4dabe872 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -284,7 +284,7 @@ populate_staging_postamble () {
 		if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then
 			exit $exitcode
 		fi
-		stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross
+		stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u -d ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}
 		if [ "$exitcode" != "5" -a "$exitcode" != "0" ]; then
 			exit $exitcode
 		fi
-- 
cgit v1.2.3-54-g00ecf