diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-25 22:47:06 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-30 17:23:35 +0100 |
commit | 7ab4808e0aa4b5ebeb16031afcba55b590518fc5 (patch) | |
tree | 4b98d6a5eca99296177187590ca63a9cd1dba030 | |
parent | ff872fdda53ffc802ede48e06aae78ee06b361a6 (diff) | |
download | poky-7ab4808e0aa4b5ebeb16031afcba55b590518fc5.tar.gz |
bitbake: siggen/runqueue: Fix signature mismatch issues
We need to set the setscene tasklist before we call into the
taskhash/unihash code else the behaviour is inconsistent.
Avoid reporting hashes for non setscene tasks since we'd never
query that.
(Bitbake rev: 419a7840b8627278db694029c25df00214d01d96)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 3 | ||||
-rw-r--r-- | bitbake/lib/bb/siggen.py | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 65169931f1..29bfd65e0b 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -1162,6 +1162,8 @@ class RunQueueData: | |||
1162 | 1162 | ||
1163 | self.init_progress_reporter.next_stage() | 1163 | self.init_progress_reporter.next_stage() |
1164 | 1164 | ||
1165 | bb.parse.siggen.set_setscene_tasks(self.runq_setscene_tids) | ||
1166 | |||
1165 | # Iterate over the task list and call into the siggen code | 1167 | # Iterate over the task list and call into the siggen code |
1166 | dealtwith = set() | 1168 | dealtwith = set() |
1167 | todeal = set(self.runtaskentries) | 1169 | todeal = set(self.runtaskentries) |
@@ -1173,7 +1175,6 @@ class RunQueueData: | |||
1173 | self.prepare_task_hash(tid) | 1175 | self.prepare_task_hash(tid) |
1174 | 1176 | ||
1175 | bb.parse.siggen.writeout_file_checksum_cache() | 1177 | bb.parse.siggen.writeout_file_checksum_cache() |
1176 | bb.parse.siggen.set_setscene_tasks(self.runq_setscene_tids) | ||
1177 | 1178 | ||
1178 | #self.dump_data() | 1179 | #self.dump_data() |
1179 | return len(self.runtaskentries) | 1180 | return len(self.runtaskentries) |
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 71fa018227..6207cbca30 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -455,7 +455,11 @@ class SignatureGeneratorUniHashMixIn(object): | |||
455 | report_taskdata = d.getVar('SSTATE_HASHEQUIV_REPORT_TASKDATA') == '1' | 455 | report_taskdata = d.getVar('SSTATE_HASHEQUIV_REPORT_TASKDATA') == '1' |
456 | tempdir = d.getVar('T') | 456 | tempdir = d.getVar('T') |
457 | fn = d.getVar('BB_FILENAME') | 457 | fn = d.getVar('BB_FILENAME') |
458 | key = fn + ':do_' + task + ':' + taskhash | 458 | tid = fn + ':do_' + task |
459 | key = tid + ':' + taskhash | ||
460 | |||
461 | if self.setscenetasks and tid not in self.setscenetasks: | ||
462 | return | ||
459 | 463 | ||
460 | # Sanity checks | 464 | # Sanity checks |
461 | cache_unihash = self.unitaskhashes.get(key, None) | 465 | cache_unihash = self.unitaskhashes.get(key, None) |