summaryrefslogtreecommitdiffstats
path: root/meta/classes/allarch.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-24 17:48:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-26 10:44:27 +0000
commitbb5fe4c35dcc8df0acd29c6d7f43de82d5744b75 (patch)
tree6e0b3150bd4c6c1b9adbf48be940541e04d6c839 /meta/classes/allarch.bbclass
parentaa7e2717d33c2d754ec486e9148f446c1d6a3b14 (diff)
downloadpoky-bb5fe4c35dcc8df0acd29c6d7f43de82d5744b75.tar.gz
staging/allarch: Remove hardcoded PACKAGE_ARCHS from the class
The code was making an assumption that the only PACKAGE_ARCH in use was TUNE_PKGARCH. This is incorrect so iterate over the list from PACKAGE_EXTRA_ARCH instead. We also need to change allarch to preserve this variable, else the staging code doesn't function. We do this in a way which clears the variable history so that the task hashes remain unaffected. [Thanks to Andrew Goodbody <andrew.goodbody@cambrionix.com> for testing/fixing] (From OE-Core rev: b1bab7a6eff6b195824be7d754de58c6e9ee2bfb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/allarch.bbclass')
-rw-r--r--meta/classes/allarch.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass
index 026214ea9a..a7748416e9 100644
--- a/meta/classes/allarch.bbclass
+++ b/meta/classes/allarch.bbclass
@@ -25,7 +25,9 @@ python () {
25 d.setVar("TARGET_AS_ARCH", "none") 25 d.setVar("TARGET_AS_ARCH", "none")
26 d.setVar("TARGET_FPU", "") 26 d.setVar("TARGET_FPU", "")
27 d.setVar("TARGET_PREFIX", "") 27 d.setVar("TARGET_PREFIX", "")
28 d.setVar("PACKAGE_EXTRA_ARCHS", "") 28 # Expand PACKAGE_EXTRA_ARCHS since the staging code needs this
29 # (this removes any dependencies from the hash perspective)
30 d.setVar("PACKAGE_EXTRA_ARCHS", d.getVar("PACKAGE_EXTRA_ARCHS"))
29 d.setVar("SDK_ARCH", "none") 31 d.setVar("SDK_ARCH", "none")
30 d.setVar("SDK_CC_ARCH", "none") 32 d.setVar("SDK_CC_ARCH", "none")
31 d.setVar("TARGET_CPPFLAGS", "none") 33 d.setVar("TARGET_CPPFLAGS", "none")