From b1bab7a6eff6b195824be7d754de58c6e9ee2bfb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 24 Jan 2017 17:48:09 +0000 Subject: 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 for testing/fixing] Signed-off-by: Richard Purdie --- meta/classes/allarch.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/classes/allarch.bbclass') 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 () { d.setVar("TARGET_AS_ARCH", "none") d.setVar("TARGET_FPU", "") d.setVar("TARGET_PREFIX", "") - d.setVar("PACKAGE_EXTRA_ARCHS", "") + # Expand PACKAGE_EXTRA_ARCHS since the staging code needs this + # (this removes any dependencies from the hash perspective) + d.setVar("PACKAGE_EXTRA_ARCHS", d.getVar("PACKAGE_EXTRA_ARCHS")) d.setVar("SDK_ARCH", "none") d.setVar("SDK_CC_ARCH", "none") d.setVar("TARGET_CPPFLAGS", "none") -- cgit v1.2.3