summaryrefslogtreecommitdiffstats
path: root/meta/classes/sstate.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-18 15:14:16 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:57:25 +0100
commit86d30d756a60d181a95cf07041920a367a0cd0ba (patch)
tree950353e2e1cd1e7b812ff941b4d06076acd2c752 /meta/classes/sstate.bbclass
parentf98c8490099a02c42306e1671579631a61c9df73 (diff)
downloadpoky-86d30d756a60d181a95cf07041920a367a0cd0ba.tar.gz
meta: Add explict getVar param for (non) expansion
Rather than just use d.getVar(X), use the more explict d.getVar(X, False) since at some point in the future, having the default of expansion would be nice. This is the first step towards that. This patch was mostly made using the command: sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *` (From OE-Core rev: ab7c1d239b122c8e549e8112c88fd46c9e2b061b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r--meta/classes/sstate.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 89df28af5d..1e5e98a1da 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -66,7 +66,7 @@ sstate_hardcode_path[dirs] = "${SSTATE_BUILDDIR}"
66 66
67python () { 67python () {
68 if bb.data.inherits_class('native', d): 68 if bb.data.inherits_class('native', d):
69 d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH')) 69 d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH', False))
70 elif bb.data.inherits_class('crosssdk', d): 70 elif bb.data.inherits_class('crosssdk', d):
71 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}")) 71 d.setVar('SSTATE_PKGARCH', d.expand("${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"))
72 elif bb.data.inherits_class('cross', d): 72 elif bb.data.inherits_class('cross', d):
@@ -895,7 +895,7 @@ python sstate_eventhandler2() {
895 import glob 895 import glob
896 d = e.data 896 d = e.data
897 stamps = e.stamps.values() 897 stamps = e.stamps.values()
898 removeworkdir = (d.getVar("SSTATE_PRUNE_OBSOLETEWORKDIR") == "1") 898 removeworkdir = (d.getVar("SSTATE_PRUNE_OBSOLETEWORKDIR", False) == "1")
899 seen = [] 899 seen = []
900 for a in d.getVar("SSTATE_ARCHS", True).split(): 900 for a in d.getVar("SSTATE_ARCHS", True).split():
901 toremove = [] 901 toremove = []