summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorScott Weaver <weaverjs@gmail.com>2021-05-25 08:37:02 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-05 20:49:51 +0100
commitab03f130e449fdb24de79b119c73f0969f1bd801 (patch)
tree47751c13d7cfcfc6c870dee2aacd92ba6f7d21a3 /bitbake
parenta743227d8137c3cb9500f7cdb4f79f7d8ed9a0cb (diff)
downloadpoky-ab03f130e449fdb24de79b119c73f0969f1bd801.tar.gz
bitbake: fetch2: add check for empty SRC_URI hash string
No error was being reported when the hash string was set to empty. For example: SRC_URI[md5sum] = "" On a related note (not a bug): Because whitespace in the string will result in a checksum mismatch, the error message was updated to make it a little clearer why the error was thrown. For example: SRC_URI[md5sum] = " " or SRC_URI[md5sum] = " 209f8326f5137d8817a6276d9577a2f1" Now creates a message like this: File: '/home/scott/yocto-cache/downloads/rsync-3.2.3.tar.gz' has md5 checksum '209f8326f5137d8817a6276d9577a2f1' when ' 209f8326f5137d8817a6276d9577a2f1' was expected [YOCTO #14232] (Bitbake rev: d8c2175f6a7b5fdf111d6a073b2c3dbd3c0b061d) Signed-off-by: Scott Weaver <weaverjs@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit a13510d0028e234ea2f4744b0d0c38558395c70f) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index dc99914cd9..3e6555bd67 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -562,6 +562,9 @@ def verify_checksum(ud, d, precomputed={}):
562 562
563 checksum_expected = getattr(ud, "%s_expected" % checksum_id) 563 checksum_expected = getattr(ud, "%s_expected" % checksum_id)
564 564
565 if checksum_expected == '':
566 checksum_expected = None
567
565 return { 568 return {
566 "id": checksum_id, 569 "id": checksum_id,
567 "name": checksum_name, 570 "name": checksum_name,
@@ -612,7 +615,7 @@ def verify_checksum(ud, d, precomputed={}):
612 615
613 for ci in checksum_infos: 616 for ci in checksum_infos:
614 if ci["expected"] and ci["expected"] != ci["data"]: 617 if ci["expected"] and ci["expected"] != ci["data"]:
615 messages.append("File: '%s' has %s checksum %s when %s was " \ 618 messages.append("File: '%s' has %s checksum '%s' when '%s' was " \
616 "expected" % (ud.localpath, ci["id"], ci["data"], ci["expected"])) 619 "expected" % (ud.localpath, ci["id"], ci["data"], ci["expected"]))
617 bad_checksum = ci["data"] 620 bad_checksum = ci["data"]
618 621