summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-02 09:46:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-03 12:40:40 +0100
commit03af60ede97ecd67d17b9fdd9e958ad2b143f946 (patch)
tree34104725a3820860345b3613fea9fcf4876df94a /meta
parent34dc844fe0b25646697c311ec6ce92732c8b50ab (diff)
downloadpoky-03af60ede97ecd67d17b9fdd9e958ad2b143f946.tar.gz
sstate: Allow switching between linux and non-linux SDK builds within the same tmpdir
Currently if you try and switch between linux/darwin/mingw SDK builds in the same TMPDIR, things break. This is due to sstate not reflecting the SDK_OS in the manifest names. Since they are different, reflect this in the manifest naming and allow this to work. (From OE-Core rev: 7a0e1233ba196797f5f9bf862685dfae5511e751) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/autotools.bbclass2
-rw-r--r--meta/classes/sstate.bbclass4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index c67896882d..2136504b8d 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -186,7 +186,7 @@ python autotools_copy_aclocals () {
186 if c.endswith("-native"): 186 if c.endswith("-native"):
187 manifest = d.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}-%s.populate_sysroot" % c) 187 manifest = d.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}-%s.populate_sysroot" % c)
188 elif c.startswith("nativesdk-"): 188 elif c.startswith("nativesdk-"):
189 manifest = d.expand("${SSTATE_MANIFESTS}/manifest-${SDK_ARCH}-%s.populate_sysroot" % c) 189 manifest = d.expand("${SSTATE_MANIFESTS}/manifest-${SDK_ARCH}_${SDK_OS}-%s.populate_sysroot" % c)
190 elif "-cross-" in c or "-crosssdk-" in c: 190 elif "-cross-" in c or "-crosssdk-" in c:
191 continue 191 continue
192 else: 192 else:
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 90119732dd..0d3940e409 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -45,11 +45,11 @@ python () {
45 if bb.data.inherits_class('native', d): 45 if bb.data.inherits_class('native', d):
46 d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH')) 46 d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH'))
47 elif bb.data.inherits_class('crosssdk', d): 47 elif bb.data.inherits_class('crosssdk', d):
48 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${SDK_ARCH}")) 48 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"))
49 elif bb.data.inherits_class('cross', d): 49 elif bb.data.inherits_class('cross', d):
50 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${TARGET_ARCH}")) 50 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${TARGET_ARCH}"))
51 elif bb.data.inherits_class('nativesdk', d): 51 elif bb.data.inherits_class('nativesdk', d):
52 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}")) 52 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${SDK_OS}"))
53 elif bb.data.inherits_class('cross-canadian', d): 53 elif bb.data.inherits_class('cross-canadian', d):
54 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${PACKAGE_ARCH}")) 54 d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${PACKAGE_ARCH}"))
55 elif bb.data.inherits_class('allarch', d) and d.getVar("PACKAGE_ARCH", True) == "all": 55 elif bb.data.inherits_class('allarch', d) and d.getVar("PACKAGE_ARCH", True) == "all":