Skip to contentSkip to conversation

classes/license: drop erroneous sha256 parameter in LIC_FILES_CHKSUM

PATCH New Paul Eggleton 1 participant 2 messages Aug 30, 2017

lore
Share & tools
lore
#0 lore raw

cover classes/license: drop erroneous sha256 parameter in LIC_FILES_CHKSUM

Drop what seems to be an erroneous parameter from LIC_FILES_CHKSUM handling code.

The following changes since commit 62f1122ef166eba56441d669c6b3b3fe5f367418:

bluez5: cosmetic fixes to bluetooth bootscript (2017-08-30 11:13:52 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/lic-sha256-drop
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=paule/lic-sha256-drop

Paul Eggleton (1):
classes/license: drop erroneous sha256 parameter in LIC_FILES_CHKSUM

 meta/classes/license.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
2.9.5
#1 lore raw

PATCH 1/1 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.

---
 meta/classes/license.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/license.bbclass +1 -1
index 4f7842c..d353110 100644
@@ -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)
Signature · 1 line
2.9.5