From patchwork Sun Apr 1 12:14:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel, 09/10] Hob: Change base image to "Create your own image" if customized Date: Sun, 01 Apr 2012 12:14:17 -0000 From: Dongxiao Xu X-Patchwork-Id: 25023 Message-Id: To: bitbake-devel@lists.openembedded.org Once user did customization to his base image, we change the base image to be "Create your own image" to avoid some issues caused by the relationship between base image and its default recipes and packages. This fixes [YOCTO #2211] Signed-off-by: Dongxiao Xu --- lib/bb/ui/crumbs/builder.py | 3 +++ lib/bb/ui/crumbs/imageconfigurationpage.py | 2 ++ lib/bb/ui/crumbs/packageselectionpage.py | 6 ++++++ lib/bb/ui/crumbs/recipeselectionpage.py | 5 +++++ 4 files changed, 16 insertions(+), 0 deletions(-) diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py index 8427623..20d4652 100755 --- a/lib/bb/ui/crumbs/builder.py +++ b/lib/bb/ui/crumbs/builder.py @@ -258,6 +258,9 @@ class Builder(gtk.Window): self.recipe_model = recipe_model self.package_model = package_model + # Indicate whether user has customized the image + self.customized = False + # create visual elements self.create_visual_elements() diff --git a/lib/bb/ui/crumbs/imageconfigurationpage.py b/lib/bb/ui/crumbs/imageconfigurationpage.py index 9271c48..d3cae9d 100644 --- a/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/lib/bb/ui/crumbs/imageconfigurationpage.py @@ -289,6 +289,8 @@ class ImageConfigurationPage (HobPage): if not selected_image: return + self.builder.customized = False + selected_recipes = [] image_path = self.builder.recipe_model.pn_path[selected_image] diff --git a/lib/bb/ui/crumbs/packageselectionpage.py b/lib/bb/ui/crumbs/packageselectionpage.py index d855e58..e071b07 100755 --- a/lib/bb/ui/crumbs/packageselectionpage.py +++ b/lib/bb/ui/crumbs/packageselectionpage.py @@ -90,6 +90,7 @@ class PackageSelectionPage (HobPage): super(PackageSelectionPage, self).__init__(builder, "Packages") # set invisiable members + self.recipe_model = self.builder.recipe_model self.package_model = self.builder.package_model # create visual elements @@ -193,6 +194,11 @@ class PackageSelectionPage (HobPage): self.package_model.exclude_item(item_path=path) self.refresh_selection() + if not self.builder.customized: + self.builder.customized = True + self.builder.configuration.selected_image = self.recipe_model.__dummy_image__ + self.builder.rcppkglist_populated() + self.builder.window_sensitive(True) def table_toggled_cb(self, table, cell, view_path, toggled_columnid, view_tree): diff --git a/lib/bb/ui/crumbs/recipeselectionpage.py b/lib/bb/ui/crumbs/recipeselectionpage.py index e4616a8..2d438d5 100755 --- a/lib/bb/ui/crumbs/recipeselectionpage.py +++ b/lib/bb/ui/crumbs/recipeselectionpage.py @@ -187,6 +187,11 @@ class RecipeSelectionPage (HobPage): self.recipe_model.exclude_item(item_path=path) self.refresh_selection() + if not self.builder.customized: + self.builder.customized = True + self.builder.configuration.selected_image = self.recipe_model.__dummy_image__ + self.builder.rcppkglist_populated() + self.builder.window_sensitive(True) def table_toggled_cb(self, table, cell, view_path, toggled_columnid, view_tree):