aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-08-25 15:00:02 +0100
committerJoshua Lock <josh@linux.intel.com>2010-08-25 18:01:23 +0100
commitd46c362a46f26b38d8da30f6a83e7c0fdadda348 (patch)
tree51c9f88b9855e5d36115598e95afd8c7d5cceccb
parentb66dc67c62d544fa4b710a03ef95275cbffe0235 (diff)
downloadopenembedded-core-contrib-d46c362a46f26b38d8da30f6a83e7c0fdadda348.tar.gz
sstate: fix architecture of sstate archives
Using TARGET_ARCH as the pacakge architecture for sstate archives lead to some issues when using two machines with different BASE_PACKAGE_ARCH's but the same TARGET_ARCH such as netbook and qemux86 machines. Probable fix for [BUGID #223] Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/classes/sstate.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 6476257fc8..6051734896 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -2,7 +2,7 @@ PSTAGE2_MANIFESTS = "${TMPDIR}/pstagelogs"
PSTAGE2_MANFILEPREFIX = "${PSTAGE2_MANIFESTS}/manifest-${PSTAGE2_PKGARCH}-${PN}"
-PSTAGE2_PKGARCH = "${TARGET_ARCH}"
+PSTAGE2_PKGARCH = "${BASE_PACKAGE_ARCH}"
PSTAGE2_PKGVERSION = "${PV}-${PR}"
PSTAGE2_PKGPN = "${@bb.data.expand('staging-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d).replace('_', '-')}"
@@ -17,11 +17,11 @@ python () {
if bb.data.inherits_class('native', d):
bb.data.setVar('PSTAGE2_PKGARCH', bb.data.getVar('BUILD_ARCH', d), d)
elif bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d):
- bb.data.setVar('PSTAGE2_PKGARCH', bb.data.expand("${BUILD_ARCH}_${TARGET_ARCH}", d), d)
+ bb.data.setVar('PSTAGE2_PKGARCH', bb.data.expand("${BUILD_ARCH}_${BASE_PACKAGE_ARCH}", d), d)
elif bb.data.inherits_class('nativesdk', d):
bb.data.setVar('PSTAGE2_PKGARCH', bb.data.expand("${SDK_ARCH}", d), d)
elif bb.data.inherits_class('cross-canadian', d):
- bb.data.setVar('PSTAGE2_PKGARCH', bb.data.expand("${SDK_ARCH}_${TARGET_ARCH}", d), d)
+ bb.data.setVar('PSTAGE2_PKGARCH', bb.data.expand("${SDK_ARCH}_${BASE_PACKAGE_ARCH}", d), d)
# These classes encode staging paths into their scripts data so can only be
# reused if we manipulate the paths