mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
@@ -934,7 +934,7 @@ def package_qa_check_expanded_d(path,name,d,elf,messages):
|
||||
for pak in packages:
|
||||
# Go through all variables and check if expanded D is found, warn the user accordingly
|
||||
for var in 'FILES','pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm':
|
||||
bbvar = d.getVar(var + "_" + pak)
|
||||
bbvar = d.getVar(var + "_" + pak, False)
|
||||
if bbvar:
|
||||
# Bitbake expands ${D} within bbvar during the previous step, so we check for its expanded value
|
||||
if expanded_d in bbvar:
|
||||
@@ -1185,7 +1185,7 @@ python () {
|
||||
for dep in (d.getVar('QADEPENDS', True) or "").split():
|
||||
d.appendVarFlag('do_package_qa', 'depends', " %s:do_populate_sysroot" % dep)
|
||||
for var in 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RCONFLICTS', 'RPROVIDES', 'RREPLACES', 'FILES', 'pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm', 'ALLOW_EMPTY':
|
||||
if d.getVar(var):
|
||||
if d.getVar(var, False):
|
||||
issues.append(var)
|
||||
else:
|
||||
d.setVarFlag('do_package_qa', 'rdeptask', '')
|
||||
|
||||
Reference in New Issue
Block a user