summaryrefslogtreecommitdiffstats
path: root/meta/classes/sstate.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-25 20:23:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-26 10:01:24 +0000
commit13ecfdb3310378a27c863a915a8f7d65f66cb725 (patch)
tree8cec910d0b9830f8d8eea8a4293506fba9d4f783 /meta/classes/sstate.bbclass
parent668f7e36fe2c681a1b5c7604fe34960956448eec (diff)
downloadpoky-13ecfdb3310378a27c863a915a8f7d65f66cb725.tar.gz
packagegroup/allarch: Convert to use allarch class
Currently there is some odd behaviour of the packagegroup class in relation to sstate since it sets PACKAGE_ARCH = "all" but does not use the allarch class leading to it being undetected by sstate. Previously it was not possible to use allarch as the recipe couldn't "undo" settings made by the allarch class. Since this no longer happens when PACKAGE_ARCH != all, we can use the allarch class. This patch also fixes up one case we need to preserve TRANSLATED_TARGET_ARCH and ensures sstate only assumes allarch when PACKAGE_ARCH is "all". (From OE-Core rev: 591fa7c1ab9e9ff75fdce602c77ecdeda3a255d9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r--meta/classes/sstate.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index e1bc89d05e..6de35e6dc9 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -46,7 +46,7 @@ python () {
46 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}")) 46 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}"))
47 elif bb.data.inherits_class('cross-canadian', d): 47 elif bb.data.inherits_class('cross-canadian', d):
48 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${PACKAGE_ARCH}")) 48 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${PACKAGE_ARCH}"))
49 elif bb.data.inherits_class('allarch', d): 49 elif bb.data.inherits_class('allarch', d) and d.getVar("PACKAGE_ARCH", True) == "all":
50 d.setVar('SSTATE_PKGARCH', "allarch") 50 d.setVar('SSTATE_PKGARCH', "allarch")
51 else: 51 else:
52 d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}")) 52 d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))