From b7811bbec1ba373d62ace5c4fc56918e53c69d50 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 26 Apr 2016 19:20:26 -0700 Subject: 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). Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 15 ++++++--------- 1 file 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): trimmed = path.replace(os.path.join (d.getVar("PKGDEST", True), name), "") package_qa_add_message(messages, "symlink-to-sysroot", "Symlink %s in %s points to TMPDIR" % (trimmed, name)) -def package_qa_check_license(d): +# Check license variables +do_populate_lic[postfuncs] += "populate_lic_qa_checksum" +python populate_lic_qa_checksum() { """ Check for changes in the license files """ @@ -753,6 +755,7 @@ def package_qa_check_license(d): msg = pn + ": LIC_FILES_CHKSUM is not specified for " + url msg = msg + "\n" + pn + ": The md5 checksum is " + md5chksum package_qa_handle_error("license-checksum", msg, d) +} def package_qa_check_staged(path,d): """ @@ -1207,12 +1210,6 @@ Rerun configure task after fixing this.""") bb.fatal("""%s required but not in DEPENDS for file %s. Missing inherit gettext?""" % (gt, config)) - ########################################################################### - # Check license variables - ########################################################################### - - package_qa_check_license(d) - ########################################################################### # Check unrecognised configure options (with a white list) ########################################################################### @@ -1261,8 +1258,8 @@ python do_qa_unpack() { #addtask qa_staging after do_populate_sysroot before do_build do_populate_sysroot[postfuncs] += "do_qa_staging " -# Check broken config.log files, for packages requiring Gettext which don't -# have it in DEPENDS and for correct LIC_FILES_CHKSUM +# Check broken config.log files, for packages requiring Gettext which +# don't have it in DEPENDS. #addtask qa_configure after do_configure before do_compile do_configure[postfuncs] += "do_qa_configure " -- cgit 1.2.3-korg