diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-12-27 20:44:34 +0000 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2020-01-02 20:23:09 -0800 |
| commit | 10058fe590c56ee3b4d2136b6e247c2d29ae47e6 (patch) | |
| tree | 9da659a19ba27b16a1bf4d1a9762977f4958c8d8 | |
| parent | e731f72ca86629eb935bb1c4f7323421a125aace (diff) | |
| download | bitbake-10058fe590c56ee3b4d2136b6e247c2d29ae47e6.tar.gz | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 40928f6991436cf687821015324483b205abfcb1)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | lib/bb/runqueue.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 729439ef3..f82799800 100644 --- a/lib/bb/runqueue.py +++ b/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)) |