summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/license.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index ad12db4838..da4fc3e1d4 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -465,7 +465,7 @@ def find_license_files(d):
465 pass 465 pass
466 466
467 if not generic_directory: 467 if not generic_directory:
468 raise bb.build.FuncFailed("COMMON_LICENSE_DIR is unset. Please set this in your distro config") 468 bb.fatal("COMMON_LICENSE_DIR is unset. Please set this in your distro config")
469 469
470 if not lic_files: 470 if not lic_files:
471 # No recipe should have an invalid license file. This is checked else 471 # No recipe should have an invalid license file. This is checked else
@@ -477,7 +477,7 @@ def find_license_files(d):
477 try: 477 try:
478 (type, host, path, user, pswd, parm) = bb.fetch.decodeurl(url) 478 (type, host, path, user, pswd, parm) = bb.fetch.decodeurl(url)
479 except bb.fetch.MalformedUrl: 479 except bb.fetch.MalformedUrl:
480 raise bb.build.FuncFailed("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF', True), url)) 480 bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF', True), url))
481 # We want the license filename and path 481 # We want the license filename and path
482 chksum = parm['md5'] if 'md5' in parm else parm['sha256'] 482 chksum = parm['md5'] if 'md5' in parm else parm['sha256']
483 lic_chksums[path] = chksum 483 lic_chksums[path] = chksum