From patchwork Sat Apr 14 10:42:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel,2/4] Hob: Save the original image name into template Date: Sat, 14 Apr 2012 10:42:28 -0000 From: Dongxiao Xu X-Patchwork-Id: 25813 Message-Id: <7b1ddfde60e26188b04e63fad95be111ef012da5.1334400003.git.dongxiao.xu@intel.com> To: bitbake-devel@lists.openembedded.org Previously we use the template file name as the image name. This commit changes to use the original selected image into template file. Signed-off-by: Dongxiao Xu --- lib/bb/ui/crumbs/builder.py | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py index f414bc7..5e90219 100755 --- a/lib/bb/ui/crumbs/builder.py +++ b/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)