aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-08-24 16:54:23 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-08-31 11:33:53 +1200
commitdf4c691694e90455864e890936727b40787a8d49 (patch)
treef58ae1d245764bc03cc2899534875b3caf81abca
parent62f1122ef166eba56441d669c6b3b3fe5f367418 (diff)
downloadopenembedded-core-contrib-paule/lic-sha256-drop.tar.gz
openembedded-core-contrib-paule/lic-sha256-drop.tar.bz2
openembedded-core-contrib-paule/lic-sha256-drop.zip
classes/license: drop erroneous sha256 parameter in LIC_FILES_CHKSUMpaule/lic-sha256-drop
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-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):
except bb.fetch.MalformedUrl:
bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL: %s" % (d.getVar('PF'), url))
# We want the license filename and path
- chksum = parm['md5'] if 'md5' in parm else parm['sha256']
+ chksum = parm.get('md5', None)
beginline = parm.get('beginline')
endline = parm.get('endline')
lic_chksums[path] = (chksum, beginline, endline)