Patchwork [bitbake-devel] runqueue.py: Enhance add_xxx_dependencies to return the fnid it resolved to

login
register
mail settings
Submitter Richard Purdie
Date June 27, 2012, 10:05 a.m.
Message ID <1340791536.23146.14.camel@ted>
Download mbox | patch
Permalink /patch/30707/
State New
Headers show

Comments

Richard Purdie - June 27, 2012, 10:05 a.m.
This extra data is required for the recrdepends fixes.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index c45287d..0621e9e 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -399,6 +399,7 @@  class RunQueueData:
         # rdeptast, recrdeptask, idepends).
 
         def add_build_dependencies(depids, tasknames, depends):
+            fnids = []
             for depid in depids:
                 # Won't be in build_targets if ASSUME_PROVIDED
                 if depid not in taskData.build_targets:
@@ -406,22 +407,27 @@  class RunQueueData:
                 depdata = taskData.build_targets[depid][0]
                 if depdata is None:
                     continue
+                fnids.append(depdata)
                 for taskname in tasknames:
                     taskid = taskData.gettask_id_fromfnid(depdata, taskname)
                     if taskid is not None:
                         depends.add(taskid)
+            return fnids
 
         def add_runtime_dependencies(depids, tasknames, depends):
+            fnids = []
             for depid in depids:
                 if depid not in taskData.run_targets:
                     continue
                 depdata = taskData.run_targets[depid][0]
                 if depdata is None:
                     continue
+                fnids.append(depdata)
                 for taskname in tasknames:
                     taskid = taskData.gettask_id_fromfnid(depdata, taskname)
                     if taskid is not None:
                         depends.add(taskid)
+            return fnids
 
         for task in xrange(len(taskData.tasks_name)):
             depends = set()