diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-09-04 19:33:11 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-09-05 21:49:17 +0100 |
commit | c6b883106bc414312e58fe8c682b3ccc1257f114 (patch) | |
tree | d1cc9ffe808ce3174ffb8f92ece6a60b5992c3b1 | |
parent | 27eeb5e70bcc872b9d06caf27977a82732f64c77 (diff) | |
download | poky-c6b883106bc414312e58fe8c682b3ccc1257f114.tar.gz |
bitbake: siggen: Fix rare file-checksum hash issue
There is a subtle issue with full pathnames being included in the
file checksums since the sorting might be different depending upon
how layers are being setup causing hash mismatches for recipes appeneded
from other layers with differing directory layouts.
Avoid this by filtering out to the path basename which is what is written
into the sig data anyway later in the code.
(Bitbake rev: 83acc21cdfdb410082c0871ac7693d29a7c5627d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/siggen.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 8f24535528..a6163b55ea 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -878,7 +878,7 @@ def clean_checksum_file_path(file_checksum_tuple): | |||
878 | f, cs = file_checksum_tuple | 878 | f, cs = file_checksum_tuple |
879 | if "/./" in f: | 879 | if "/./" in f: |
880 | return "./" + f.split("/./")[1] | 880 | return "./" + f.split("/./")[1] |
881 | return f | 881 | return os.path.basename(f) |
882 | 882 | ||
883 | def dump_this_task(outfile, d): | 883 | def dump_this_task(outfile, d): |
884 | import bb.parse | 884 | import bb.parse |