diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 3f6f6ef0b6..8d65ba809a 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
| @@ -275,7 +275,7 @@ class BBCooker: | |||
| 275 | taskdata.add_unresolved(localdata, self.status) | 275 | taskdata.add_unresolved(localdata, self.status) |
| 276 | 276 | ||
| 277 | rq = bb.runqueue.RunQueue(self, self.configuration.data, self.status, taskdata, runlist) | 277 | rq = bb.runqueue.RunQueue(self, self.configuration.data, self.status, taskdata, runlist) |
| 278 | rq.prepare_runqueue() | 278 | rq.rqdata.prepare() |
| 279 | 279 | ||
| 280 | seen_fnids = [] | 280 | seen_fnids = [] |
| 281 | depend_tree = {} | 281 | depend_tree = {} |
| @@ -287,9 +287,9 @@ class BBCooker: | |||
| 287 | depend_tree["rdepends-pkg"] = {} | 287 | depend_tree["rdepends-pkg"] = {} |
| 288 | depend_tree["rrecs-pkg"] = {} | 288 | depend_tree["rrecs-pkg"] = {} |
| 289 | 289 | ||
| 290 | for task in range(len(rq.runq_fnid)): | 290 | for task in range(len(rq.rqdata.runq_fnid)): |
| 291 | taskname = rq.runq_task[task] | 291 | taskname = rq.rqdata.runq_task[task] |
| 292 | fnid = rq.runq_fnid[task] | 292 | fnid = rq.rqdata.runq_fnid[task] |
| 293 | fn = taskdata.fn_index[fnid] | 293 | fn = taskdata.fn_index[fnid] |
| 294 | pn = self.status.pkg_fn[fn] | 294 | pn = self.status.pkg_fn[fn] |
| 295 | version = "%s:%s-%s" % self.status.pkg_pepvpr[fn] | 295 | version = "%s:%s-%s" % self.status.pkg_pepvpr[fn] |
| @@ -297,13 +297,13 @@ class BBCooker: | |||
| 297 | depend_tree["pn"][pn] = {} | 297 | depend_tree["pn"][pn] = {} |
| 298 | depend_tree["pn"][pn]["filename"] = fn | 298 | depend_tree["pn"][pn]["filename"] = fn |
| 299 | depend_tree["pn"][pn]["version"] = version | 299 | depend_tree["pn"][pn]["version"] = version |
| 300 | for dep in rq.runq_depends[task]: | 300 | for dep in rq.rqdata.runq_depends[task]: |
| 301 | depfn = taskdata.fn_index[rq.runq_fnid[dep]] | 301 | depfn = taskdata.fn_index[rq.rqdata.runq_fnid[dep]] |
| 302 | deppn = self.status.pkg_fn[depfn] | 302 | deppn = self.status.pkg_fn[depfn] |
| 303 | dotname = "%s.%s" % (pn, rq.runq_task[task]) | 303 | dotname = "%s.%s" % (pn, rq.rqdata.runq_task[task]) |
| 304 | if not dotname in depend_tree["tdepends"]: | 304 | if not dotname in depend_tree["tdepends"]: |
| 305 | depend_tree["tdepends"][dotname] = [] | 305 | depend_tree["tdepends"][dotname] = [] |
| 306 | depend_tree["tdepends"][dotname].append("%s.%s" % (deppn, rq.runq_task[dep])) | 306 | depend_tree["tdepends"][dotname].append("%s.%s" % (deppn, rq.rqdata.runq_task[dep])) |
| 307 | if fnid not in seen_fnids: | 307 | if fnid not in seen_fnids: |
| 308 | seen_fnids.append(fnid) | 308 | seen_fnids.append(fnid) |
| 309 | packages = [] | 309 | packages = [] |
