1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 951caa360f..504b09975d 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -20,18 +20,18 @@ SSTATEPOSTINSTFUNCS ?= ""
 python () {
    if bb.data.inherits_class('native', d):
-        bb.data.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH'), d)
+        d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH'))
    elif bb.data.inherits_class('cross', d):
-        bb.data.setVar('SSTATE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${TUNE_PKGARCH}", d), d)
+        d.setVar('SSTATE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${TUNE_PKGARCH}", d))
-        bb.data.setVar('SSTATE_MANMACH', bb.data.expand("${BUILD_ARCH}_${MACHINE}", d), d)
+        d.setVar('SSTATE_MANMACH', bb.data.expand("${BUILD_ARCH}_${MACHINE}", d))
    elif bb.data.inherits_class('crosssdk', d):
-        bb.data.setVar('SSTATE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${PACKAGE_ARCH}", d), d)
+        d.setVar('SSTATE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${PACKAGE_ARCH}", d))
    elif bb.data.inherits_class('nativesdk', d):
-        bb.data.setVar('SSTATE_PKGARCH', bb.data.expand("${SDK_ARCH}", d), d)
+        d.setVar('SSTATE_PKGARCH', bb.data.expand("${SDK_ARCH}", d))
    elif bb.data.inherits_class('cross-canadian', d):
-        bb.data.setVar('SSTATE_PKGARCH', bb.data.expand("${SDK_ARCH}_${PACKAGE_ARCH}", d), d)
+        d.setVar('SSTATE_PKGARCH', bb.data.expand("${SDK_ARCH}_${PACKAGE_ARCH}", d))
    else:
-        bb.data.setVar('SSTATE_MANMACH', bb.data.expand("${MACHINE}", d), d)
+        d.setVar('SSTATE_MANMACH', bb.data.expand("${MACHINE}", d))
    # These classes encode staging paths into their scripts data so can only be
    # reused if we manipulate the paths

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 951caa360f..504b09975d 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass
@@ -20,18 +20,18 @@ SSTATEPOSTINSTFUNCS ?= ""
20		20
21	python () {	21	python () {
22	if bb.data.inherits_class('native', d):	22	if bb.data.inherits_class('native', d):
23	bb.data.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH'), d)	23	d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH'))
24	elif bb.data.inherits_class('cross', d):	24	elif bb.data.inherits_class('cross', d):
25	bb.data.setVar('SSTATE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${TUNE_PKGARCH}", d), d)	25	d.setVar('SSTATE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${TUNE_PKGARCH}", d))
26	bb.data.setVar('SSTATE_MANMACH', bb.data.expand("${BUILD_ARCH}_${MACHINE}", d), d)	26	d.setVar('SSTATE_MANMACH', bb.data.expand("${BUILD_ARCH}_${MACHINE}", d))
27	elif bb.data.inherits_class('crosssdk', d):	27	elif bb.data.inherits_class('crosssdk', d):
28	bb.data.setVar('SSTATE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${PACKAGE_ARCH}", d), d)	28	d.setVar('SSTATE_PKGARCH', bb.data.expand("${BUILD_ARCH}_${PACKAGE_ARCH}", d))
29	elif bb.data.inherits_class('nativesdk', d):	29	elif bb.data.inherits_class('nativesdk', d):
30	bb.data.setVar('SSTATE_PKGARCH', bb.data.expand("${SDK_ARCH}", d), d)	30	d.setVar('SSTATE_PKGARCH', bb.data.expand("${SDK_ARCH}", d))
31	elif bb.data.inherits_class('cross-canadian', d):	31	elif bb.data.inherits_class('cross-canadian', d):
32	bb.data.setVar('SSTATE_PKGARCH', bb.data.expand("${SDK_ARCH}_${PACKAGE_ARCH}", d), d)	32	d.setVar('SSTATE_PKGARCH', bb.data.expand("${SDK_ARCH}_${PACKAGE_ARCH}", d))
33	else:	33	else:
34	bb.data.setVar('SSTATE_MANMACH', bb.data.expand("${MACHINE}", d), d)	34	d.setVar('SSTATE_MANMACH', bb.data.expand("${MACHINE}", d))
35		35
36	# These classes encode staging paths into their scripts data so can only be	36	# These classes encode staging paths into their scripts data so can only be
37	# reused if we manipulate the paths	37	# reused if we manipulate the paths