1 files changed, 2 insertions, 2 deletions
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 () {
    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}"))
+        d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"))
    elif bb.data.inherits_class('cross', d):
        d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${TARGET_ARCH}"))
    elif bb.data.inherits_class('nativesdk', d):
-        d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}"))
+        d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${SDK_OS}"))
    elif bb.data.inherits_class('cross-canadian', d):
        d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${PACKAGE_ARCH}"))
    elif bb.data.inherits_class('allarch', d) and d.getVar("PACKAGE_ARCH", True) == "all":

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":