diff options
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs')
-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 34ff76a9d2..74d335c88b 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): | |||
474 | provide filtered views of the data. | 474 | provide filtered views of the data. |
475 | """ | 475 | """ |
476 | (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, | 476 | (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, |
477 | COL_REVISION, COL_HOMEPAGE, COL_BUGTRACKER) = range(17) | 477 | COL_REVISION, COL_HOMEPAGE, COL_BUGTRACKER, COL_FILE) = range(18) |
478 | 478 | ||
479 | __custom_image__ = "Start with an empty image recipe" | 479 | __custom_image__ = "Start with an empty image recipe" |
480 | 480 | ||
@@ -504,6 +504,7 @@ class RecipeListModel(gtk.ListStore): | |||
504 | gobject.TYPE_STRING, | 504 | gobject.TYPE_STRING, |
505 | gobject.TYPE_STRING, | 505 | gobject.TYPE_STRING, |
506 | gobject.TYPE_STRING, | 506 | gobject.TYPE_STRING, |
507 | gobject.TYPE_STRING, | ||
507 | gobject.TYPE_STRING) | 508 | gobject.TYPE_STRING) |
508 | self.sort_column_id, self.sort_order = RecipeListModel.COL_NAME, gtk.SORT_ASCENDING | 509 | self.sort_column_id, self.sort_order = RecipeListModel.COL_NAME, gtk.SORT_ASCENDING |
509 | 510 | ||
@@ -692,6 +693,7 @@ class RecipeListModel(gtk.ListStore): | |||
692 | revision = event_model["pn"][item]["revision"] | 693 | revision = event_model["pn"][item]["revision"] |
693 | homepage = event_model["pn"][item]["homepage"] | 694 | homepage = event_model["pn"][item]["homepage"] |
694 | bugtracker = event_model["pn"][item]["bugtracker"] | 695 | bugtracker = event_model["pn"][item]["bugtracker"] |
696 | filename = event_model["pn"][item]["filename"] | ||
695 | install = [] | 697 | install = [] |
696 | 698 | ||
697 | depends = event_model["depends"].get(item, []) + event_model["rdepends-pn"].get(item, []) | 699 | depends = event_model["depends"].get(item, []) + event_model["rdepends-pn"].get(item, []) |
@@ -715,7 +717,8 @@ class RecipeListModel(gtk.ListStore): | |||
715 | self.COL_TYPE, atype, self.COL_INC, False, | 717 | self.COL_TYPE, atype, self.COL_INC, False, |
716 | self.COL_IMG, False, self.COL_INSTALL, " ".join(install), self.COL_PN, item, | 718 | self.COL_IMG, False, self.COL_INSTALL, " ".join(install), self.COL_PN, item, |
717 | self.COL_SUMMARY, summary, self.COL_VERSION, version, self.COL_REVISION, revision, | 719 | self.COL_SUMMARY, summary, self.COL_VERSION, version, self.COL_REVISION, revision, |
718 | self.COL_HOMEPAGE, homepage, self.COL_BUGTRACKER, bugtracker) | 720 | self.COL_HOMEPAGE, homepage, self.COL_BUGTRACKER, bugtracker, |
721 | self.COL_FILE, filename) | ||
719 | 722 | ||
720 | self.pn_path = {} | 723 | self.pn_path = {} |
721 | it = self.get_iter_first() | 724 | it = self.get_iter_first() |
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index 8da28617e8..3d86b6b431 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | |||
@@ -437,6 +437,7 @@ class ImageConfigurationPage (HobPage): | |||
437 | self.image_combo.append_text(self.builder.recipe_model.__custom_image__) | 437 | self.image_combo.append_text(self.builder.recipe_model.__custom_image__) |
438 | self.image_combo.append_text("--Separator--") | 438 | self.image_combo.append_text("--Separator--") |
439 | 439 | ||
440 | topdir = self.builder.get_topdir() | ||
440 | # append and set active | 441 | # append and set active |
441 | while it: | 442 | while it: |
442 | path = image_model.get_path(it) | 443 | path = image_model.get_path(it) |
@@ -460,6 +461,10 @@ class ImageConfigurationPage (HobPage): | |||
460 | else: | 461 | else: |
461 | allow = True | 462 | allow = True |
462 | 463 | ||
464 | file_name = image_model[path][recipe_model.COL_FILE] | ||
465 | if file_name and topdir in file_name: | ||
466 | allow = False | ||
467 | |||
463 | if allow: | 468 | if allow: |
464 | self.image_combo.append_text(image_name) | 469 | self.image_combo.append_text(image_name) |
465 | if image_name == selected_image: | 470 | if image_name == selected_image: |