diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-12 16:18:23 +0100 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-07-16 08:36:58 -0700 |
| commit | 79fe28e6033273f9632ca7549d1599d3fd1463ef (patch) | |
| tree | 4dc3ef728d7a3c6a0559c2f58ca73a2f273d77c6 /meta | |
| parent | 9c8000fdf696e234301a67d51dfeccc9bd1fcace (diff) | |
| download | openembedded-core-79fe28e6033273f9632ca7549d1599d3fd1463ef.tar.gz openembedded-core-79fe28e6033273f9632ca7549d1599d3fd1463ef.tar.bz2 openembedded-core-79fe28e6033273f9632ca7549d1599d3fd1463ef.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/sstate.bbclass | 4 |
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 ?= "" python () { if bb.data.inherits_class('native', d): d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH')) + elif bb.data.inherits_class('crosssdk', d): + d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${SDK_ARCH}")) elif bb.data.inherits_class('cross', d): d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${TUNE_PKGARCH}")) d.setVar('SSTATE_MANMACH', d.expand("${BUILD_ARCH}_${MACHINE}")) - elif bb.data.inherits_class('crosssdk', d): - d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${PACKAGE_ARCH}")) elif bb.data.inherits_class('nativesdk', d): d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}")) elif bb.data.inherits_class('cross-canadian', d): |