summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-12 16:18:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:53:57 +0100
commit72df57b3a5fee4e82d2428c164f39c00fdfdc9c2 (patch)
treee91afe2e5e724389ecd71bafad49fccd86185c6a /meta
parenteb19ce2763a94656ddde5d60d3b6277873ca7097 (diff)
downloadpoky-72df57b3a5fee4e82d2428c164f39c00fdfdc9c2.tar.gz
sstate.bbclass: Move crosssdk before cross to ensure correct variables are set
There was a bug showing up where the crosssdk recipes were being installed as machine specific in the sstate-control directory. This turned out to be due to the architecture fields used by sstate being set incorrectly. The problem is that the crosssdk inherits the cross class. It therefore needs to be listed in this if statement block before the cross check, not after. This should resolve some package architecture issue of crosssdk sstate files. (From OE-Core rev: 79fe28e6033273f9632ca7549d1599d3fd1463ef) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sstate.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 4242f88544..c2c5bd5c25 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -23,11 +23,11 @@ SSTATEPOSTINSTFUNCS ?= ""
23python () { 23python () {
24 if bb.data.inherits_class('native', d): 24 if bb.data.inherits_class('native', d):
25 d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH')) 25 d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH'))
26 elif bb.data.inherits_class('crosssdk', d):
27 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${SDK_ARCH}"))
26 elif bb.data.inherits_class('cross', d): 28 elif bb.data.inherits_class('cross', d):
27 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${TUNE_PKGARCH}")) 29 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${TUNE_PKGARCH}"))
28 d.setVar('SSTATE_MANMACH', d.expand("${BUILD_ARCH}_${MACHINE}")) 30 d.setVar('SSTATE_MANMACH', d.expand("${BUILD_ARCH}_${MACHINE}"))
29 elif bb.data.inherits_class('crosssdk', d):
30 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${PACKAGE_ARCH}"))
31 elif bb.data.inherits_class('nativesdk', d): 31 elif bb.data.inherits_class('nativesdk', d):
32 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}")) 32 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}"))
33 elif bb.data.inherits_class('cross-canadian', d): 33 elif bb.data.inherits_class('cross-canadian', d):