summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-26 12:53:21 +0000
committerJoshua Lock <josh@linux.intel.com>2012-05-31 13:16:41 -0700
commite1e0dd932b029fff936747dfbde666604d206800 (patch)
tree1c38b4d79b57deb163aa9ddee4413f10795905bd
parent6c335846d9c0fef6182f96ff89acdf6b80feb788 (diff)
downloadpoky-e1e0dd932b029fff936747dfbde666604d206800.tar.gz
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 <richard.purdie@linuxfoundation.org> Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--bitbake/lib/bb/runqueue.py8
1 files 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):
1421 sq_revdeps.append(copy.copy(self.rqdata.runq_revdeps[task])) 1421 sq_revdeps.append(copy.copy(self.rqdata.runq_revdeps[task]))
1422 sq_revdeps_new.append(set()) 1422 sq_revdeps_new.append(set())
1423 if (len(self.rqdata.runq_revdeps[task]) == 0) and task not in self.rqdata.runq_setscene: 1423 if (len(self.rqdata.runq_revdeps[task]) == 0) and task not in self.rqdata.runq_setscene:
1424 endpoints[task] = None 1424 endpoints[task] = set()
1425 1425
1426 for task in self.rqdata.runq_setscene: 1426 for task in self.rqdata.runq_setscene:
1427 for dep in self.rqdata.runq_depends[task]: 1427 for dep in self.rqdata.runq_depends[task]:
1428 endpoints[dep] = task 1428 if dep not in endpoints:
1429 endpoints[dep] = set()
1430 endpoints[dep].add(task)
1429 1431
1430 def process_endpoints(endpoints): 1432 def process_endpoints(endpoints):
1431 newendpoints = {} 1433 newendpoints = {}
1432 for point, task in endpoints.items(): 1434 for point, task in endpoints.items():
1433 tasks = set() 1435 tasks = set()
1434 if task: 1436 if task:
1435 tasks.add(task) 1437 tasks |= task
1436 if sq_revdeps_new[point]: 1438 if sq_revdeps_new[point]:
1437 tasks |= sq_revdeps_new[point] 1439 tasks |= sq_revdeps_new[point]
1438 sq_revdeps_new[point] = set() 1440 sq_revdeps_new[point] = set()