summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
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/recipes-extended
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/recipes-extended')
-rw-r--r--meta/recipes-extended/lsof/lsof_4.88.bb4
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb4
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-extended/lsof/lsof_4.88.bb b/meta/recipes-extended/lsof/lsof_4.88.bb
index bc8774f9da..c0f34b6fed 100644
--- a/meta/recipes-extended/lsof/lsof_4.88.bb
+++ b/meta/recipes-extended/lsof/lsof_4.88.bb
@@ -17,12 +17,12 @@ LIC_FILES_CHKSUM = "file://${S}/00README;beginline=645;endline=679;md5=964df275d
17python do_unpack () { 17python do_unpack () {
18 # temporarily change S for unpack 18 # temporarily change S for unpack
19 # of lsof_${PV} 19 # of lsof_${PV}
20 s = d.getVar('S') 20 s = d.getVar('S', False)
21 d.setVar('S', '${WORKDIR}/lsof_${PV}') 21 d.setVar('S', '${WORKDIR}/lsof_${PV}')
22 bb.build.exec_func('base_do_unpack', d) 22 bb.build.exec_func('base_do_unpack', d)
23 # temporarily change SRC_URI for unpack 23 # temporarily change SRC_URI for unpack
24 # of lsof_${PV}_src 24 # of lsof_${PV}_src
25 src_uri = d.getVar('SRC_URI') 25 src_uri = d.getVar('SRC_URI', False)
26 d.setVar('SRC_URI', '${LOCALSRC}') 26 d.setVar('SRC_URI', '${LOCALSRC}')
27 d.setVar('S', s) 27 d.setVar('S', s)
28 bb.build.exec_func('base_do_unpack', d) 28 bb.build.exec_func('base_do_unpack', d)
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 31b71e2bc3..3cb23051f8 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -204,8 +204,8 @@ RDEPENDS_packagegroup-core-lsb-python = "\
204" 204"
205 205
206def get_libqt3(d): 206def get_libqt3(d):
207 if 'linuxstdbase' in d.getVar('DISTROOVERRIDES') or "": 207 if 'linuxstdbase' in d.getVar('DISTROOVERRIDES', False) or "":
208 if 'qt3' in d.getVar('BBFILE_COLLECTIONS') or "": 208 if 'qt3' in d.getVar('BBFILE_COLLECTIONS', False) or "":
209 return 'libqt-mt3' 209 return 'libqt-mt3'
210 210
211 bb.warn('The meta-qt3 layer should be added, this layer provides Qt 3.x' \ 211 bb.warn('The meta-qt3 layer should be added, this layer provides Qt 3.x' \