diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-25 14:25:16 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-27 10:25:34 +0000 |
| commit | 0a434ac10158e2011d41a1189e65e9474b1672be (patch) | |
| tree | 6171516b25cb337343a6373e34aec0d061e4f5e8 /meta/classes/sstate.bbclass | |
| parent | 71fded5145454b144413057e11f78f718d947093 (diff) | |
| download | poky-0a434ac10158e2011d41a1189e65e9474b1672be.tar.gz | |
getVar/setVar cleanups
Complete the bb.data.getVar/setVar replacements with accesses
directly to the data store object.
(From OE-Core rev: 2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sstate.bbclass')
| -rw-r--r-- | meta/classes/sstate.bbclass | 14 |
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 ?= "" | |||
| 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 |