summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-04-26 19:20:26 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-06 10:31:16 +0100
commita8b35766d4f6c4af7dcccf94e7b48b872144fc26 (patch)
treeefe36c153741211e409c086a71baa2d10341796d /meta/classes
parent24eb9b1dfbedf547f068fe79efc885cea08a6cbd (diff)
downloadpoky-a8b35766d4f6c4af7dcccf94e7b48b872144fc26.tar.gz
insane.bbclass: package_qa_check_license -> populate_lic_qa_checksum
The package_qa_check_license() was in do_qa_configure which had a potential problem, when the recipe sets do_configure[noexec] = "1", then the license checking won't run, which may hidden license issues. Rename it to populate_lic_qa_checksum() and run in do_populate_lic[postfuncs] which is more reasonable (when no populate license, no license checking). (From OE-Core rev: b7811bbec1ba373d62ace5c4fc56918e53c69d50) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/insane.bbclass15
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index a1d23d055b..097dc3a001 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -672,7 +672,9 @@ def package_qa_check_symlink_to_sysroot(path, name, d, elf, messages):
672 trimmed = path.replace(os.path.join (d.getVar("PKGDEST", True), name), "") 672 trimmed = path.replace(os.path.join (d.getVar("PKGDEST", True), name), "")
673 package_qa_add_message(messages, "symlink-to-sysroot", "Symlink %s in %s points to TMPDIR" % (trimmed, name)) 673 package_qa_add_message(messages, "symlink-to-sysroot", "Symlink %s in %s points to TMPDIR" % (trimmed, name))
674 674
675def package_qa_check_license(d): 675# Check license variables
676do_populate_lic[postfuncs] += "populate_lic_qa_checksum"
677python populate_lic_qa_checksum() {
676 """ 678 """
677 Check for changes in the license files 679 Check for changes in the license files
678 """ 680 """
@@ -753,6 +755,7 @@ def package_qa_check_license(d):
753 msg = pn + ": LIC_FILES_CHKSUM is not specified for " + url 755 msg = pn + ": LIC_FILES_CHKSUM is not specified for " + url
754 msg = msg + "\n" + pn + ": The md5 checksum is " + md5chksum 756 msg = msg + "\n" + pn + ": The md5 checksum is " + md5chksum
755 package_qa_handle_error("license-checksum", msg, d) 757 package_qa_handle_error("license-checksum", msg, d)
758}
756 759
757def package_qa_check_staged(path,d): 760def package_qa_check_staged(path,d):
758 """ 761 """
@@ -1208,12 +1211,6 @@ Rerun configure task after fixing this.""")
1208Missing inherit gettext?""" % (gt, config)) 1211Missing inherit gettext?""" % (gt, config))
1209 1212
1210 ########################################################################### 1213 ###########################################################################
1211 # Check license variables
1212 ###########################################################################
1213
1214 package_qa_check_license(d)
1215
1216 ###########################################################################
1217 # Check unrecognised configure options (with a white list) 1214 # Check unrecognised configure options (with a white list)
1218 ########################################################################### 1215 ###########################################################################
1219 if bb.data.inherits_class("autotools", d): 1216 if bb.data.inherits_class("autotools", d):
@@ -1261,8 +1258,8 @@ python do_qa_unpack() {
1261#addtask qa_staging after do_populate_sysroot before do_build 1258#addtask qa_staging after do_populate_sysroot before do_build
1262do_populate_sysroot[postfuncs] += "do_qa_staging " 1259do_populate_sysroot[postfuncs] += "do_qa_staging "
1263 1260
1264# Check broken config.log files, for packages requiring Gettext which don't 1261# Check broken config.log files, for packages requiring Gettext which
1265# have it in DEPENDS and for correct LIC_FILES_CHKSUM 1262# don't have it in DEPENDS.
1266#addtask qa_configure after do_configure before do_compile 1263#addtask qa_configure after do_configure before do_compile
1267do_configure[postfuncs] += "do_qa_configure " 1264do_configure[postfuncs] += "do_qa_configure "
1268 1265