summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-09-10 18:26:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-10 21:54:45 +0100
commit1b1b83651af33ffcb204031e2790719e3b0b45bb (patch)
tree671d03feea3856d64b884aa24692d2ff5ef9c77d /bitbake
parent5f40b7a29b2fe957b69c87cce7c8b2e9cf52a4a0 (diff)
downloadpoky-1b1b83651af33ffcb204031e2790719e3b0b45bb.tar.gz
bitbake: hob: rename task -> packagegroup in recipe selection
This changes the filtering to use the inheritance of packagegroup.bbclass to determine if a recipe is a package group. Also makes the tab tooltip text generic; these recipes could come from any enabled layer, not just the default ones. (Bitbake rev: a3bf87a90198bf6127663c27d8be086dab04aaf9) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/ui/crumbs/hoblistmodel.py4
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/recipeselectionpage.py14
2 files changed, 9 insertions, 9 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
index 66b0efa6b3..15894d3781 100644
--- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
+++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
@@ -595,8 +595,8 @@ class RecipeListModel(gtk.ListStore):
595 595
596 depends = event_model["depends"].get(item, []) + event_model["rdepends-pn"].get(item, []) 596 depends = event_model["depends"].get(item, []) + event_model["rdepends-pn"].get(item, [])
597 597
598 if ('task-' in name): 598 if ('packagegroup.bbclass' in " ".join(inherits)):
599 atype = 'task' 599 atype = 'packagegroup'
600 elif ('image.bbclass' in " ".join(inherits)): 600 elif ('image.bbclass' in " ".join(inherits)):
601 if name != "hob-image": 601 if name != "hob-image":
602 atype = 'image' 602 atype = 'image'
diff --git a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
index 693a449bcf..0b159bb108 100755
--- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
@@ -36,7 +36,7 @@ class RecipeSelectionPage (HobPage):
36 'name' : 'Included recipes', 36 'name' : 'Included recipes',
37 'tooltip' : 'The recipes currently included for your image', 37 'tooltip' : 'The recipes currently included for your image',
38 'filter' : { RecipeListModel.COL_INC : [True], 38 'filter' : { RecipeListModel.COL_INC : [True],
39 RecipeListModel.COL_TYPE : ['recipe', 'task'] }, 39 RecipeListModel.COL_TYPE : ['recipe', 'packagegroup'] },
40 'columns' : [{ 40 'columns' : [{
41 'col_name' : 'Recipe name', 41 'col_name' : 'Recipe name',
42 'col_id' : RecipeListModel.COL_NAME, 42 'col_id' : RecipeListModel.COL_NAME,
@@ -67,7 +67,7 @@ class RecipeSelectionPage (HobPage):
67 }] 67 }]
68 }, { 68 }, {
69 'name' : 'All recipes', 69 'name' : 'All recipes',
70 'tooltip' : 'All recipes available in the Yocto Project', 70 'tooltip' : 'All recipes in your configured layers',
71 'filter' : { RecipeListModel.COL_TYPE : ['recipe'] }, 71 'filter' : { RecipeListModel.COL_TYPE : ['recipe'] },
72 'columns' : [{ 72 'columns' : [{
73 'col_name' : 'Recipe name', 73 'col_name' : 'Recipe name',
@@ -98,11 +98,11 @@ class RecipeSelectionPage (HobPage):
98 'col_max' : 100 98 'col_max' : 100
99 }] 99 }]
100 }, { 100 }, {
101 'name' : 'Tasks', 101 'name' : 'Package Groups',
102 'tooltip' : 'All tasks available in the Yocto Project', 102 'tooltip' : 'All package groups in your configured layers',
103 'filter' : { RecipeListModel.COL_TYPE : ['task'] }, 103 'filter' : { RecipeListModel.COL_TYPE : ['packagegroup'] },
104 'columns' : [{ 104 'columns' : [{
105 'col_name' : 'Task name', 105 'col_name' : 'Package group name',
106 'col_id' : RecipeListModel.COL_NAME, 106 'col_id' : RecipeListModel.COL_NAME,
107 'col_style': 'text', 107 'col_style': 'text',
108 'col_min' : 100, 108 'col_min' : 100,
@@ -236,7 +236,7 @@ class RecipeSelectionPage (HobPage):
236 # Check out a model which base on the column COL_FADE_INC, 236 # Check out a model which base on the column COL_FADE_INC,
237 # it's save the prev state of column COL_INC before do exclude_item 237 # it's save the prev state of column COL_INC before do exclude_item
238 filter = { RecipeListModel.COL_FADE_INC : [True], 238 filter = { RecipeListModel.COL_FADE_INC : [True],
239 RecipeListModel.COL_TYPE : ['recipe', 'task'] } 239 RecipeListModel.COL_TYPE : ['recipe', 'packagegroup'] }
240 new_model = self.recipe_model.tree_model(filter, excluded_items_ahead=True) 240 new_model = self.recipe_model.tree_model(filter, excluded_items_ahead=True)
241 tree.set_model(new_model) 241 tree.set_model(new_model)
242 242