summaryrefslogtreecommitdiffstats
path: root/meta/classes/insane.bbclass
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-11-13 14:32:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-14 13:39:48 +0000
commit8692eebc0051cb494690ddcf6f4698f46eebb660 (patch)
tree5efc31ac3d57d7bb787148116c79da1cb00fd94f /meta/classes/insane.bbclass
parent6f54fa277d411961fca37e03d3a08ab8e0d7575f (diff)
downloadpoky-8692eebc0051cb494690ddcf6f4698f46eebb660.tar.gz
classes/insane: improve LIC_FILES_CHKSUM messages
* If the md5 parameter is specified with no value, report that the checksum is not specified instead of reporting that it has changed * If the md5 checksum has changed, point directly to the license file in a way that is easy to copy and paste and give the line numbers in an easy to read form, as well as asking the user to verify that the new contents matches the current LICENSE value. (From OE-Core rev: ec8590aa81e201e28e500935d31cd7266114471f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/insane.bbclass')
-rw-r--r--meta/classes/insane.bbclass16
1 files changed, 13 insertions, 3 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 3558dee1b0..f9f8deffa3 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -602,7 +602,8 @@ def package_qa_check_license(workdir, d):
602 if not os.path.isfile(srclicfile): 602 if not os.path.isfile(srclicfile):
603 raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to an invalid file: " + srclicfile) 603 raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to an invalid file: " + srclicfile)
604 604
605 if 'md5' not in parm: 605 recipemd5 = parm.get('md5', '')
606 if not recipemd5:
606 bb.error(pn + ": md5 checksum is not specified for ", url) 607 bb.error(pn + ": md5 checksum is not specified for ", url)
607 return False 608 return False
608 beginline, endline = 0, 0 609 beginline, endline = 0, 0
@@ -633,12 +634,21 @@ def package_qa_check_license(workdir, d):
633 md5chksum = bb.utils.md5_file(tmplicfile) 634 md5chksum = bb.utils.md5_file(tmplicfile)
634 os.unlink(tmplicfile) 635 os.unlink(tmplicfile)
635 636
636 if parm['md5'] == md5chksum: 637 if recipemd5 == md5chksum:
637 bb.note (pn + ": md5 checksum matched for ", url) 638 bb.note (pn + ": md5 checksum matched for ", url)
638 else: 639 else:
639 bb.error (pn + ": md5 data is not matching for ", url) 640 bb.error (pn + ": md5 data is not matching for ", url)
640 bb.error (pn + ": The new md5 checksum is ", md5chksum) 641 bb.error (pn + ": The new md5 checksum is ", md5chksum)
641 bb.error (pn + ": Check if the license information has changed in") 642 if beginline:
643 if endline:
644 srcfiledesc = "%s (lines %d through to %d)" % (srclicfile, beginline, endline)
645 else:
646 srcfiledesc = "%s (beginning on line %d)" % (srclicfile, beginline)
647 elif endline:
648 srcfiledesc = "%s (ending on line %d)" % (srclicfile, endline)
649 else:
650 srcfiledesc = srclicfile
651 bb.error(pn + ": Check if the license information has changed in %s to verify that the LICENSE value \"%s\" remains valid" % (srcfiledesc, lic))
642 sane = False 652 sane = False
643 653
644 return sane 654 return sane