From 83cc0a118f4c7a5663097df9b117b8bebd77713a Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Fri, 13 Apr 2012 21:51:36 +0800 Subject: Hob: Save the original image name into template Previously we use the template file name as the image name. This commit changes to use the original selected image into template file. (Bitbake rev: 14a9da66fe08d181f45853c52e0c9f14773070a8) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 9 ++------- bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 16 ---------------- 2 files changed, 2 insertions(+), 23 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index f414bc7120..5e90219b3c 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -153,7 +153,7 @@ class Configuration: self.cvs_proxy_host = template.getVar("CVS_PROXY_HOST") self.cvs_proxy_port = template.getVar("CVS_PROXY_PORT") - def save(self, template, filename): + def save(self, template): # bblayers.conf template.setVar("BBLAYERS", " ".join(self.layers)) # local.conf @@ -175,7 +175,6 @@ class Configuration: template.setVar("TOOLCHAIN_BUILD", self.toolchain_build) template.setVar("IMAGE_FSTYPES", self.image_fstypes) # image/recipes/packages - self.selected_image = filename template.setVar("__SELECTED_IMAGE__", self.selected_image) template.setVar("DEPENDS", self.selected_recipes) template.setVar("IMAGE_INSTALL", self.user_selected_packages) @@ -447,7 +446,7 @@ class Builder(gtk.Window): self.template = TemplateMgr() self.template.open(filename, path) - self.configuration.save(self.template, filename) + self.configuration.save(self.template) self.template.save() self.template.destroy() @@ -627,10 +626,6 @@ class Builder(gtk.Window): selected_recipes = self.configuration.selected_recipes[:] selected_packages = self.configuration.selected_packages[:] - self.recipe_model.image_list_append(selected_image, - " ".join(selected_recipes), - " ".join(selected_packages)) - self.image_configuration_page.update_image_combo(self.recipe_model, selected_image) self.image_configuration_page.update_image_desc(selected_image) self.update_recipe_model(selected_image, selected_recipes) diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py index dd93e2a4c0..e7836c5503 100644 --- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py +++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py @@ -617,22 +617,6 @@ class RecipeListModel(gtk.ListStore): def path_included(self, item_path): return self[item_path][self.COL_INC] - """ - Append a certain image into the combobox - """ - def image_list_append(self, name, deps, install): - # check whether a certain image is there - if not name or self.find_path_for_item(name): - return - it = self.append() - self.set(it, self.COL_NAME, name, self.COL_DESC, "", - self.COL_LIC, "", self.COL_GROUP, "", - self.COL_DEPS, deps, self.COL_BINB, "", - self.COL_TYPE, "image", self.COL_INC, False, - self.COL_IMG, False, self.COL_INSTALL, install, - self.COL_PN, name) - self.pn_path[name] = self.get_path(it) - """ Add this item, and any of its dependencies, to the image contents """ -- cgit v1.2.3-54-g00ecf