summaryrefslogtreecommitdiffstats
path: root/meta/classes/insane.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/insane.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/insane.bbclass')
-rw-r--r--meta/classes/insane.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index a11085313b..4537eec891 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -934,7 +934,7 @@ def package_qa_check_expanded_d(path,name,d,elf,messages):
934 for pak in packages: 934 for pak in packages:
935 # Go through all variables and check if expanded D is found, warn the user accordingly 935 # Go through all variables and check if expanded D is found, warn the user accordingly
936 for var in 'FILES','pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm': 936 for var in 'FILES','pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm':
937 bbvar = d.getVar(var + "_" + pak) 937 bbvar = d.getVar(var + "_" + pak, False)
938 if bbvar: 938 if bbvar:
939 # Bitbake expands ${D} within bbvar during the previous step, so we check for its expanded value 939 # Bitbake expands ${D} within bbvar during the previous step, so we check for its expanded value
940 if expanded_d in bbvar: 940 if expanded_d in bbvar:
@@ -1185,7 +1185,7 @@ python () {
1185 for dep in (d.getVar('QADEPENDS', True) or "").split(): 1185 for dep in (d.getVar('QADEPENDS', True) or "").split():
1186 d.appendVarFlag('do_package_qa', 'depends', " %s:do_populate_sysroot" % dep) 1186 d.appendVarFlag('do_package_qa', 'depends', " %s:do_populate_sysroot" % dep)
1187 for var in 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RCONFLICTS', 'RPROVIDES', 'RREPLACES', 'FILES', 'pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm', 'ALLOW_EMPTY': 1187 for var in 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RCONFLICTS', 'RPROVIDES', 'RREPLACES', 'FILES', 'pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm', 'ALLOW_EMPTY':
1188 if d.getVar(var): 1188 if d.getVar(var, False):
1189 issues.append(var) 1189 issues.append(var)
1190 else: 1190 else:
1191 d.setVarFlag('do_package_qa', 'rdeptask', '') 1191 d.setVarFlag('do_package_qa', 'rdeptask', '')