[bitbake-devel] [PATCH 2/4] Hob: Save the original image name into template
Dongxiao Xu
dongxiao.xu at intel.com
Sat Apr 14 11:23:53 UTC 2012
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 <dongxiao.xu at intel.com>
---
lib/bb/ui/crumbs/builder.py | 9 ++-------
lib/bb/ui/crumbs/hoblistmodel.py | 16 ----------------
2 files changed, 2 insertions(+), 23 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)
diff --git a/lib/bb/ui/crumbs/hoblistmodel.py b/lib/bb/ui/crumbs/hoblistmodel.py
index dd93e2a..e7836c5 100644
--- a/lib/bb/ui/crumbs/hoblistmodel.py
+++ b/lib/bb/ui/crumbs/hoblistmodel.py
@@ -618,22 +618,6 @@ class RecipeListModel(gtk.ListStore):
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
"""
def include_item(self, item_path, binb="", image_contents=False):
--
1.7.4.1
More information about the bitbake-devel
mailing list