aboutsummaryrefslogtreecommitdiff
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:13:20 +0100
commit7f74ff71ae9d9ef1ca55c12be16094f1a9d7fade (patch)
tree834a110f6870c8d6a36eeb1d9c93429113c6c7c1
parentb01272e99be11eedbc7c52730307735055b48bab (diff)
downloadopenembedded-core-7f74ff71ae9d9ef1ca55c12be16094f1a9d7fade.zip
openembedded-core-7f74ff71ae9d9ef1ca55c12be16094f1a9d7fade.tar.gz
openembedded-core-7f74ff71ae9d9ef1ca55c12be16094f1a9d7fade.tar.bz2
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> Signed-off-by: Armin Kuster <akuster808@gmail.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 d4be478..b1fffe7 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -491,7 +491,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)