]> code.ossystems Code Review - openembedded-core.git/commitdiff
insane: fix expanded-d test
authorRoss Burton <ross.burton@intel.com>
Thu, 24 Nov 2016 11:24:26 +0000 (11:24 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 30 Nov 2016 15:47:13 +0000 (15:47 +0000)
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>
meta/classes/insane.bbclass

index d51e73eaf48f4b7d238d4b3115a14b80c989ee47..9f3065fdc7cf21dd102503cf2c2107d5bda60c67 100644 (file)
@@ -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)