From 8edad8d282b69896237e956a00c66cd4d10ef494 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Mon, 9 Apr 2012 16:41:57 +0800 Subject: [PATCH] Hob: Change base image to "Create your own image" if customized 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 Signed-off-by: Richard Purdie --- 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(+) diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py index a3410d425d4..bc7e61094c2 100755 --- a/lib/bb/ui/crumbs/builder.py +++ b/lib/bb/ui/crumbs/builder.py @@ -272,6 +272,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 d8cb7524e52..5c2539db33c 100644 --- a/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/lib/bb/ui/crumbs/imageconfigurationpage.py @@ -291,6 +291,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 81ff76d1534..3dc09100fa7 100755 --- a/lib/bb/ui/crumbs/packageselectionpage.py +++ b/lib/bb/ui/crumbs/packageselectionpage.py @@ -95,6 +95,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 @@ -191,6 +192,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 019f9f345eb..3ad4c3cc23a 100755 --- a/lib/bb/ui/crumbs/recipeselectionpage.py +++ b/lib/bb/ui/crumbs/recipeselectionpage.py @@ -204,6 +204,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): -- 2.47.3