From fbde5ca5099ae4b69929b4c4ea8b0c4be02ddf51 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 Dec 2019 20:44:34 +0000 Subject: bitbake: runqueue: Fix equiv hash handling build failures Regardless of whether we remapped the hash on the server or not, we need to have bitbake work as if we did as we need to match how the stamp files look. This change resolves build failures where tasks were rerunning when they shouldn't. (Bitbake rev: 10058fe590c56ee3b4d2136b6e247c2d29ae47e6) Signed-off-by: Richard Purdie (cherry picked from commit 40928f6991436cf687821015324483b205abfcb1) Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- bitbake/lib/bb/runqueue.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 729439ef31..f82799800b 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -2302,8 +2302,9 @@ class RunQueueExecute: remapped = True elif tid in self.scenequeue_covered or tid in self.sq_live: # Already ran this setscene task or it running. Report the new taskhash - remapped = bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches) + bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches) logger.info("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) + remapped = True if not remapped: #logger.debug(1, "Task %s hash changes: %s->%s %s->%s" % (tid, orighash, newhash, origuni, newuni)) -- cgit v1.2.3-54-g00ecf