From patchwork Sun Apr 8 10:21:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel, 08/20] Hob: clean up and unify the steps for RCPPKGINFO_POPULATING to call populate_recipe_package_info_async() Date: Sun, 08 Apr 2012 10:21:11 -0000 From: Shane Wang X-Patchwork-Id: 25313 Message-Id: To: bitbake-devel@lists.openembedded.org For the steps in RCPPKGINFO_POPULATING, This patch consolidates them into populate_recipe_package_info_async() to call. Signed-off-by: Shane Wang --- bitbake/lib/bb/ui/crumbs/builder.py | 14 +++++++------- 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 6b8e9f3..a0ad5a0 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -339,6 +339,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) @@ -380,7 +386,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() @@ -462,11 +467,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() @@ -885,7 +885,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 d8cb752..204d1c6 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py @@ -259,7 +259,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