diff options
Diffstat (limited to 'meta/classes/insane.bbclass')
| -rw-r--r-- | meta/classes/insane.bbclass | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index b06d021b1b..5d3ef92a2e 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -153,8 +153,7 @@ def package_qa_handle_error(error_class, error_msg, name, path, d): if fatal: bb.error("QA Issue: %s" % error_msg) else: - # Use bb.warn here when it works - bb.note("QA Issue: %s" % error_msg) + bb.warn("QA Issue: %s" % error_msg) package_qa_write_error(error_class, name, path, d) return not fatal @@ -348,8 +347,8 @@ def package_qa_check_license(workdir, d): if not lic_files: # just throw a warning now. Once licensing data in entered for enough of the recipes, # this will be converted into error and False will be returned. - bb.warn(pn + ": Recipe file does not have license file information (LIC_FILES_CHKSUM)") - return True + bb.error(pn + ": Recipe file does not have license file information (LIC_FILES_CHKSUM)") + return False srcdir = bb.data.getVar('S', d, True) @@ -357,10 +356,10 @@ def package_qa_check_license(workdir, d): (type, host, path, user, pswd, parm) = bb.decodeurl(url) srclicfile = os.path.join(srcdir, path) if not os.path.isfile(srclicfile): - raise bb.build.FuncFailed( "LIC_FILES_CHKSUM points to invalid file: " + path) + raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to invalid file: " + path) if 'md5' not in parm: - bb.error("md5 checksum is not specified for ", url) + bb.error(pn + ": md5 checksum is not specified for ", url) return False beginline, endline = 0, 0 if 'beginline' in parm: @@ -391,11 +390,11 @@ def package_qa_check_license(workdir, d): os.unlink(tmplicfile) if parm['md5'] == md5chksum: - bb.note ("md5 checksum matched for ", url) + bb.note (pn + ": md5 checksum matched for ", url) else: - bb.error ("md5 data is not matching for ", url) - bb.note ("The new md5 checksum is ", md5chksum) - bb.note ("Check if the license information has changed, and if it has update the .bb file with correct license") + bb.error (pn + ": md5 data is not matching for ", url) + bb.error (pn + ": The new md5 checksum is ", md5chksum) + bb.error (pn + ": Check if the license information has changed in") sane = False return sane @@ -428,11 +427,6 @@ def package_qa_check_staged(path,d): path = os.path.join(root,file) if file.endswith(".la"): file_content = open(path).read() - # Don't check installed status for native/cross packages - if not bb.data.inherits_class("native", d) and not bb.data.inherits_class("cross", d): - if installed in file_content: - error_msg = "%s failed sanity test (installed) in path %s" % (file,root) - sane = package_qa_handle_error(5, error_msg, "staging", path, d) if workdir in file_content: error_msg = "%s failed sanity test (workdir) in path %s" % (file,root) sane = package_qa_handle_error(8, error_msg, "staging", path, d) @@ -534,9 +528,9 @@ python do_package_qa () { checks = [package_qa_check_rpath, package_qa_check_dev, package_qa_check_perm, package_qa_check_arch, - package_qa_check_desktop, + package_qa_check_desktop, package_qa_hash_style, package_qa_check_dbg] - # package_qa_check_buildpaths, package_qa_hash_style + # package_qa_check_buildpaths, walk_sane = True rdepends_sane = True for package in packages.split(): @@ -581,7 +575,7 @@ python do_qa_configure() { os.path.join(root,"config.log") if "config.log" in files: if os.system(statement) == 0: - bb.fatal("""This autoconf log indicates errors, it looked at host includes. + bb.fatal("""This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. Rerun configure task after fixing this. The path was '%s'""" % root) if "configure.ac" in files: @@ -605,5 +599,5 @@ Rerun configure task after fixing this. The path was '%s'""" % root) Missing inherit gettext?""" % config) if not package_qa_check_license(workdir, d): - bb.fatal("Licensing warning: LIC_FILES_CHKSUM does not match, please fix") + bb.fatal("Licensing Error: LIC_FILES_CHKSUM does not match, please fix") } |