From e3b99239210c6bd6143cc90c681823666efb2a03 Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Fri, 6 Dec 2013 14:23:04 +0200 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 2 +- bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index e0fc0d1..1eae814 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): self.generate_configuration() def update_config_async(self): - self.switch_page(self.MACHINE_SELECTION) self.set_user_config() self.generate_configuration() + self.switch_page(self.MACHINE_SELECTION) def sanity_check(self): self.handler.trigger_sanity_check() diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index 7014935..b12f2d8 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): def generate_configuration(self): self.runCommand(["setPrePostConfFiles", "conf/.hob.conf", ""]) + self.commands_async.append(self.SUB_PARSE_CONFIG) self.commands_async.append(self.SUB_PATH_LAYERS) self.commands_async.append(self.SUB_FILES_DISTRO) self.commands_async.append(self.SUB_FILES_MACH) self.commands_async.append(self.SUB_FILES_SDKMACH) self.commands_async.append(self.SUB_MATCH_CLASS) - self.commands_async.append(self.SUB_PARSE_CONFIG) self.run_next_command(self.GENERATE_CONFIGURATION) def generate_recipes(self): -- cgit v1.1