diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-05 11:21:18 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-09-28 06:47:55 -1000 |
| commit | 513bfd771d9095fcb6a8bf93806673dbf988a4de (patch) | |
| tree | ecd7e6480c6d7985c675293da42cb15aa09b345c | |
| parent | ac576d6fad6bba0cfea931883f25264ea83747ca (diff) | |
| download | bitbake-513bfd771d9095fcb6a8bf93806673dbf988a4de.tar.gz | |
runqueue: Ensure deferred tasks are sorted by multiconfig
We have to prefer one multiconfig over another when deferring tasks, else
we'll have cross-linked build trees and nothing will be able to build.
In the original population code, we sort like this but we don't after
rehashing. Ensure we have the same sorting after rehashing toa void
deadlocks.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 27228c7f026acb8ae9e1211d0486ffb7338123a2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | lib/bb/runqueue.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 111dc0ee7..a23f7a891 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -2523,11 +2523,14 @@ class RunQueueExecute: if update_tasks: self.sqdone = False - for tid in [t[0] for t in update_tasks]: - h = pending_hash_index(tid, self.rqdata) - if h in self.sqdata.hashes and tid != self.sqdata.hashes[h]: - self.sq_deferred[tid] = self.sqdata.hashes[h] - bb.note("Deferring %s after %s" % (tid, self.sqdata.hashes[h])) + for mc in sorted(self.sqdata.multiconfigs): + for tid in sorted([t[0] for t in update_tasks]): + if mc_from_tid(tid) != mc: + continue + h = pending_hash_index(tid, self.rqdata) + if h in self.sqdata.hashes and tid != self.sqdata.hashes[h]: + self.sq_deferred[tid] = self.sqdata.hashes[h] + bb.note("Deferring %s after %s" % (tid, self.sqdata.hashes[h])) update_scenequeue_data([t[0] for t in update_tasks], self.sqdata, self.rqdata, self.rq, self.cooker, self.stampcache, self, summary=False) for (tid, harddepfail, origvalid) in update_tasks: |