summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-06-20 17:21:16 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-20 16:26:22 +0100
commitf3246953c2ad20b9dc6801623a3245cc224bca3f (patch)
tree7b8b38565074535271d6358e88ce1487f8b0cb85 /bitbake
parent71520c50452cbc5094d8236a405e7ef76114d18d (diff)
downloadpoky-f3246953c2ad20b9dc6801623a3245cc224bca3f.tar.gz
bitbake: hob: replace the init cooker with reset in order to keep the history
When the cooker initialization is called, the variables history is lost. It need a reset, in order to load the configuration files. Also, concatenated the value for INHERIT variable. (Bitbake rev: 2b8c0c09e09ab69edc53501b84050c797f0686e4) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 2f7c496fea..d5df60f602 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -684,12 +684,11 @@ class Builder(gtk.Window):
684 self.handler.set_sdk_machine(self.configuration.curr_sdk_machine) 684 self.handler.set_sdk_machine(self.configuration.curr_sdk_machine)
685 self.handler.set_image_fstypes(self.configuration.image_fstypes) 685 self.handler.set_image_fstypes(self.configuration.image_fstypes)
686 self.handler.set_extra_config(self.configuration.extra_setting) 686 self.handler.set_extra_config(self.configuration.extra_setting)
687 self.handler.set_extra_inherit("packageinfo") 687 self.handler.set_extra_inherit("packageinfo image_types")
688 self.handler.set_extra_inherit("image_types")
689 self.set_user_config_proxies() 688 self.set_user_config_proxies()
690 689
691 def set_user_config(self): 690 def set_user_config(self):
692 self.handler.init_cooker() 691 self.handler.reset_cooker()
693 # set bb layers 692 # set bb layers
694 self.handler.set_bblayers(self.configuration.layers) 693 self.handler.set_bblayers(self.configuration.layers)
695 # set local configuration 694 # set local configuration