diff options
| author |   Dongxiao Xu <dongxiao.xu@intel.com> | 2012-02-29 22:15:17 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-01 15:14:23 +0000 |
| commit | dadce609149cfb09ecdc53bfe1f416a3f57a5033 (patch) | |
| tree | c30fdd9abfa80d12562793f7f998ae36c1db94f7 /lib/bb/cooker.py | |
| parent | 7af747778121aa399f69aff58425ede523b2495c (diff) | |
| download | bitbake-dadce609149cfb09ecdc53bfe1f416a3f57a5033.tar.gz | |
command.py: remove the resolve parameter in generateTargetsTree
Remove the "resolve" parameter since the original resolve=False
option is no longer be used.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/cooker.py')
| -rw-r--r-- | lib/bb/cooker.py | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index ea09c5d68..6cc0504c2 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -455,7 +455,7 @@ class BBCooker: depend_tree_package[package]["filename"] = fn depend_tree_package[package]["version"] = version - def generatePkgDepTreeData(self, pkgs_to_build, task, resolve=False): + def generatePkgDepTreeData(self, pkgs_to_build, task): """ Create a dependency tree of pkgs_to_build, returning the data. """ @@ -501,19 +501,16 @@ class BBCooker: depend_tree["depends"][pn] = [] for dep in taskdata.depids[fnid]: - if resolve: - item = taskdata.build_names_index[dep] - pn_provider = "" - targetid = taskdata.getbuild_id(item) - if targetid in taskdata.build_targets and taskdata.build_targets[targetid]: - fnid = taskdata.build_targets[targetid][0] - fn_provider = taskdata.fn_index[fnid] - pn_provider = self.status.pkg_fn[fn_provider] - else: - pn_provider = item - depend_tree["depends"][pn].append(pn_provider) + item = taskdata.build_names_index[dep] + pn_provider = "" + targetid = taskdata.getbuild_id(item) + if targetid in taskdata.build_targets and taskdata.build_targets[targetid]: + fnid = taskdata.build_targets[targetid][0] + fn_provider = taskdata.fn_index[fnid] + pn_provider = self.status.pkg_fn[fn_provider] else: - depend_tree["depends"][pn].append(taskdata.build_names_index[dep]) + pn_provider = item + depend_tree["depends"][pn].append(pn_provider) depend_tree["rdepends-pn"][pn] = [] for rdep in taskdata.rdepids[fnid]: @@ -523,8 +520,7 @@ class BBCooker: depend_tree["rdepends-pkg"][package] = [] for rdepend in rdepends[package]: depend_tree["rdepends-pkg"][package].append(rdepend) - if resolve: - self.append_package(taskdata, depend_tree["packages"], rdepend) + self.append_package(taskdata, depend_tree["packages"], rdepend) if not package in packages: packages.append(package) @@ -532,8 +528,7 @@ class BBCooker: depend_tree["rrecs-pkg"][package] = [] for rrec in rrecs[package]: depend_tree["rrecs-pkg"][package].append(rrec) - if resolve: - self.append_package(taskdata, depend_tree["packages"], rrec) + self.append_package(taskdata, depend_tree["packages"], rrec) if not package in packages: packages.append(package) @@ -784,7 +779,7 @@ class BBCooker: return pkg_list - def generateTargetsTree(self, klass=None, pkgs=[], resolve=False): + def generateTargetsTree(self, klass=None, pkgs=[]): """ Generate a dependency tree of buildable targets Generate an event with the result @@ -799,7 +794,7 @@ class BBCooker: pkgs = pkgs + extra_pkgs # generate a dependency tree for all our packages - tree = self.generatePkgDepTreeData(pkgs, 'build', resolve) + tree = self.generatePkgDepTreeData(pkgs, 'build') bb.event.fire(bb.event.TargetsTreeGenerated(tree), self.configuration.data) def buildWorldTargetList(self): |