diff options
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/builder.py')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index dd59d59d10..cd66c3fc9d 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -398,12 +398,12 @@ class Builder(gtk.Window): | |||
398 | if self.load_template(TemplateMgr.convert_to_template_pathfilename("default", ".hob/")) == None: | 398 | if self.load_template(TemplateMgr.convert_to_template_pathfilename("default", ".hob/")) == None: |
399 | self.handler.init_cooker() | 399 | self.handler.init_cooker() |
400 | self.handler.set_extra_inherit("image_types") | 400 | self.handler.set_extra_inherit("image_types") |
401 | self.handler.parse_config() | 401 | self.handler.generate_configuration() |
402 | 402 | ||
403 | def update_config_async(self): | 403 | def update_config_async(self): |
404 | self.switch_page(self.MACHINE_SELECTION) | 404 | self.switch_page(self.MACHINE_SELECTION) |
405 | self.set_user_config() | 405 | self.set_user_config() |
406 | self.handler.parse_generate_configuration() | 406 | self.handler.generate_configuration() |
407 | 407 | ||
408 | def populate_recipe_package_info_async(self): | 408 | def populate_recipe_package_info_async(self): |
409 | self.switch_page(self.RCPPKGINFO_POPULATING) | 409 | self.switch_page(self.RCPPKGINFO_POPULATING) |
@@ -456,9 +456,6 @@ class Builder(gtk.Window): | |||
456 | def cancel_build_sync(self, force=False): | 456 | def cancel_build_sync(self, force=False): |
457 | self.handler.cancel_build(force) | 457 | self.handler.cancel_build(force) |
458 | 458 | ||
459 | def generate_configuration_async(self): | ||
460 | self.handler.generate_configuration() | ||
461 | |||
462 | def cancel_parse_sync(self): | 459 | def cancel_parse_sync(self): |
463 | self.handler.cancel_parse() | 460 | self.handler.cancel_parse() |
464 | 461 | ||
@@ -604,11 +601,7 @@ class Builder(gtk.Window): | |||
604 | self.parameters.all_package_formats = formats | 601 | self.parameters.all_package_formats = formats |
605 | 602 | ||
606 | def handler_command_succeeded_cb(self, handler, initcmd): | 603 | def handler_command_succeeded_cb(self, handler, initcmd): |
607 | if initcmd == self.handler.PARSE_CONFIG: | 604 | if initcmd == self.handler.GENERATE_CONFIGURATION: |
608 | # settings | ||
609 | self.update_configuration_parameters(self.get_parameters_sync()) | ||
610 | self.generate_configuration_async() | ||
611 | elif initcmd == self.handler.GENERATE_CONFIGURATION: | ||
612 | self.update_configuration_parameters(self.get_parameters_sync()) | 605 | self.update_configuration_parameters(self.get_parameters_sync()) |
613 | self.image_configuration_page.switch_machine_combo() | 606 | self.image_configuration_page.switch_machine_combo() |
614 | elif initcmd in [self.handler.GENERATE_RECIPES, | 607 | elif initcmd in [self.handler.GENERATE_RECIPES, |