summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-27 20:44:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-02 16:43:01 +0000
commite8ebeeaa1beb02d308bc8430f9b034229e16b062 (patch)
tree84d07d56b44fee167738f95faa875561a23491f4
parent7538be0a50106f61b59b1d2cb830273d73700931 (diff)
downloadpoky-e8ebeeaa1beb02d308bc8430f9b034229e16b062.tar.gz
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: 40928f6991436cf687821015324483b205abfcb1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/runqueue.py3
1 files changed, 2 insertions, 1 deletions
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:
2302 remapped = True 2302 remapped = True
2303 elif tid in self.scenequeue_covered or tid in self.sq_live: 2303 elif tid in self.scenequeue_covered or tid in self.sq_live:
2304 # Already ran this setscene task or it running. Report the new taskhash 2304 # Already ran this setscene task or it running. Report the new taskhash
2305 remapped = bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches) 2305 bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches)
2306 logger.info("Already covered setscene for %s so ignoring rehash (remap)" % (tid)) 2306 logger.info("Already covered setscene for %s so ignoring rehash (remap)" % (tid))
2307 remapped = True
2307 2308
2308 if not remapped: 2309 if not remapped:
2309 #logger.debug(1, "Task %s hash changes: %s->%s %s->%s" % (tid, orighash, newhash, origuni, newuni)) 2310 #logger.debug(1, "Task %s hash changes: %s->%s %s->%s" % (tid, orighash, newhash, origuni, newuni))