summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-04-09 14:13:37 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-10 23:04:45 (GMT)
commit27caa6b89d36af9105dc62c7735f159d3c6df64e (patch)
treeb99037b900cdcc518551bff543277a95640f47e8
parent8d353411c10a75de109eb5853fdc0b23bfca763a (diff)
downloadpoky-27caa6b89d36af9105dc62c7735f159d3c6df64e.tar.gz
Hob: clean up and unify the steps for CONFIG_UPDATE to call update_config_async()
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>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py21
1 files changed, 9 insertions, 12 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 0f32d33..6ed15e9 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -212,7 +212,6 @@ class Parameters:
212class Builder(gtk.Window): 212class Builder(gtk.Window):
213 213
214 (MACHINE_SELECTION, 214 (MACHINE_SELECTION,
215 CONFIG_UPDATED,
216 RCPPKGINFO_POPULATING, 215 RCPPKGINFO_POPULATING,
217 RCPPKGINFO_POPULATED, 216 RCPPKGINFO_POPULATED,
218 BASEIMG_SELECTED, 217 BASEIMG_SELECTED,
@@ -225,7 +224,7 @@ class Builder(gtk.Window):
225 IMAGE_GENERATED, 224 IMAGE_GENERATED,
226 MY_IMAGE_OPENED, 225 MY_IMAGE_OPENED,
227 BACK, 226 BACK,
228 END_NOOP) = range(15) 227 END_NOOP) = range(14)
229 228
230 (IMAGE_CONFIGURATION, 229 (IMAGE_CONFIGURATION,
231 RECIPE_DETAILS, 230 RECIPE_DETAILS,
@@ -236,7 +235,6 @@ class Builder(gtk.Window):
236 235
237 __step2page__ = { 236 __step2page__ = {
238 MACHINE_SELECTION : IMAGE_CONFIGURATION, 237 MACHINE_SELECTION : IMAGE_CONFIGURATION,
239 CONFIG_UPDATED : IMAGE_CONFIGURATION,
240 RCPPKGINFO_POPULATING : IMAGE_CONFIGURATION, 238 RCPPKGINFO_POPULATING : IMAGE_CONFIGURATION,
241 RCPPKGINFO_POPULATED : IMAGE_CONFIGURATION, 239 RCPPKGINFO_POPULATED : IMAGE_CONFIGURATION,
242 BASEIMG_SELECTED : IMAGE_CONFIGURATION, 240 BASEIMG_SELECTED : IMAGE_CONFIGURATION,
@@ -339,6 +337,11 @@ class Builder(gtk.Window):
339 self.handler.set_extra_inherit("image_types") 337 self.handler.set_extra_inherit("image_types")
340 self.handler.parse_config() 338 self.handler.parse_config()
341 339
340 def update_config_async(self):
341 self.switch_page(self.MACHINE_SELECTION)
342 self.set_user_config()
343 self.handler.parse_generate_configuration()
344
342 def load_template(self, path): 345 def load_template(self, path):
343 self.template = TemplateMgr() 346 self.template = TemplateMgr()
344 self.template.load(path) 347 self.template.load(path)
@@ -348,7 +351,7 @@ class Builder(gtk.Window):
348 if not os.path.exists(layer+'/conf/layer.conf'): 351 if not os.path.exists(layer+'/conf/layer.conf'):
349 return False 352 return False
350 353
351 self.switch_page(self.CONFIG_UPDATED) 354 self.update_config_async()
352 355
353 self.template.destroy() 356 self.template.destroy()
354 self.template = None 357 self.template = None
@@ -376,12 +379,6 @@ class Builder(gtk.Window):
376 if next_step == self.MACHINE_SELECTION: # init step 379 if next_step == self.MACHINE_SELECTION: # init step
377 self.image_configuration_page.show_machine() 380 self.image_configuration_page.show_machine()
378 381
379 elif next_step == self.CONFIG_UPDATED:
380 # after layers is changd by users
381 self.image_configuration_page.show_machine()
382 self.set_user_config()
383 self.handler.parse_generate_configuration()
384
385 elif next_step == self.RCPPKGINFO_POPULATING: 382 elif next_step == self.RCPPKGINFO_POPULATING:
386 # MACHINE CHANGED action or SETTINGS CHANGED 383 # MACHINE CHANGED action or SETTINGS CHANGED
387 # show the progress bar 384 # show the progress bar
@@ -798,7 +795,7 @@ class Builder(gtk.Window):
798 self.configuration.layers = dialog.layers 795 self.configuration.layers = dialog.layers
799 # DO refresh layers 796 # DO refresh layers
800 if dialog.layers_changed: 797 if dialog.layers_changed:
801 self.switch_page(self.CONFIG_UPDATED) 798 self.update_config_async()
802 dialog.destroy() 799 dialog.destroy()
803 800
804 def show_load_template_dialog(self): 801 def show_load_template_dialog(self):
@@ -889,7 +886,7 @@ class Builder(gtk.Window):
889 def reparse_post_adv_settings(self): 886 def reparse_post_adv_settings(self):
890 # DO reparse recipes 887 # DO reparse recipes
891 if not self.configuration.curr_mach: 888 if not self.configuration.curr_mach:
892 self.switch_page(self.CONFIG_UPDATED) 889 self.update_config_async()
893 else: 890 else:
894 self.switch_page(self.RCPPKGINFO_POPULATING) 891 self.switch_page(self.RCPPKGINFO_POPULATING)
895 892