diff options
author | Saul Wold <sgw@linux.intel.com> | 2011-01-05 18:18:55 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-06 10:06:32 +0000 |
commit | d2d5456cd3b3bd3e52a5dedccca4d46e3a7986d1 (patch) | |
tree | 2931470b69821305d33f8c8b4b52f6dea9329fc4 | |
parent | b91c0f435bb7af58ccf31678ffebc890908d37cd (diff) | |
download | poky-d2d5456cd3b3bd3e52a5dedccca4d46e3a7986d1.tar.gz |
insane.bbclass: Fix message for LIC_FILES_CHKSUM Errors
Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r-- | meta/classes/insane.bbclass | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 225530a2c9..71ed5b6433 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -349,7 +349,7 @@ def package_qa_check_license(workdir, d): | |||
349 | # just throw a warning now. Once licensing data in entered for enough of the recipes, | 349 | # just throw a warning now. Once licensing data in entered for enough of the recipes, |
350 | # this will be converted into error and False will be returned. | 350 | # this will be converted into error and False will be returned. |
351 | bb.error(pn + ": Recipe file does not have license file information (LIC_FILES_CHKSUM)") | 351 | bb.error(pn + ": Recipe file does not have license file information (LIC_FILES_CHKSUM)") |
352 | return True | 352 | return False |
353 | 353 | ||
354 | srcdir = bb.data.getVar('S', d, True) | 354 | srcdir = bb.data.getVar('S', d, True) |
355 | 355 | ||
@@ -357,10 +357,10 @@ def package_qa_check_license(workdir, d): | |||
357 | (type, host, path, user, pswd, parm) = bb.decodeurl(url) | 357 | (type, host, path, user, pswd, parm) = bb.decodeurl(url) |
358 | srclicfile = os.path.join(srcdir, path) | 358 | srclicfile = os.path.join(srcdir, path) |
359 | if not os.path.isfile(srclicfile): | 359 | if not os.path.isfile(srclicfile): |
360 | raise bb.build.FuncFailed( "LIC_FILES_CHKSUM points to invalid file: " + path) | 360 | raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to invalid file: " + path) |
361 | 361 | ||
362 | if 'md5' not in parm: | 362 | if 'md5' not in parm: |
363 | bb.error("md5 checksum is not specified for ", url) | 363 | bb.error(pn + ": md5 checksum is not specified for ", url) |
364 | return False | 364 | return False |
365 | beginline, endline = 0, 0 | 365 | beginline, endline = 0, 0 |
366 | if 'beginline' in parm: | 366 | if 'beginline' in parm: |
@@ -391,11 +391,11 @@ def package_qa_check_license(workdir, d): | |||
391 | os.unlink(tmplicfile) | 391 | os.unlink(tmplicfile) |
392 | 392 | ||
393 | if parm['md5'] == md5chksum: | 393 | if parm['md5'] == md5chksum: |
394 | bb.note ("md5 checksum matched for ", url) | 394 | bb.note (pn + ": md5 checksum matched for ", url) |
395 | else: | 395 | else: |
396 | bb.error ("md5 data is not matching for ", url) | 396 | bb.error (pn + ": md5 data is not matching for ", url) |
397 | bb.error ("The new md5 checksum is ", md5chksum) | 397 | bb.error (pn + ": The new md5 checksum is ", md5chksum) |
398 | bb.error ("Check if the license information has changed, and if it has update the .bb file with correct license") | 398 | bb.error (pn + ": Check if the license information has changed in") |
399 | sane = False | 399 | sane = False |
400 | 400 | ||
401 | return sane | 401 | return sane |
@@ -605,5 +605,5 @@ Rerun configure task after fixing this. The path was '%s'""" % root) | |||
605 | Missing inherit gettext?""" % config) | 605 | Missing inherit gettext?""" % config) |
606 | 606 | ||
607 | if not package_qa_check_license(workdir, d): | 607 | if not package_qa_check_license(workdir, d): |
608 | bb.error("Licensing warning: LIC_FILES_CHKSUM does not match, please fix") | 608 | bb.fatal("Licensing Error: LIC_FILES_CHKSUM does not match, please fix") |
609 | } | 609 | } |