diff options
| author |   Dongxiao Xu <dongxiao.xu@intel.com> | 2012-03-29 20:01:16 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-29 21:25:53 +0100 |
| commit | a8c03230341644b1a2589f89ff40fdfb382534e8 (patch) | |
| tree | d2edf1794859e5d26b4849d359586b87c8cde582 /bitbake | |
| parent | e24f10e275e30caa06a5f97b742be1a0996255d7 (diff) | |
| download | openembedded-core-contrib-a8c03230341644b1a2589f89ff40fdfb382534e8.tar.gz | |
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 <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 13 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 8 |
2 files changed, 10 insertions, 11 deletions
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 "" |