diff options
| -rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 7 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 16 |
2 files changed, 16 insertions, 7 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index cbcb3f1965..4b274a75a1 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -405,6 +405,9 @@ class Builder(gtk.Window): self.set_user_config() self.handler.generate_configuration() + def sanity_check(self): + self.handler.trigger_sanity_check() + def populate_recipe_package_info_async(self): self.switch_page(self.RCPPKGINFO_POPULATING) # Parse recipes @@ -557,8 +560,6 @@ class Builder(gtk.Window): self.handler.init_cooker() # set bb layers self.handler.set_bblayers(self.configuration.layers) - # Re-enable sanity checks - self.handler.enable_sanity() # set local configuration self.handler.set_machine(self.configuration.curr_mach) self.handler.set_package_format(self.configuration.curr_package_format) @@ -620,6 +621,8 @@ class Builder(gtk.Window): def handler_command_succeeded_cb(self, handler, initcmd): if initcmd == self.handler.GENERATE_CONFIGURATION: self.update_configuration_parameters(self.get_parameters_sync()) + self.sanity_check() + elif initcmd == self.handler.SANITY_CHECK: self.image_configuration_page.switch_machine_combo() elif initcmd in [self.handler.GENERATE_RECIPES, self.handler.GENERATE_PACKAGES, diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index c918aad8dc..a07afddead 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py @@ -59,8 +59,8 @@ class HobHandler(gobject.GObject): (gobject.TYPE_PYOBJECT,)), } - (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) + (GENERATE_CONFIGURATION, GENERATE_RECIPES, GENERATE_PACKAGES, GENERATE_IMAGE, POPULATE_PACKAGEINFO, SANITY_CHECK) = range(6) + (SUB_PATH_LAYERS, SUB_FILES_DISTRO, SUB_FILES_MACH, SUB_FILES_SDKMACH, SUB_MATCH_CLASS, SUB_PARSE_CONFIG, SUB_SANITY_CHECK, SUB_GNERATE_TGTS, SUB_GENERATE_PKGINFO, SUB_BUILD_RECIPES, SUB_BUILD_IMAGE) = range(11) def __init__(self, server, recipe_model, package_model): super(HobHandler, self).__init__() @@ -129,6 +129,8 @@ class HobHandler(gobject.GObject): self.runCommand(["generateTargetsTree", "classes/image.bbclass", []]) elif next_command == self.SUB_GENERATE_PKGINFO: self.runCommand(["triggerEvent", "bb.event.RequestPackageInfo()"]) + elif next_command == self.SUB_SANITY_CHECK: + self.runCommand(["triggerEvent", "bb.event.SanityCheck()"]) elif next_command == self.SUB_BUILD_RECIPES: self.clear_busy() self.building = True @@ -158,6 +160,9 @@ class HobHandler(gobject.GObject): self.package_model.populate(event._pkginfolist) self.run_next_command() + elif isinstance(event, bb.event.SanityCheckPassed): + self.run_next_command() + elif isinstance(event, logging.LogRecord): if event.levelno >= logging.ERROR: self.error_msg += event.msg + '\n' @@ -233,9 +238,6 @@ class HobHandler(gobject.GObject): inherits = inherits + " " + bbclass self.runCommand(["setVariable", "INHERIT", inherits]) - def enable_sanity(self): - self.runCommand(["setVariable", "DISABLE_SANITY_CHECKS", "0"]) - def set_bblayers(self, bblayers): self.runCommand(["setVariable", "BBLAYERS_HOB", " ".join(bblayers)]) @@ -315,6 +317,10 @@ class HobHandler(gobject.GObject): self.commands_async.append(self.SUB_GENERATE_PKGINFO) self.run_next_command(self.POPULATE_PACKAGEINFO) + def trigger_sanity_check(self): + self.commands_async.append(self.SUB_SANITY_CHECK) + self.run_next_command(self.SANITY_CHECK) + def generate_configuration(self): self.commands_async.append(self.SUB_PARSE_CONFIG) self.commands_async.append(self.SUB_PATH_LAYERS) |