summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-02-26 16:02:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-02 18:43:24 +0000
commitc486c6609a77d50a60f582ce53b592a717ec9b16 (patch)
tree6a3712618ca5880388193fecb8b44ca0cbeb1562
parenteec3bbdd27652aec93f32a61c984c6e633e824bc (diff)
downloadpoky-c486c6609a77d50a60f582ce53b592a717ec9b16.tar.gz
sstate: do not add TARGET_ARCH to pkgarch for cross recipes.
This is redundant (target arch is already in PN), and breaks compiling a cross-canadian toolchain, as that needs populating the sysroot with two different native-hosted toolchains built from cross recipes. Inserting TARGET_ARCH allows only one or the other. (From OE-Core rev: 33fc1792cd782feb8dbb4285e3006bb588f7978f) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass3
-rw-r--r--meta/lib/oe/sstatesig.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 787172b408..dc9a2c085b 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -83,7 +83,6 @@ SSTATE_ARCHS = " \
83 ${BUILD_ARCH} \ 83 ${BUILD_ARCH} \
84 ${BUILD_ARCH}_${ORIGNATIVELSBSTRING} \ 84 ${BUILD_ARCH}_${ORIGNATIVELSBSTRING} \
85 ${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS} \ 85 ${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS} \
86 ${BUILD_ARCH}_${TARGET_ARCH} \
87 ${SDK_ARCH}_${SDK_OS} \ 86 ${SDK_ARCH}_${SDK_OS} \
88 ${SDK_ARCH}_${PACKAGE_ARCH} \ 87 ${SDK_ARCH}_${PACKAGE_ARCH} \
89 allarch \ 88 allarch \
@@ -138,7 +137,7 @@ python () {
138 elif bb.data.inherits_class('crosssdk', d): 137 elif bb.data.inherits_class('crosssdk', d):
139 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}")) 138 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"))
140 elif bb.data.inherits_class('cross', d): 139 elif bb.data.inherits_class('cross', d):
141 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${TARGET_ARCH}")) 140 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}"))
142 elif bb.data.inherits_class('nativesdk', d): 141 elif bb.data.inherits_class('nativesdk', d):
143 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${SDK_OS}")) 142 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${SDK_OS}"))
144 elif bb.data.inherits_class('cross-canadian', d): 143 elif bb.data.inherits_class('cross-canadian', d):
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index abcd96231e..2cf858e201 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -443,7 +443,7 @@ def find_sstate_manifest(taskdata, taskdata2, taskname, d, multilibcache):
443 elif "-cross-canadian" in taskdata: 443 elif "-cross-canadian" in taskdata:
444 pkgarchs = ["${SDK_ARCH}_${SDK_ARCH}-${SDKPKGSUFFIX}"] 444 pkgarchs = ["${SDK_ARCH}_${SDK_ARCH}-${SDKPKGSUFFIX}"]
445 elif "-cross-" in taskdata: 445 elif "-cross-" in taskdata:
446 pkgarchs = ["${BUILD_ARCH}_${TARGET_ARCH}"] 446 pkgarchs = ["${BUILD_ARCH}"]
447 elif "-crosssdk" in taskdata: 447 elif "-crosssdk" in taskdata:
448 pkgarchs = ["${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"] 448 pkgarchs = ["${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"]
449 else: 449 else: