From b844a4292bdf364b3b56796f3b541c1d4a622850 Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Mon, 11 Mar 2013 15:06:58 +0200 Subject: bitbake: hob: some settings in Hob are not remembered Some settings in Hob were not saved in Bitbake and they were not displayed correcty in Hob, because Hob used some other variables with the extension "_HOB". I have removed this, in order to have a consistency for the variables. ALso, I called a function to load the extra variables saved in .hob/template_default.hob. [YOCTO #3957] (Bitbake rev: 0f62a12ef3fa4daf8f3a289c984115302b75c23d) Signed-off-by: Cristiana Voicu Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'bitbake/lib/bb/ui/crumbs/builder.py') diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 2a0cebab29..85066299d7 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -470,8 +470,6 @@ class Builder(gtk.Window): self.handler.connect("recipe-populated", self.handler_recipe_populated_cb) self.handler.connect("package-populated", self.handler_package_populated_cb) - self.handler.set_config_filter(hob_conf_filter) - self.initiate_new_build_async() def create_visual_elements(self): @@ -553,6 +551,7 @@ class Builder(gtk.Window): self.handler.init_cooker() self.handler.set_extra_inherit("image_types") self.generate_configuration() + self.load_template(TemplateMgr.convert_to_template_pathfilename("default", ".hob/")) def update_config_async(self): self.switch_page(self.MACHINE_SELECTION) @@ -661,8 +660,7 @@ class Builder(gtk.Window): if not os.path.exists(layer+'/conf/layer.conf'): return False - self.save_defaults() # remember layers and settings - self.update_config_async() + self.set_user_config_extra() return True def save_template(self, path, defaults=False): @@ -766,6 +764,17 @@ class Builder(gtk.Window): self.handler.set_git_proxy("", "") self.handler.set_cvs_proxy("", "") + def set_user_config_extra(self): + self.handler.set_rootfs_size(self.configuration.image_rootfs_size) + self.handler.set_extra_size(self.configuration.image_extra_size) + self.handler.set_incompatible_license(self.configuration.incompat_license) + self.handler.set_sdk_machine(self.configuration.curr_sdk_machine) + self.handler.set_image_fstypes(self.configuration.image_fstypes) + self.handler.set_extra_config(self.configuration.extra_setting) + self.handler.set_extra_inherit("packageinfo") + self.handler.set_extra_inherit("image_types") + self.set_user_config_proxies() + def set_user_config(self): self.handler.init_cooker() # set bb layers @@ -779,15 +788,7 @@ class Builder(gtk.Window): self.handler.set_sstate_mirrors(self.configuration.sstatemirror) self.handler.set_pmake(self.configuration.pmake) self.handler.set_bbthreads(self.configuration.bbthread) - self.handler.set_rootfs_size(self.configuration.image_rootfs_size) - self.handler.set_extra_size(self.configuration.image_extra_size) - self.handler.set_incompatible_license(self.configuration.incompat_license) - self.handler.set_sdk_machine(self.configuration.curr_sdk_machine) - self.handler.set_image_fstypes(self.configuration.image_fstypes) - self.handler.set_extra_config(self.configuration.extra_setting) - self.handler.set_extra_inherit("packageinfo") - self.handler.set_extra_inherit("image_types") - self.set_user_config_proxies() + self.set_user_config_extra() def update_recipe_model(self, selected_image, selected_recipes): self.recipe_model.set_selected_image(selected_image) -- cgit v1.2.3-54-g00ecf