mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-29 09:32:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hob: clean up and unify the steps for IMAGE_GENERATING to call generate_image_async()

Browse Source 
For the steps in IMAGE_GENERATING, the patch consolidates them into
generate_image_async() to call.

(Bitbake rev: d4f2335e40d4d667847d3faed79bcee74baeea37)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Shane Wang
2012-04-09 22:13:40 +08:00
committed by Richard Purdie
parent 35317bd2c2
commit 21901e0ada
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
bitbake/lib/bb/ui/crumbs/builder.py
View File

@@ -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()