diff options
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index f63a21914c..2a1299db39 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
| @@ -2503,11 +2503,14 @@ class RunQueueExecute: | |||
| 2503 | 2503 | ||
| 2504 | if update_tasks: | 2504 | if update_tasks: |
| 2505 | self.sqdone = False | 2505 | self.sqdone = False |
| 2506 | for tid in [t[0] for t in update_tasks]: | 2506 | for mc in sorted(self.sqdata.multiconfigs): |
| 2507 | h = pending_hash_index(tid, self.rqdata) | 2507 | for tid in sorted([t[0] for t in update_tasks]): |
| 2508 | if h in self.sqdata.hashes and tid != self.sqdata.hashes[h]: | 2508 | if mc_from_tid(tid) != mc: |
| 2509 | self.sq_deferred[tid] = self.sqdata.hashes[h] | 2509 | continue |
| 2510 | bb.note("Deferring %s after %s" % (tid, self.sqdata.hashes[h])) | 2510 | h = pending_hash_index(tid, self.rqdata) |
| 2511 | if h in self.sqdata.hashes and tid != self.sqdata.hashes[h]: | ||
| 2512 | self.sq_deferred[tid] = self.sqdata.hashes[h] | ||
| 2513 | bb.note("Deferring %s after %s" % (tid, self.sqdata.hashes[h])) | ||
| 2511 | update_scenequeue_data([t[0] for t in update_tasks], self.sqdata, self.rqdata, self.rq, self.cooker, self.stampcache, self, summary=False) | 2514 | update_scenequeue_data([t[0] for t in update_tasks], self.sqdata, self.rqdata, self.rq, self.cooker, self.stampcache, self, summary=False) |
| 2512 | 2515 | ||
| 2513 | for (tid, harddepfail, origvalid) in update_tasks: | 2516 | for (tid, harddepfail, origvalid) in update_tasks: |