diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-23 13:51:06 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-25 21:25:40 +0000 |
| commit | 9a1072060350dc2e0eee14a5cc5af20c900f8a6d (patch) | |
| tree | e869578bc18048aaa50855e6c3fbc080cc20752e | |
| parent | c5c5d786ca968d0e48002fe8acbcc8a63a954b67 (diff) | |
| download | bitbake-9a1072060350dc2e0eee14a5cc5af20c900f8a6d.tar.gz | |
runqueue: Ensure failed harddependencies in scenequeue are accounted for in migrations
Setscene hard dependencies were not being correctly handled during task migration.
For example, do_package of recipe X might become valid due to hashequiv yet we're
still rebuilding pseudo-native, a harddep of do_package. This would mean
it would try to execute that setscene task despite pseudo not being present.
Fix this by ignoring tasks with failed harddependencies. This does mean
stlightly more rebuilds than is optimal but it avoids build crashes. Ultimately
the new runqueue model can likely better handle these cases than the older codebase
could but that is for another more invasive patch.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/runqueue.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 26492e708..485d9341f 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -2343,7 +2343,12 @@ class RunQueueExecute: self.sq_buildable.remove(tid) if tid in self.sq_running: self.sq_running.remove(tid) - if self.sqdata.sq_revdeps[tid].issubset(self.scenequeue_covered | self.scenequeue_notcovered): + harddepfail = False + for t in self.sqdata.sq_harddeps: + if tid in self.sqdata.sq_harddeps[t] and t in self.scenequeue_notcovered: + harddepfail = True + break + if not harddepfail and self.sqdata.sq_revdeps[tid].issubset(self.scenequeue_covered | self.scenequeue_notcovered): if tid not in self.sq_buildable: self.sq_buildable.add(tid) if len(self.sqdata.sq_revdeps[tid]) == 0: @@ -2374,6 +2379,8 @@ class RunQueueExecute: update_scenequeue_data([tid], self.sqdata, self.rqdata, self.rq, self.cooker, self.stampcache, self, summary=False) if tid in self.sqdata.valid and not origvalid: logger.info("Setscene task %s became valid" % tid) + if harddepfail: + self.sq_task_failoutright(tid) if changed: self.holdoff_need_update = True |