diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py index 59336bbee7..3abdd0c649 100644 --- a/bitbake/lib/bb/command.py +++ b/bitbake/lib/bb/command.py @@ -205,13 +205,6 @@ class CommandsSync: """ return bb.utils.cpu_count() - def setConfFilter(self, command, params): - """ - Set the configuration file parsing filter - """ - filterfunc = params[0] - bb.parse.parse_py.ConfHandler.confFilters.append(filterfunc) - def matchFile(self, command, params): fMatch = params[0] return command.cooker.matchFile(fMatch) diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 2a0cebab29..85066299d7 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -470,8 +470,6 @@ class Builder(gtk.Window): self.handler.connect("recipe-populated", self.handler_recipe_populated_cb) self.handler.connect("package-populated", self.handler_package_populated_cb) - self.handler.set_config_filter(hob_conf_filter) - self.initiate_new_build_async() def create_visual_elements(self): @@ -553,6 +551,7 @@ class Builder(gtk.Window): self.handler.init_cooker() self.handler.set_extra_inherit("image_types") self.generate_configuration() + self.load_template(TemplateMgr.convert_to_template_pathfilename("default", ".hob/")) def update_config_async(self): self.switch_page(self.MACHINE_SELECTION) @@ -661,8 +660,7 @@ class Builder(gtk.Window): if not os.path.exists(layer+'/conf/layer.conf'): return False - self.save_defaults() # remember layers and settings - self.update_config_async() + self.set_user_config_extra() return True def save_template(self, path, defaults=False): @@ -766,6 +764,17 @@ class Builder(gtk.Window): self.handler.set_git_proxy("", "") self.handler.set_cvs_proxy("", "") + def set_user_config_extra(self): + self.handler.set_rootfs_size(self.configuration.image_rootfs_size) + self.handler.set_extra_size(self.configuration.image_extra_size) + self.handler.set_incompatible_license(self.configuration.incompat_license) + self.handler.set_sdk_machine(self.configuration.curr_sdk_machine) + self.handler.set_image_fstypes(self.configuration.image_fstypes) + self.handler.set_extra_config(self.configuration.extra_setting) + self.handler.set_extra_inherit("packageinfo") + self.handler.set_extra_inherit("image_types") + self.set_user_config_proxies() + def set_user_config(self): self.handler.init_cooker() # set bb layers @@ -779,15 +788,7 @@ class Builder(gtk.Window): self.handler.set_sstate_mirrors(self.configuration.sstatemirror) self.handler.set_pmake(self.configuration.pmake) self.handler.set_bbthreads(self.configuration.bbthread) - self.handler.set_rootfs_size(self.configuration.image_rootfs_size) - self.handler.set_extra_size(self.configuration.image_extra_size) - self.handler.set_incompatible_license(self.configuration.incompat_license) - self.handler.set_sdk_machine(self.configuration.curr_sdk_machine) - self.handler.set_image_fstypes(self.configuration.image_fstypes) - self.handler.set_extra_config(self.configuration.extra_setting) - self.handler.set_extra_inherit("packageinfo") - self.handler.set_extra_inherit("image_types") - self.set_user_config_proxies() + self.set_user_config_extra() def update_recipe_model(self, selected_image, selected_recipes): self.recipe_model.set_selected_image(selected_image) diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index 15d28d927a..c33fb74100 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py @@ -307,42 +307,42 @@ class HobHandler(gobject.GObject): self.runCommand(["setVariable", "INHERIT", inherits]) def set_bblayers(self, bblayers): - self.runCommand(["setVariable", "BBLAYERS_HOB", " ".join(bblayers)]) + self.runCommand(["setVariable", "BBLAYERS", " ".join(bblayers)]) def set_machine(self, machine): if machine: - self.runCommand(["setVariable", "MACHINE_HOB", machine]) + self.runCommand(["setVariable", "MACHINE", machine]) def set_sdk_machine(self, sdk_machine): - self.runCommand(["setVariable", "SDKMACHINE_HOB", sdk_machine]) + self.runCommand(["setVariable", "SDKMACHINE", sdk_machine]) def set_image_fstypes(self, image_fstypes): self.runCommand(["setVariable", "IMAGE_FSTYPES", image_fstypes]) def set_distro(self, distro): - self.runCommand(["setVariable", "DISTRO_HOB", distro]) + self.runCommand(["setVariable", "DISTRO", distro]) def set_package_format(self, format): package_classes = "" for pkgfmt in format.split(): package_classes += ("package_%s" % pkgfmt + " ") - self.runCommand(["setVariable", "PACKAGE_CLASSES_HOB", package_classes]) + self.runCommand(["setVariable", "PACKAGE_CLASSES", package_classes]) def set_bbthreads(self, threads): - self.runCommand(["setVariable", "BB_NUMBER_THREADS_HOB", threads]) + self.runCommand(["setVariable", "BB_NUMBER_THREADS", threads]) def set_pmake(self, threads): pmake = "-j %s" % threads - self.runCommand(["setVariable", "PARALLEL_MAKE_HOB", pmake]) + self.runCommand(["setVariable", "PARALLEL_MAKE", pmake]) def set_dl_dir(self, directory): - self.runCommand(["setVariable", "DL_DIR_HOB", directory]) + self.runCommand(["setVariable", "DL_DIR", directory]) def set_sstate_dir(self, directory): - self.runCommand(["setVariable", "SSTATE_DIR_HOB", directory]) + self.runCommand(["setVariable", "SSTATE_DIR", directory]) def set_sstate_mirrors(self, url): - self.runCommand(["setVariable", "SSTATE_MIRRORS_HOB", url]) + self.runCommand(["setVariable", "SSTATE_MIRRORS", url]) def set_extra_size(self, image_extra_size): self.runCommand(["setVariable", "IMAGE_ROOTFS_EXTRA_SPACE", str(image_extra_size)]) @@ -351,16 +351,13 @@ class HobHandler(gobject.GObject): self.runCommand(["setVariable", "IMAGE_ROOTFS_SIZE", str(image_rootfs_size)]) def set_incompatible_license(self, incompat_license): - self.runCommand(["setVariable", "INCOMPATIBLE_LICENSE_HOB", incompat_license]) + self.runCommand(["setVariable", "INCOMPATIBLE_LICENSE", incompat_license]) def set_extra_config(self, extra_setting): for key in extra_setting.keys(): value = extra_setting[key] self.runCommand(["setVariable", key, value]) - def set_config_filter(self, config_filter): - self.runCommand(["setConfFilter", config_filter]) - def set_http_proxy(self, http_proxy): self.runCommand(["setVariable", "http_proxy", http_proxy])