diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-04-13 21:51:36 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-14 14:43:24 +0100 |
commit | 83cc0a118f4c7a5663097df9b117b8bebd77713a (patch) | |
tree | 2cc2113f121ebf1ab948598252439f092a2001e4 /bitbake/lib/bb | |
parent | ac998632f75a9314d600126e7b479fc602804a20 (diff) | |
download | poky-83cc0a118f4c7a5663097df9b117b8bebd77713a.tar.gz |
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 <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 9 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 16 |
2 files changed, 2 insertions, 23 deletions
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: | |||
153 | self.cvs_proxy_host = template.getVar("CVS_PROXY_HOST") | 153 | self.cvs_proxy_host = template.getVar("CVS_PROXY_HOST") |
154 | self.cvs_proxy_port = template.getVar("CVS_PROXY_PORT") | 154 | self.cvs_proxy_port = template.getVar("CVS_PROXY_PORT") |
155 | 155 | ||
156 | def save(self, template, filename): | 156 | def save(self, template): |
157 | # bblayers.conf | 157 | # bblayers.conf |
158 | template.setVar("BBLAYERS", " ".join(self.layers)) | 158 | template.setVar("BBLAYERS", " ".join(self.layers)) |
159 | # local.conf | 159 | # local.conf |
@@ -175,7 +175,6 @@ class Configuration: | |||
175 | template.setVar("TOOLCHAIN_BUILD", self.toolchain_build) | 175 | template.setVar("TOOLCHAIN_BUILD", self.toolchain_build) |
176 | template.setVar("IMAGE_FSTYPES", self.image_fstypes) | 176 | template.setVar("IMAGE_FSTYPES", self.image_fstypes) |
177 | # image/recipes/packages | 177 | # image/recipes/packages |
178 | self.selected_image = filename | ||
179 | template.setVar("__SELECTED_IMAGE__", self.selected_image) | 178 | template.setVar("__SELECTED_IMAGE__", self.selected_image) |
180 | template.setVar("DEPENDS", self.selected_recipes) | 179 | template.setVar("DEPENDS", self.selected_recipes) |
181 | template.setVar("IMAGE_INSTALL", self.user_selected_packages) | 180 | template.setVar("IMAGE_INSTALL", self.user_selected_packages) |
@@ -447,7 +446,7 @@ class Builder(gtk.Window): | |||
447 | 446 | ||
448 | self.template = TemplateMgr() | 447 | self.template = TemplateMgr() |
449 | self.template.open(filename, path) | 448 | self.template.open(filename, path) |
450 | self.configuration.save(self.template, filename) | 449 | self.configuration.save(self.template) |
451 | 450 | ||
452 | self.template.save() | 451 | self.template.save() |
453 | self.template.destroy() | 452 | self.template.destroy() |
@@ -627,10 +626,6 @@ class Builder(gtk.Window): | |||
627 | selected_recipes = self.configuration.selected_recipes[:] | 626 | selected_recipes = self.configuration.selected_recipes[:] |
628 | selected_packages = self.configuration.selected_packages[:] | 627 | selected_packages = self.configuration.selected_packages[:] |
629 | 628 | ||
630 | self.recipe_model.image_list_append(selected_image, | ||
631 | " ".join(selected_recipes), | ||
632 | " ".join(selected_packages)) | ||
633 | |||
634 | self.image_configuration_page.update_image_combo(self.recipe_model, selected_image) | 629 | self.image_configuration_page.update_image_combo(self.recipe_model, selected_image) |
635 | self.image_configuration_page.update_image_desc(selected_image) | 630 | self.image_configuration_page.update_image_desc(selected_image) |
636 | self.update_recipe_model(selected_image, selected_recipes) | 631 | 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 | |||
@@ -618,22 +618,6 @@ class RecipeListModel(gtk.ListStore): | |||
618 | return self[item_path][self.COL_INC] | 618 | return self[item_path][self.COL_INC] |
619 | 619 | ||
620 | """ | 620 | """ |
621 | Append a certain image into the combobox | ||
622 | """ | ||
623 | def image_list_append(self, name, deps, install): | ||
624 | # check whether a certain image is there | ||
625 | if not name or self.find_path_for_item(name): | ||
626 | return | ||
627 | it = self.append() | ||
628 | self.set(it, self.COL_NAME, name, self.COL_DESC, "", | ||
629 | self.COL_LIC, "", self.COL_GROUP, "", | ||
630 | self.COL_DEPS, deps, self.COL_BINB, "", | ||
631 | self.COL_TYPE, "image", self.COL_INC, False, | ||
632 | self.COL_IMG, False, self.COL_INSTALL, install, | ||
633 | self.COL_PN, name) | ||
634 | self.pn_path[name] = self.get_path(it) | ||
635 | |||
636 | """ | ||
637 | Add this item, and any of its dependencies, to the image contents | 621 | Add this item, and any of its dependencies, to the image contents |
638 | """ | 622 | """ |
639 | def include_item(self, item_path, binb="", image_contents=False): | 623 | def include_item(self, item_path, binb="", image_contents=False): |