summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-12-06 14:23:04 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-10 11:16:14 +0000
commite3b99239210c6bd6143cc90c681823666efb2a03 (patch)
tree1992d15d7e8b7f20dc996a1d15c5a2dae1018469 /bitbake
parent3f611895c7caaacba084d5442a5953c8977641f3 (diff)
downloadpoky-e3b99239210c6bd6143cc90c681823666efb2a03.tar.gz
bitbake: hob: after adding a layer, hob do not parse the configuration
Moved the parseConfiguration method before obtaining the machines and other configurations from bitbake. If not, Hob doesn't see the new machines added by the new layer. [YOCTO #5632] (Bitbake rev: 8de14b2a481d61424eb32fd0234f7a38a961a75b) 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.py2
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index e0fc0d1114..1eae814943 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -528,9 +528,9 @@ class Builder(gtk.Window):
528 self.generate_configuration() 528 self.generate_configuration()
529 529
530 def update_config_async(self): 530 def update_config_async(self):
531 self.switch_page(self.MACHINE_SELECTION)
532 self.set_user_config() 531 self.set_user_config()
533 self.generate_configuration() 532 self.generate_configuration()
533 self.switch_page(self.MACHINE_SELECTION)
534 534
535 def sanity_check(self): 535 def sanity_check(self):
536 self.handler.trigger_sanity_check() 536 self.handler.trigger_sanity_check()
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 7014935f6d..b12f2d861c 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -403,12 +403,12 @@ class HobHandler(gobject.GObject):
403 403
404 def generate_configuration(self): 404 def generate_configuration(self):
405 self.runCommand(["setPrePostConfFiles", "conf/.hob.conf", ""]) 405 self.runCommand(["setPrePostConfFiles", "conf/.hob.conf", ""])
406 self.commands_async.append(self.SUB_PARSE_CONFIG)
406 self.commands_async.append(self.SUB_PATH_LAYERS) 407 self.commands_async.append(self.SUB_PATH_LAYERS)
407 self.commands_async.append(self.SUB_FILES_DISTRO) 408 self.commands_async.append(self.SUB_FILES_DISTRO)
408 self.commands_async.append(self.SUB_FILES_MACH) 409 self.commands_async.append(self.SUB_FILES_MACH)
409 self.commands_async.append(self.SUB_FILES_SDKMACH) 410 self.commands_async.append(self.SUB_FILES_SDKMACH)
410 self.commands_async.append(self.SUB_MATCH_CLASS) 411 self.commands_async.append(self.SUB_MATCH_CLASS)
411 self.commands_async.append(self.SUB_PARSE_CONFIG)
412 self.run_next_command(self.GENERATE_CONFIGURATION) 412 self.run_next_command(self.GENERATE_CONFIGURATION)
413 413
414 def generate_recipes(self): 414 def generate_recipes(self):