diff options
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 7 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py index 34ff76a..74d335c 100644 --- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py +++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py @@ -474,7 +474,7 @@ class RecipeListModel(gtk.ListStore): provide filtered views of the data. """ (COL_NAME, COL_DESC, COL_LIC, COL_GROUP, COL_DEPS, COL_BINB, COL_TYPE, COL_INC, COL_IMG, COL_INSTALL, COL_PN, COL_FADE_INC, COL_SUMMARY, COL_VERSION, - COL_REVISION, COL_HOMEPAGE, COL_BUGTRACKER) = range(17) + COL_REVISION, COL_HOMEPAGE, COL_BUGTRACKER, COL_FILE) = range(18) __custom_image__ = "Start with an empty image recipe" @@ -504,6 +504,7 @@ class RecipeListModel(gtk.ListStore): gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, + gobject.TYPE_STRING, gobject.TYPE_STRING) self.sort_column_id, self.sort_order = RecipeListModel.COL_NAME, gtk.SORT_ASCENDING @@ -692,6 +693,7 @@ class RecipeListModel(gtk.ListStore): revision = event_model["pn"][item]["revision"] homepage = event_model["pn"][item]["homepage"] bugtracker = event_model["pn"][item]["bugtracker"] + filename = event_model["pn"][item]["filename"] install = [] depends = event_model["depends"].get(item, []) + event_model["rdepends-pn"].get(item, []) @@ -715,7 +717,8 @@ class RecipeListModel(gtk.ListStore): self.COL_TYPE, atype, self.COL_INC, False, self.COL_IMG, False, self.COL_INSTALL, " ".join(install), self.COL_PN, item, self.COL_SUMMARY, summary, self.COL_VERSION, version, self.COL_REVISION, revision, - self.COL_HOMEPAGE, homepage, self.COL_BUGTRACKER, bugtracker) + self.COL_HOMEPAGE, homepage, self.COL_BUGTRACKER, bugtracker, + self.COL_FILE, filename) self.pn_path = {} it = self.get_iter_first() diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index 8da2861..3d86b6b 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py @@ -437,6 +437,7 @@ class ImageConfigurationPage (HobPage): self.image_combo.append_text(self.builder.recipe_model.__custom_image__) self.image_combo.append_text("--Separator--") + topdir = self.builder.get_topdir() # append and set active while it: path = image_model.get_path(it) @@ -460,6 +461,10 @@ class ImageConfigurationPage (HobPage): else: allow = True + file_name = image_model[path][recipe_model.COL_FILE] + if file_name and topdir in file_name: + allow = False + if allow: self.image_combo.append_text(image_name) if image_name == selected_image: |
