diff options
author | Ross Burton <ross.burton@intel.com> | 2016-11-24 11:24:26 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:48:07 +0000 |
commit | 56d3c77ebec22b65efbd9f11abb201af3102df64 (patch) | |
tree | 64fd2842a231266d570f0ad994ff948648746c10 /meta/classes | |
parent | 76b0be1f6a5a2173131424de2c03bc0adaca31f3 (diff) | |
download | poky-56d3c77ebec22b65efbd9f11abb201af3102df64.tar.gz |
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.
(From OE-Core rev: cc545044cba51317bee32e3bf674723e422e3a8a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/insane.bbclass | 3 |
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): | |||
1000 | for pak in packages: | 1000 | for pak in packages: |
1001 | # Go through all variables and check if expanded D is found, warn the user accordingly | 1001 | # Go through all variables and check if expanded D is found, warn the user accordingly |
1002 | for var in 'FILES','pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm': | 1002 | for var in 'FILES','pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm': |
1003 | bbvar = d.getVar(var + "_" + pak, False) | 1003 | bbvar = d.getVar(var + "_" + pak, True) |
1004 | if bbvar: | 1004 | if bbvar: |
1005 | # Bitbake expands ${D} within bbvar during the previous step, so we check for its expanded value | ||
1006 | if expanded_d in bbvar: | 1005 | if expanded_d in bbvar: |
1007 | if var == 'FILES': | 1006 | if var == 'FILES': |
1008 | 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) | 1007 | 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) |