From a8c03230341644b1a2589f89ff40fdfb382534e8 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Thu, 29 Mar 2012 20:01:16 +0800 Subject: Hob: Remember user settings when reparse config When config reparse is issued (e.x, adding a layer), we will firstly remember the past user settings by setting them to bitbake server, and then do the reparse. (Bitbake rev: 8a1f6953a082d8002585bfd9e8a67d2a7f69d6aa) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 13 +++++++------ bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 8 +++----- 2 files changed, 10 insertions(+), 11 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 8cbc2944ee..f278b584b6 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -198,7 +198,7 @@ class Parameters: class Builder(gtk.Window): (MACHINE_SELECTION, - LAYER_CHANGED, + CONFIG_UPDATED, RCPPKGINFO_POPULATING, RCPPKGINFO_POPULATED, BASEIMG_SELECTED, @@ -222,7 +222,7 @@ class Builder(gtk.Window): __step2page__ = { MACHINE_SELECTION : IMAGE_CONFIGURATION, - LAYER_CHANGED : IMAGE_CONFIGURATION, + CONFIG_UPDATED : IMAGE_CONFIGURATION, RCPPKGINFO_POPULATING : IMAGE_CONFIGURATION, RCPPKGINFO_POPULATED : IMAGE_CONFIGURATION, BASEIMG_SELECTED : IMAGE_CONFIGURATION, @@ -329,7 +329,7 @@ class Builder(gtk.Window): if not os.path.exists(layer+'/conf/layer.conf'): return False - self.switch_page(self.LAYER_CHANGED) + self.switch_page(self.CONFIG_UPDATED) self.template.destroy() self.template = None @@ -357,10 +357,11 @@ class Builder(gtk.Window): if next_step == self.MACHINE_SELECTION: # init step self.image_configuration_page.show_machine() - elif next_step == self.LAYER_CHANGED: + elif next_step == self.CONFIG_UPDATED: # after layers is changd by users self.image_configuration_page.show_machine() - self.handler.refresh_layers(self.configuration.layers) + self.set_user_config() + self.handler.parse_generate_configuration() elif next_step == self.RCPPKGINFO_POPULATING: # MACHINE CHANGED action or SETTINGS CHANGED @@ -775,7 +776,7 @@ class Builder(gtk.Window): self.configuration.layers = dialog.layers # DO refresh layers if dialog.layers_changed: - self.switch_page(self.LAYER_CHANGED) + self.switch_page(self.CONFIG_UPDATED) dialog.destroy() def show_load_template_dialog(self): diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index e5e0b4243d..11444ad459 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py @@ -243,11 +243,9 @@ class HobHandler(gobject.GObject): self.commands_async.append(self.SUB_PARSE_CONFIG) self.run_next_command(self.PARSE_CONFIG) - def refresh_layers(self, bblayers): - self.init_cooker() - self.set_bblayers(bblayers) - self.commands_async.append(self.SUB_PARSE_CONFIG) - self.generate_configuration() + def parse_generate_configuration(self): + self.commands_async.append(self.SUB_PARSE_CONFIG) + self.generate_configuration() def set_extra_inherit(self, bbclass): inherits = self.server.runCommand(["getVariable", "INHERIT"]) or "" -- cgit v1.2.3-54-g00ecf