mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-16 00:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hob: Simplify the init process

Browse Source 
This commit merges some functionalities together and avoid unnecessary
signal handling. This can help to speed up the Hob startup.

(Bitbake rev: e5a6eb4f007bf270f2fddc814eb856da46e20eee)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dongxiao Xu
2012-04-15 15:26:38 +08:00
committed by Richard Purdie
parent 74211e0372
commit e3e6d2a744
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bitbake/lib/bb/ui/crumbs/builder.py
View File

@@ -398,12 +398,12 @@ class Builder(gtk.Window):
if self.load_template(TemplateMgr.convert_to_template_pathfilename("default", ".hob/")) == None: if self.load_template(TemplateMgr.convert_to_template_pathfilename("default", ".hob/")) == None:
self.handler.init_cooker() self.handler.init_cooker()
self.handler.set_extra_inherit("image_types") self.handler.set_extra_inherit("image_types")
self.handler.parse_config() self.handler.generate_configuration()
def update_config_async(self): def update_config_async(self):
self.switch_page(self.MACHINE_SELECTION) self.switch_page(self.MACHINE_SELECTION)
self.set_user_config() self.set_user_config()
self.handler.parse_generate_configuration() self.handler.generate_configuration()
def populate_recipe_package_info_async(self): def populate_recipe_package_info_async(self):
self.switch_page(self.RCPPKGINFO_POPULATING) self.switch_page(self.RCPPKGINFO_POPULATING)
@@ -456,9 +456,6 @@ class Builder(gtk.Window):
def cancel_build_sync(self, force=False): def cancel_build_sync(self, force=False):
self.handler.cancel_build(force) self.handler.cancel_build(force)
def generate_configuration_async(self):
self.handler.generate_configuration()
def cancel_parse_sync(self): def cancel_parse_sync(self):
self.handler.cancel_parse() self.handler.cancel_parse()
@@ -604,11 +601,7 @@ class Builder(gtk.Window):
self.parameters.all_package_formats = formats self.parameters.all_package_formats = formats
def handler_command_succeeded_cb(self, handler, initcmd): def handler_command_succeeded_cb(self, handler, initcmd):
if initcmd == self.handler.PARSE_CONFIG: if initcmd == self.handler.GENERATE_CONFIGURATION:
# settings
self.update_configuration_parameters(self.get_parameters_sync())
self.generate_configuration_async()
elif initcmd == self.handler.GENERATE_CONFIGURATION:
self.update_configuration_parameters(self.get_parameters_sync()) self.update_configuration_parameters(self.get_parameters_sync())
self.image_configuration_page.switch_machine_combo() self.image_configuration_page.switch_machine_combo()
elif initcmd in [self.handler.GENERATE_RECIPES, elif initcmd in [self.handler.GENERATE_RECIPES,

11
bitbake/lib/bb/ui/crumbs/hobeventhandler.py
View File

@@ -59,7 +59,7 @@ class HobHandler(gobject.GObject):
(gobject.TYPE_PYOBJECT,)), (gobject.TYPE_PYOBJECT,)),
} }
(PARSE_CONFIG, GENERATE_CONFIGURATION, GENERATE_RECIPES, GENERATE_PACKAGES, GENERATE_IMAGE, POPULATE_PACKAGEINFO) = range(6) (GENERATE_CONFIGURATION, GENERATE_RECIPES, GENERATE_PACKAGES, GENERATE_IMAGE, POPULATE_PACKAGEINFO) = range(5)
(SUB_PATH_LAYERS, SUB_FILES_DISTRO, SUB_FILES_MACH, SUB_FILES_SDKMACH, SUB_MATCH_CLASS, SUB_PARSE_CONFIG, SUB_GNERATE_TGTS, SUB_GENERATE_PKGINFO, SUB_BUILD_RECIPES, SUB_BUILD_IMAGE) = range(10) (SUB_PATH_LAYERS, SUB_FILES_DISTRO, SUB_FILES_MACH, SUB_FILES_SDKMACH, SUB_MATCH_CLASS, SUB_PARSE_CONFIG, SUB_GNERATE_TGTS, SUB_GENERATE_PKGINFO, SUB_BUILD_RECIPES, SUB_BUILD_IMAGE) = range(10)
def __init__(self, server, recipe_model, package_model): def __init__(self, server, recipe_model, package_model):
@@ -219,14 +219,6 @@ class HobHandler(gobject.GObject):
def init_cooker(self): def init_cooker(self):
self.server.runCommand(["initCooker"]) self.server.runCommand(["initCooker"])
def parse_config(self):
self.commands_async.append(self.SUB_PARSE_CONFIG)
self.run_next_command(self.PARSE_CONFIG)
def parse_generate_configuration(self):
self.commands_async.append(self.SUB_PARSE_CONFIG)
self.generate_configuration()
def set_extra_inherit(self, bbclass): def set_extra_inherit(self, bbclass):
inherits = self.server.runCommand(["getVariable", "INHERIT"]) or "" inherits = self.server.runCommand(["getVariable", "INHERIT"]) or ""
inherits = inherits + " " + bbclass inherits = inherits + " " + bbclass
@@ -312,6 +304,7 @@ class HobHandler(gobject.GObject):
self.run_next_command(self.POPULATE_PACKAGEINFO) self.run_next_command(self.POPULATE_PACKAGEINFO)
def generate_configuration(self): def generate_configuration(self):
self.commands_async.append(self.SUB_PARSE_CONFIG)
self.commands_async.append(self.SUB_PATH_LAYERS) self.commands_async.append(self.SUB_PATH_LAYERS)
self.commands_async.append(self.SUB_FILES_DISTRO) self.commands_async.append(self.SUB_FILES_DISTRO)
self.commands_async.append(self.SUB_FILES_MACH) self.commands_async.append(self.SUB_FILES_MACH)