diff options
| author | Shane Wang <shane.wang@intel.com> | 2012-04-09 22:13:38 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-11 00:04:45 +0100 |
| commit | 47caae2f2185cb9b1b8e597189128c57f47cc940 (patch) | |
| tree | c4ba24ac7a7e19bbb7657cae8238da1d5d6fa89c | |
| parent | 27caa6b89d36af9105dc62c7735f159d3c6df64e (diff) | |
| download | ast2050-yocto-poky-47caae2f2185cb9b1b8e597189128c57f47cc940.zip ast2050-yocto-poky-47caae2f2185cb9b1b8e597189128c57f47cc940.tar.gz | |
Hob: clean up and unify the steps for RCPPKGINFO_POPULATING to call populate_recipe_package_info_async()
For the steps in RCPPKGINFO_POPULATING, This patch consolidates them into
populate_recipe_package_info_async() to call.
(Bitbake rev: ed2aa6f235e1b789af8a33729302a4269674c6b4)
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 14 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 6ed15e9..63e6f0b 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -342,6 +342,12 @@ class Builder(gtk.Window): self.set_user_config() self.handler.parse_generate_configuration() + def populate_recipe_package_info_async(self): + self.switch_page(self.RCPPKGINFO_POPULATING) + # Parse recipes + self.set_user_config() + self.handler.generate_recipes() + def load_template(self, path): self.template = TemplateMgr() self.template.load(path) @@ -383,7 +389,6 @@ class Builder(gtk.Window): # MACHINE CHANGED action or SETTINGS CHANGED # show the progress bar self.image_configuration_page.show_info_populating() - self.generate_recipes() elif next_step == self.RCPPKGINFO_POPULATED: self.image_configuration_page.show_info_populated() @@ -465,11 +470,6 @@ class Builder(gtk.Window): self.handler.reset_build() self.handler.generate_packages(all_recipes) - def generate_recipes(self): - # Parse recipes - self.set_user_config() - self.handler.generate_recipes() - def generate_image(self): # Build image self.set_user_config() @@ -888,7 +888,7 @@ class Builder(gtk.Window): if not self.configuration.curr_mach: self.update_config_async() else: - self.switch_page(self.RCPPKGINFO_POPULATING) + self.populate_recipe_package_info_async() def deploy_image(self, image_name): if not image_name: diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index 9013e1e..900244f 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py @@ -260,7 +260,7 @@ class ImageConfigurationPage (HobPage): self.builder.configuration.curr_mach = combo_item # Do reparse recipes - self.builder.switch_page(self.builder.RCPPKGINFO_POPULATING) + self.builder.populate_recipe_package_info_async() def update_machine_combo(self): all_machines = self.builder.parameters.all_machines |
