summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-11-24 11:24:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-30 15:47:13 +0000
commitcc545044cba51317bee32e3bf674723e422e3a8a (patch)
tree8cb030ee849b5af5fa7f1029836d49504829cf3c
parenta169f11cee3f4288467120cbc363f5e664b86f0c (diff)
downloadopenembedded-core-contrib-cc545044cba51317bee32e3bf674723e422e3a8a.tar.gz
openembedded-core-contrib-cc545044cba51317bee32e3bf674723e422e3a8a.tar.bz2
openembedded-core-contrib-cc545044cba51317bee32e3bf674723e422e3a8a.zip
insane: fix expanded-d test
This test should be looking for the expanded value of ${D} in the expanded value of pkg_postinst and so on, but one of the getVar() calls was passing expand=False so the test would never be true. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/insane.bbclass3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index d51e73eaf4..9f3065fdc7 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1000,9 +1000,8 @@ 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, False)
+ bbvar = d.getVar(var + "_" + pak, True)
if bbvar:
- # Bitbake expands ${D} within bbvar during the previous step, so we check for its expanded value
if expanded_d in bbvar:
if var == 'FILES':
package_qa_add_message(messages, "expanded-d", "FILES in %s recipe should not contain the ${D} variable as it references the local build directory not the target filesystem, best solution is to remove the ${D} reference" % pak)