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

diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 89cb3e95697e4312753ebafc1983decebaee4da4..9dddca127a8d3d94fc37e2f96dc88ca2aaffa525 100644 (file)
--- 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 ed94790b1d5dc8b5bb0a491eec730c741e3ea364..3e4dabe87240fa441a053039be0e3bd450ed414b 100644 (file)
--- 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