sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

cooker: fix calculating of depends and rdepends 

Remove part of the original logic that stores pkg dependency and pkg
recomends, which will not be used in Hob.

Add the judgement for preferred fn provider of a certain package,
which maps package name to its providing recipe name.

The above approaches correct the build dependency calculation,
and they also reduced the total depend_tree size, which speed up the
tree data generation time.

(Bitbake rev: d668eb1300b3b3115964e98127b1bef554caae17)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dongxiao Xu 2012-02-29 22:15:19 +08:00 committed by Richard Purdie
parent 2d23943209
commit ca566412b1
1 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
bitbake/lib/bb/cooker.py
View File

@ -442,19 +442,6 @@ class BBCooker:
return depend_tree
def append_package(self, taskdata, depend_tree_package, package):
if package not in depend_tree_package:
targetid = taskdata.getrun_id(package)
if targetid in taskdata.run_targets and taskdata.run_targets[targetid]:
fnid = taskdata.run_targets[targetid][0]
fn = taskdata.fn_index[fnid]
pn = self.status.pkg_fn[fn]
version = "%s:%s-%s" % self.status.pkg_pepvpr[fn]
depend_tree_package[package] = {}
depend_tree_package[package]["pn"] = pn
depend_tree_package[package]["filename"] = fn
depend_tree_package[package]["version"] = version
def generatePkgDepTreeData(self, pkgs_to_build, task):
"""
Create a dependency tree of pkgs_to_build, returning the data.
@ -470,7 +457,6 @@ class BBCooker:
depend_tree["depends"] = {}
depend_tree["pn"] = {}
depend_tree["rdepends-pn"] = {}
depend_tree["packages"] = {}
depend_tree["rdepends-pkg"] = {}
depend_tree["rrecs-pkg"] = {}
@ -497,7 +483,6 @@ class BBCooker:
if fnid not in seen_fnids:
seen_fnids.append(fnid)
packages = []
depend_tree["depends"][pn] = []
for dep in taskdata.depids[fnid]:
@ -514,26 +499,16 @@ class BBCooker:
depend_tree["rdepends-pn"][pn] = []
for rdep in taskdata.rdepids[fnid]:
depend_tree["rdepends-pn"][pn].append(taskdata.run_names_index[rdep])
for package in rdepends:
depend_tree["rdepends-pkg"][package] = []
for rdepend in rdepends[package]:
depend_tree["rdepends-pkg"][package].append(rdepend)
self.append_package(taskdata, depend_tree["packages"], rdepend)
if not package in packages:
packages.append(package)
for package in rrecs:
depend_tree["rrecs-pkg"][package] = []
for rrec in rrecs[package]:
depend_tree["rrecs-pkg"][package].append(rrec)
self.append_package(taskdata, depend_tree["packages"], rrec)
if not package in packages:
packages.append(package)
for package in packages:
self.append_package(taskdata, depend_tree["packages"], package)
item = taskdata.run_names_index[rdep]
pn_rprovider = ""
targetid = taskdata.getrun_id(item)
if targetid in taskdata.run_targets and taskdata.run_targets[targetid]:
id = taskdata.run_targets[targetid][0]
fn_rprovider = taskdata.fn_index[id]
pn_rprovider = self.status.pkg_fn[fn_rprovider]
else:
pn_rprovider = item
depend_tree["rdepends-pn"][pn].append(pn_rprovider)
return depend_tree