diff options
| author |   Shane Wang <shane.wang@intel.com> | 2012-04-09 22:13:40 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-11 00:02:21 +0100 |
| commit | d4f2335e40d4d667847d3faed79bcee74baeea37 (patch) | |
| tree | 9cc40a4b95224bd2bbfd1c70e58b4eeef02aa58e | |
| parent | 1ec53d41774528ab01e835d1cf4166f0202a7c38 (diff) | |
| download | bitbake-d4f2335e40d4d667847d3faed79bcee74baeea37.tar.gz | |
Hob: clean up and unify the steps for IMAGE_GENERATING to call generate_image_async()
For the steps in IMAGE_GENERATING, the patch consolidates them into
generate_image_async() to call.
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | lib/bb/ui/crumbs/builder.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py index d1f419aa8..1730c7758 100755 --- a/lib/bb/ui/crumbs/builder.py +++ b/lib/bb/ui/crumbs/builder.py @@ -364,6 +364,20 @@ class Builder(gtk.Window): self.handler.reset_build() self.handler.generate_packages(all_recipes) + def generate_image_async(self): + self.switch_page(self.IMAGE_GENERATING) + # Build image + self.set_user_config() + packages = self.package_model.get_selected_packages() + toolchain_packages = [] + if self.configuration.toolchain_build: + toolchain_packages = self.package_model.get_selected_packages_toolchain() + self.handler.reset_build() + self.handler.generate_image(packages, + self.hob_image, + self.hob_toolchain, + toolchain_packages) + def load_template(self, path): self.template = TemplateMgr() self.template.load(path) @@ -429,7 +443,6 @@ class Builder(gtk.Window): # after packages are generated, selected_packages need to # be updated in package_model per selected_image in recipe_model self.build_details_page.show_page(next_step) - self.generate_image() elif next_step == self.IMAGE_GENERATED: self.image_details_page.show_page(next_step) @@ -478,19 +491,6 @@ class Builder(gtk.Window): left = self.package_model.set_selected_packages(selected_packages) self.configuration.selected_packages += left - def generate_image(self): - # Build image - self.set_user_config() - packages = self.package_model.get_selected_packages() - toolchain_packages = [] - if self.configuration.toolchain_build: - toolchain_packages = self.package_model.get_selected_packages_toolchain() - self.handler.reset_build() - self.handler.generate_image(packages, - self.hob_image, - self.hob_toolchain, - toolchain_packages) - # Callback Functions def handler_config_updated_cb(self, handler, which, values): if which == "distro": @@ -529,7 +529,7 @@ class Builder(gtk.Window): self.rcppkglist_populated() if self.current_step == self.FAST_IMAGE_GENERATING: - self.switch_page(self.IMAGE_GENERATING) + self.generate_image_async() elif self.current_step == self.PACKAGE_GENERATING: self.switch_page(self.PACKAGE_GENERATED) elif self.current_step == self.IMAGE_GENERATING: @@ -761,7 +761,7 @@ class Builder(gtk.Window): dialog.run() dialog.destroy() return - self.switch_page(self.IMAGE_GENERATING) + self.generate_image_async() def just_bake(self): selected_image = self.recipe_model.get_selected_image() |