diff options
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
| -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 111dc0ee72..a23f7a8918 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
| @@ -2523,11 +2523,14 @@ class RunQueueExecute: | |||
| 2523 | 2523 | ||
| 2524 | if update_tasks: | 2524 | if update_tasks: |
| 2525 | self.sqdone = False | 2525 | self.sqdone = False |
| 2526 | for tid in [t[0] for t in update_tasks]: | 2526 | for mc in sorted(self.sqdata.multiconfigs): |
| 2527 | h = pending_hash_index(tid, self.rqdata) | 2527 | for tid in sorted([t[0] for t in update_tasks]): |
| 2528 | if h in self.sqdata.hashes and tid != self.sqdata.hashes[h]: | 2528 | if mc_from_tid(tid) != mc: |
| 2529 | self.sq_deferred[tid] = self.sqdata.hashes[h] | 2529 | continue |
| 2530 | bb.note("Deferring %s after %s" % (tid, self.sqdata.hashes[h])) | 2530 | h = pending_hash_index(tid, self.rqdata) |
| 2531 | if h in self.sqdata.hashes and tid != self.sqdata.hashes[h]: | ||
| 2532 | self.sq_deferred[tid] = self.sqdata.hashes[h] | ||
| 2533 | bb.note("Deferring %s after %s" % (tid, self.sqdata.hashes[h])) | ||
| 2531 | update_scenequeue_data([t[0] for t in update_tasks], self.sqdata, self.rqdata, self.rq, self.cooker, self.stampcache, self, summary=False) | 2534 | update_scenequeue_data([t[0] for t in update_tasks], self.sqdata, self.rqdata, self.rq, self.cooker, self.stampcache, self, summary=False) |
| 2532 | 2535 | ||
| 2533 | for (tid, harddepfail, origvalid) in update_tasks: | 2536 | for (tid, harddepfail, origvalid) in update_tasks: |