diff options
-rw-r--r-- | bitbake/lib/bb/siggen.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 879c136e18..b023b79eca 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -361,7 +361,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
361 | for dep in sorted(self.runtaskdeps[tid]): | 361 | for dep in sorted(self.runtaskdeps[tid]): |
362 | data += self.get_unihash(dep[1]) | 362 | data += self.get_unihash(dep[1]) |
363 | 363 | ||
364 | for (f, cs) in self.file_checksum_values[tid]: | 364 | for (f, cs) in sorted(self.file_checksum_values[tid], key=clean_checksum_file_path): |
365 | if cs: | 365 | if cs: |
366 | if "/./" in f: | 366 | if "/./" in f: |
367 | data += "./" + f.split("/./")[1] | 367 | data += "./" + f.split("/./")[1] |
@@ -426,7 +426,7 @@ class SignatureGeneratorBasic(SignatureGenerator): | |||
426 | if runtime and tid in self.taskhash: | 426 | if runtime and tid in self.taskhash: |
427 | data['runtaskdeps'] = [dep[0] for dep in sorted(self.runtaskdeps[tid])] | 427 | data['runtaskdeps'] = [dep[0] for dep in sorted(self.runtaskdeps[tid])] |
428 | data['file_checksum_values'] = [] | 428 | data['file_checksum_values'] = [] |
429 | for f,cs in self.file_checksum_values[tid]: | 429 | for f,cs in sorted(self.file_checksum_values[tid], key=clean_checksum_file_path): |
430 | if "/./" in f: | 430 | if "/./" in f: |
431 | data['file_checksum_values'].append(("./" + f.split("/./")[1], cs)) | 431 | data['file_checksum_values'].append(("./" + f.split("/./")[1], cs)) |
432 | else: | 432 | else: |
@@ -745,6 +745,12 @@ class SignatureGeneratorTestEquivHash(SignatureGeneratorUniHashMixIn, SignatureG | |||
745 | self.server = data.getVar('BB_HASHSERVE') | 745 | self.server = data.getVar('BB_HASHSERVE') |
746 | self.method = "sstate_output_hash" | 746 | self.method = "sstate_output_hash" |
747 | 747 | ||
748 | def clean_checksum_file_path(file_checksum_tuple): | ||
749 | f, cs = file_checksum_tuple | ||
750 | if "/./" in f: | ||
751 | return "./" + f.split("/./")[1] | ||
752 | return f | ||
753 | |||
748 | def dump_this_task(outfile, d): | 754 | def dump_this_task(outfile, d): |
749 | import bb.parse | 755 | import bb.parse |
750 | mcfn = d.getVar("BB_FILENAME") | 756 | mcfn = d.getVar("BB_FILENAME") |