mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

Hob: clean up and unify the steps for CONFIG_UPDATE to call update_config_async()

Browse Source 
For the steps in CONFIG_UPDATE, the patch consolidates them into
update_config_async() to call.
consequently remove CONFIG_UPDATE since MACHINE_SELECTION covers it.

(Bitbake rev: f583d43e87c049bdee88890e289f14520c7c31a1)

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:37 +08:00
committed by Richard Purdie
parent 8d353411c1
commit 27caa6b89d
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/ui/crumbs/builder.py
+9 -12
View File
@@ -212,7 +212,6 @@ class Parameters:
class Builder(gtk.Window): class Builder(gtk.Window):
(MACHINE_SELECTION, (MACHINE_SELECTION,
CONFIG_UPDATED,
RCPPKGINFO_POPULATING, RCPPKGINFO_POPULATING,
RCPPKGINFO_POPULATED, RCPPKGINFO_POPULATED,
BASEIMG_SELECTED, BASEIMG_SELECTED,
@@ -225,7 +224,7 @@ class Builder(gtk.Window):
IMAGE_GENERATED, IMAGE_GENERATED,
MY_IMAGE_OPENED, MY_IMAGE_OPENED,
BACK, BACK,
END_NOOP) = range(15) END_NOOP) = range(14)
(IMAGE_CONFIGURATION, (IMAGE_CONFIGURATION,
RECIPE_DETAILS, RECIPE_DETAILS,
@@ -236,7 +235,6 @@ class Builder(gtk.Window):
__step2page__ = { __step2page__ = {
MACHINE_SELECTION : IMAGE_CONFIGURATION, MACHINE_SELECTION : IMAGE_CONFIGURATION,
CONFIG_UPDATED : IMAGE_CONFIGURATION,
RCPPKGINFO_POPULATING : IMAGE_CONFIGURATION, RCPPKGINFO_POPULATING : IMAGE_CONFIGURATION,
RCPPKGINFO_POPULATED : IMAGE_CONFIGURATION, RCPPKGINFO_POPULATED : IMAGE_CONFIGURATION,
BASEIMG_SELECTED : IMAGE_CONFIGURATION, BASEIMG_SELECTED : IMAGE_CONFIGURATION,
@@ -339,6 +337,11 @@ class Builder(gtk.Window):
self.handler.set_extra_inherit("image_types") self.handler.set_extra_inherit("image_types")
self.handler.parse_config() self.handler.parse_config()
def update_config_async(self):
self.switch_page(self.MACHINE_SELECTION)
self.set_user_config()
self.handler.parse_generate_configuration()
def load_template(self, path): def load_template(self, path):
self.template = TemplateMgr() self.template = TemplateMgr()
self.template.load(path) self.template.load(path)
@@ -348,7 +351,7 @@ class Builder(gtk.Window):
if not os.path.exists(layer+'/conf/layer.conf'): if not os.path.exists(layer+'/conf/layer.conf'):
return False return False
self.switch_page(self.CONFIG_UPDATED) self.update_config_async()
self.template.destroy() self.template.destroy()
self.template = None self.template = None
@@ -376,12 +379,6 @@ class Builder(gtk.Window):
if next_step == self.MACHINE_SELECTION: # init step if next_step == self.MACHINE_SELECTION: # init step
self.image_configuration_page.show_machine() self.image_configuration_page.show_machine()
elif next_step == self.CONFIG_UPDATED:
# after layers is changd by users
self.image_configuration_page.show_machine()
self.set_user_config()
self.handler.parse_generate_configuration()
elif next_step == self.RCPPKGINFO_POPULATING: elif next_step == self.RCPPKGINFO_POPULATING:
# MACHINE CHANGED action or SETTINGS CHANGED # MACHINE CHANGED action or SETTINGS CHANGED
# show the progress bar # show the progress bar
@@ -798,7 +795,7 @@ class Builder(gtk.Window):
self.configuration.layers = dialog.layers self.configuration.layers = dialog.layers
# DO refresh layers # DO refresh layers
if dialog.layers_changed: if dialog.layers_changed:
self.switch_page(self.CONFIG_UPDATED) self.update_config_async()
dialog.destroy() dialog.destroy()
def show_load_template_dialog(self): def show_load_template_dialog(self):
@@ -889,7 +886,7 @@ class Builder(gtk.Window):
def reparse_post_adv_settings(self): def reparse_post_adv_settings(self):
# DO reparse recipes # DO reparse recipes
if not self.configuration.curr_mach: if not self.configuration.curr_mach:
self.switch_page(self.CONFIG_UPDATED) self.update_config_async()
else: else:
self.switch_page(self.RCPPKGINFO_POPULATING) self.switch_page(self.RCPPKGINFO_POPULATING)