From c6b883106bc414312e58fe8c682b3ccc1257f114 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 4 Sep 2024 19:33:11 +0100 Subject: [PATCH] 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 --- bitbake/lib/bb/siggen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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): f, cs = file_checksum_tuple if "/./" in f: return "./" + f.split("/./")[1] - return f + return os.path.basename(f) def dump_this_task(outfile, d): import bb.parse