From c546037dc9a9af49246d06114f19533ecfca67c3 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Mon, 9 Apr 2012 16:41:57 +0800 Subject: 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] (Bitbake rev: 8edad8d282b69896237e956a00c66cd4d10ef494) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/builder.py | 3 +++ bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | 2 ++ bitbake/lib/bb/ui/crumbs/packageselectionpage.py | 6 ++++++ bitbake/lib/bb/ui/crumbs/recipeselectionpage.py | 5 +++++ 4 files changed, 16 insertions(+) (limited to 'bitbake/lib/bb') diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index a3410d425d..bc7e61094c 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/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/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index d8cb7524e5..5c2539db33 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/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/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py index 81ff76d153..3dc09100fa 100755 --- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py +++ b/bitbake/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/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py index 019f9f345e..3ad4c3cc23 100755 --- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py +++ b/bitbake/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): -- cgit v1.2.3-54-g00ecf