summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-08-31 11:46:22 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 23:30:03 +0100
commit133e8033092e16af935757c25ce7d85478ca65bf (patch)
treea07f52ebb8d5b44690af3bcf8f4fef42decc5346 /meta
parentfc9f8c3011ac099a1d3ff3af6b8ff4a0542c4dc4 (diff)
downloadpoky-133e8033092e16af935757c25ce7d85478ca65bf.tar.gz
classes/license: drop erroneous sha256 parameter in LIC_FILES_CHKSUM
In OE-Core commit a48fea275b08ff3d3dfc9a928aeb04768db35873, a check on the value of a "sha256" parameter was added, however there was no mention of this in the commit message and no corresponding code to actually verify the checksum as sha256 was added along with it either, so there's no point in getting the value. Additionally it was assuming that a sha256 value would be present without checking first, with the result that if you leave out the md5 value in a recipe intentionally in order to get it to tell you the correct value on the next build, you got a traceback instead of the appropriate error containing the information. Drop this entirely - if we want to implement this we need to do it properly. (From OE-Core rev: e9eaa7d15fe7ab643ab19556dab84051f8f1974e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/license.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 4f7842c3db..d353110464 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -486,7 +486,7 @@ def find_license_files(d):
486 except bb.fetch.MalformedUrl: 486 except bb.fetch.MalformedUrl:
487 bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF'), url)) 487 bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF'), url))
488 # We want the license filename and path 488 # We want the license filename and path
489 chksum = parm['md5'] if 'md5' in parm else parm['sha256'] 489 chksum = parm.get('md5', None)
490 beginline = parm.get('beginline') 490 beginline = parm.get('beginline')
491 endline = parm.get('endline') 491 endline = parm.get('endline')
492 lic_chksums[path] = (chksum, beginline, endline) 492 lic_chksums[path] = (chksum, beginline, endline)