From 7ab4808e0aa4b5ebeb16031afcba55b590518fc5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 25 Sep 2019 22:47:06 +0100 Subject: 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 --- bitbake/lib/bb/runqueue.py | 3 ++- bitbake/lib/bb/siggen.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'bitbake') 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: self.init_progress_reporter.next_stage() + bb.parse.siggen.set_setscene_tasks(self.runq_setscene_tids) + # Iterate over the task list and call into the siggen code dealtwith = set() todeal = set(self.runtaskentries) @@ -1173,7 +1175,6 @@ class RunQueueData: self.prepare_task_hash(tid) bb.parse.siggen.writeout_file_checksum_cache() - bb.parse.siggen.set_setscene_tasks(self.runq_setscene_tids) #self.dump_data() 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): report_taskdata = d.getVar('SSTATE_HASHEQUIV_REPORT_TASKDATA') == '1' tempdir = d.getVar('T') fn = d.getVar('BB_FILENAME') - key = fn + ':do_' + task + ':' + taskhash + tid = fn + ':do_' + task + key = tid + ':' + taskhash + + if self.setscenetasks and tid not in self.setscenetasks: + return # Sanity checks cache_unihash = self.unitaskhashes.get(key, None) -- cgit v1.2.3-54-g00ecf