diff options
author | Cristiana Voicu <cristiana.voicu@intel.com> | 2013-03-11 15:06:58 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-19 20:58:11 +0000 |
commit | b844a4292bdf364b3b56796f3b541c1d4a622850 (patch) | |
tree | 4dcb02dfb63725729e56a719357b9ddab3ca852a /bitbake/lib/bb/ui/crumbs/builder.py | |
parent | 8852e51bdcb55002e666ab9d4476d98599fdfc67 (diff) | |
download | poky-b844a4292bdf364b3b56796f3b541c1d4a622850.tar.gz |
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 <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/builder.py')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 27 |
1 files changed, 14 insertions, 13 deletions
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): | |||
470 | self.handler.connect("recipe-populated", self.handler_recipe_populated_cb) | 470 | self.handler.connect("recipe-populated", self.handler_recipe_populated_cb) |
471 | self.handler.connect("package-populated", self.handler_package_populated_cb) | 471 | self.handler.connect("package-populated", self.handler_package_populated_cb) |
472 | 472 | ||
473 | self.handler.set_config_filter(hob_conf_filter) | ||
474 | |||
475 | self.initiate_new_build_async() | 473 | self.initiate_new_build_async() |
476 | 474 | ||
477 | def create_visual_elements(self): | 475 | def create_visual_elements(self): |
@@ -553,6 +551,7 @@ class Builder(gtk.Window): | |||
553 | self.handler.init_cooker() | 551 | self.handler.init_cooker() |
554 | self.handler.set_extra_inherit("image_types") | 552 | self.handler.set_extra_inherit("image_types") |
555 | self.generate_configuration() | 553 | self.generate_configuration() |
554 | self.load_template(TemplateMgr.convert_to_template_pathfilename("default", ".hob/")) | ||
556 | 555 | ||
557 | def update_config_async(self): | 556 | def update_config_async(self): |
558 | self.switch_page(self.MACHINE_SELECTION) | 557 | self.switch_page(self.MACHINE_SELECTION) |
@@ -661,8 +660,7 @@ class Builder(gtk.Window): | |||
661 | if not os.path.exists(layer+'/conf/layer.conf'): | 660 | if not os.path.exists(layer+'/conf/layer.conf'): |
662 | return False | 661 | return False |
663 | 662 | ||
664 | self.save_defaults() # remember layers and settings | 663 | self.set_user_config_extra() |
665 | self.update_config_async() | ||
666 | return True | 664 | return True |
667 | 665 | ||
668 | def save_template(self, path, defaults=False): | 666 | def save_template(self, path, defaults=False): |
@@ -766,6 +764,17 @@ class Builder(gtk.Window): | |||
766 | self.handler.set_git_proxy("", "") | 764 | self.handler.set_git_proxy("", "") |
767 | self.handler.set_cvs_proxy("", "") | 765 | self.handler.set_cvs_proxy("", "") |
768 | 766 | ||
767 | def set_user_config_extra(self): | ||
768 | self.handler.set_rootfs_size(self.configuration.image_rootfs_size) | ||
769 | self.handler.set_extra_size(self.configuration.image_extra_size) | ||
770 | self.handler.set_incompatible_license(self.configuration.incompat_license) | ||
771 | self.handler.set_sdk_machine(self.configuration.curr_sdk_machine) | ||
772 | self.handler.set_image_fstypes(self.configuration.image_fstypes) | ||
773 | self.handler.set_extra_config(self.configuration.extra_setting) | ||
774 | self.handler.set_extra_inherit("packageinfo") | ||
775 | self.handler.set_extra_inherit("image_types") | ||
776 | self.set_user_config_proxies() | ||
777 | |||
769 | def set_user_config(self): | 778 | def set_user_config(self): |
770 | self.handler.init_cooker() | 779 | self.handler.init_cooker() |
771 | # set bb layers | 780 | # set bb layers |
@@ -779,15 +788,7 @@ class Builder(gtk.Window): | |||
779 | self.handler.set_sstate_mirrors(self.configuration.sstatemirror) | 788 | self.handler.set_sstate_mirrors(self.configuration.sstatemirror) |
780 | self.handler.set_pmake(self.configuration.pmake) | 789 | self.handler.set_pmake(self.configuration.pmake) |
781 | self.handler.set_bbthreads(self.configuration.bbthread) | 790 | self.handler.set_bbthreads(self.configuration.bbthread) |
782 | self.handler.set_rootfs_size(self.configuration.image_rootfs_size) | 791 | self.set_user_config_extra() |
783 | self.handler.set_extra_size(self.configuration.image_extra_size) | ||
784 | self.handler.set_incompatible_license(self.configuration.incompat_license) | ||
785 | self.handler.set_sdk_machine(self.configuration.curr_sdk_machine) | ||
786 | self.handler.set_image_fstypes(self.configuration.image_fstypes) | ||
787 | self.handler.set_extra_config(self.configuration.extra_setting) | ||
788 | self.handler.set_extra_inherit("packageinfo") | ||
789 | self.handler.set_extra_inherit("image_types") | ||
790 | self.set_user_config_proxies() | ||
791 | 792 | ||
792 | def update_recipe_model(self, selected_image, selected_recipes): | 793 | def update_recipe_model(self, selected_image, selected_recipes): |
793 | self.recipe_model.set_selected_image(selected_image) | 794 | self.recipe_model.set_selected_image(selected_image) |