From e1e0dd932b029fff936747dfbde666604d206800 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 26 Jan 2012 12:53:21 +0000 Subject: [PATCH] runqueue.py: Fix missing setscene dependencies When constructing the setscene inter-dependencies, we need to account for all task, not just the last one found. This patch corrects this oversight and ensures all dependencies are added, not just the first one found. (Bitbake rev: b9b5b5129d066e1ff7d3effda116afc3c6657beb) Signed-off-by: Richard Purdie Signed-off-by: Joshua Lock --- bitbake/lib/bb/runqueue.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 8d0b85d33a..417de22a30 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -1421,18 +1421,20 @@ class RunQueueExecuteScenequeue(RunQueueExecute): sq_revdeps.append(copy.copy(self.rqdata.runq_revdeps[task])) sq_revdeps_new.append(set()) if (len(self.rqdata.runq_revdeps[task]) == 0) and task not in self.rqdata.runq_setscene: - endpoints[task] = None + endpoints[task] = set() for task in self.rqdata.runq_setscene: for dep in self.rqdata.runq_depends[task]: - endpoints[dep] = task + if dep not in endpoints: + endpoints[dep] = set() + endpoints[dep].add(task) def process_endpoints(endpoints): newendpoints = {} for point, task in endpoints.items(): tasks = set() if task: - tasks.add(task) + tasks |= task if sq_revdeps_new[point]: tasks |= sq_revdeps_new[point] sq_revdeps_new[point] = set()