summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2012-03-21 16:27:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-22 14:40:40 +0000
commitb6817986df45c4064fdd311aa4f5152b4462b18a (patch)
tree71aee5d4ee11520d982d08763c91399730f199fb
parentef2e881c1bac6d54943f92da520faaaed6bef3bf (diff)
downloadpoky-b6817986df45c4064fdd311aa4f5152b4462b18a.tar.gz
Hob: Use inherit information to judge if a recipe is image type
Previously we use pattern "-image-" to match recipe name to judge if it is image type. This will ignore some images whose name doesn't match the pattern. The new method is to use the inherit information, that is, if a recipe inherits image.bbclass, we treat it as an image. (From Poky rev: 981b81bd39529d2ba9af0d4e2a25bda3d32bd8fc) (Bitbake rev: bdbee0c899e115ad08b9a77d3e58d6767766da75) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/ui/crumbs/hoblistmodel.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
index 61f2911f89..bfd49bd24d 100644
--- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
+++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
@@ -528,6 +528,7 @@ class RecipeListModel(gtk.ListStore):
528 desc = event_model["pn"][item]["description"] 528 desc = event_model["pn"][item]["description"]
529 lic = event_model["pn"][item]["license"] 529 lic = event_model["pn"][item]["license"]
530 group = event_model["pn"][item]["section"] 530 group = event_model["pn"][item]["section"]
531 inherits = event_model["pn"][item]["inherits"]
531 install = [] 532 install = []
532 533
533 depends = event_model["depends"].get(item, []) + event_model["rdepends-pn"].get(item, []) 534 depends = event_model["depends"].get(item, []) + event_model["rdepends-pn"].get(item, [])
@@ -537,9 +538,10 @@ class RecipeListModel(gtk.ListStore):
537 atype = 'mltask' 538 atype = 'mltask'
538 else: 539 else:
539 atype = 'task' 540 atype = 'task'
540 elif ('-image-' in name): 541 elif ('image.bbclass' in " ".join(inherits)):
541 atype = 'image' 542 if name != "hob-image":
542 install = event_model["rdepends-pkg"].get(item, []) + event_model["rrecs-pkg"].get(item, []) 543 atype = 'image'
544 install = event_model["rdepends-pkg"].get(item, []) + event_model["rrecs-pkg"].get(item, [])
543 elif ('meta-' in name): 545 elif ('meta-' in name):
544 atype = 'toolchain' 546 atype = 'toolchain'
545 elif (name == 'dummy-image' or name == 'dummy-toolchain'): 547 elif (name == 'dummy-image' or name == 'dummy-toolchain'):