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-09-11 22:15:59 +0100
commit54efca180ba02bd7a3d51d23ed426c7b31d06eda (patch)
treeb17d3a7fab7c8ad123c3c7a19d0219c388a49012 /meta
parent21c1a327466f46729f715a5ad5b61dcafc7b04fb (diff)
downloadpoky-54efca180ba02bd7a3d51d23ed426c7b31d06eda.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) (From OE-Core rev: fcedfce43adad8659a1376bb28b1ed41e621dd53) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.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 d4be478166..b1fffe70fe 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -491,7 +491,7 @@ def find_license_files(d):
491 except bb.fetch.MalformedUrl: 491 except bb.fetch.MalformedUrl:
492 bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF'), url)) 492 bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF'), url))
493 # We want the license filename and path 493 # We want the license filename and path
494 chksum = parm['md5'] if 'md5' in parm else parm['sha256'] 494 chksum = parm.get('md5', None)
495 beginline = parm.get('beginline') 495 beginline = parm.get('beginline')
496 endline = parm.get('endline') 496 endline = parm.get('endline')
497 lic_chksums[path] = (chksum, beginline, endline) 497 lic_chksums[path] = (chksum, beginline, endline)