Re: [PATCH 20/32] command.py: remove the resolve parameter in generateTargetsTree

[Joshua Lock <josh@linux.intel.com>]

On 29/02/12 06:15, Shane Wang wrote:
> From: Dongxiao Xu<dongxiao.xu@intel.com>
>
> 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: Joshua Lock<josh@linux.intel.com>

> ---
>   bitbake/lib/bb/command.py                   |   14 +---------
>   bitbake/lib/bb/cooker.py                    |   33 +++++++++++---------------
>   bitbake/lib/bb/ui/crumbs/hobeventhandler.py |    2 +-
>   3 files changed, 17 insertions(+), 32 deletions(-)
>
> diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
> index 06e8869..1799f1c 100644
> --- a/bitbake/lib/bb/command.py
> +++ b/bitbake/lib/bb/command.py
> @@ -242,21 +242,11 @@ class CommandsAsync:
>           included in the package list.
>           If pkg_list provided use that list (plus any extras brought in by
>           klass) rather than generating a tree for all packages.
> -
> -        Add a new option "resolve" to indicate if we need to resolve the
> -        replacement for "virtual/xxx" like pn.
>           """
>           klass = params[0]
> -        resolve = False
> -        if len(params)>  2:
> -            pkg_list = params[1]
> -            resolve = params[2]
> -        elif len(params)>  1:
> -            pkg_list = params[1]
> -        else:
> -            pkg_list = []
> +        pkg_list = params[1]
>
> -        command.cooker.generateTargetsTree(klass, pkg_list, resolve)
> +        command.cooker.generateTargetsTree(klass, pkg_list)
>           command.finishAsyncCommand()
>       generateTargetsTree.needcache = True
>
> diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
> index 12b526b..2e4a1ba 100644
> --- a/bitbake/lib/bb/cooker.py
> +++ b/bitbake/lib/bb/cooker.py
> @@ -451,7 +451,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.
>           """
> @@ -497,19 +497,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]:
> @@ -519,8 +516,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)
>
> @@ -528,8 +524,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)
>
> @@ -780,7 +775,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
> @@ -795,7 +790,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):
> diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
> index 2bf4ed8..6c109fc 100644
> --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
> +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
> @@ -148,7 +148,7 @@ class HobHandler(gobject.GObject):
>           elif next_command == self.PARSE_BBFILES:
>               self.server.runCommand(["parseFiles"])
>           elif next_command == self.GENERATE_TGTS:
> -            self.server.runCommand(["generateTargetsTree", "classes/image.bbclass", [], True])
> +            self.server.runCommand(["generateTargetsTree", "classes/image.bbclass", []])
>           elif next_command == self.GENERATE_PACKAGEINFO:
>               self.server.runCommand(["triggerEvent", "bb.event.RequestPackageInfo()"])
>           elif next_command == self.BUILD_TARGET_RECIPES:

-- 
Joshua Lock
         Yocto Project "Johannes factotum"
         Intel Open Source Technology Centre