summaryrefslogtreecommitdiffstats
path: root/bitbake/bin/bitbake-layers
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-07 14:14:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-13 22:33:24 +0100
commitdf9069d958fc9348f0afe63a7d0e0a0454ebe9b4 (patch)
tree2122a901f460608452873dda195add606d04a78c /bitbake/bin/bitbake-layers
parent8538c2291a2c8765a18a0d22aa7ac172d724a4b2 (diff)
downloadpoky-df9069d958fc9348f0afe63a7d0e0a0454ebe9b4.tar.gz
bitbake: bitbake-layers: ensure non-extended recipe name is preferred
In show-recipes and show-overlayed, we only list one variant of each recipe where multiple exist, therefore we should show the main one (e.g. in OpenEmbedded, we now show openssl and not nativesdk-openssl which would otherwise sort first.) Fixes [YOCTO #7514]. (Bitbake rev: c4172fe33f0c63eda7f4af2bd36a5e9738e13595) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin/bitbake-layers')
-rwxr-xr-xbitbake/bin/bitbake-layers8
1 files changed, 7 insertions, 1 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers
index c1c65aaa15..5116e598b3 100755
--- a/bitbake/bin/bitbake-layers
+++ b/bitbake/bin/bitbake-layers
@@ -501,7 +501,13 @@ skipped recipes will also be listed, with a " (skipped)" suffix.
501 501
502 if len(allproviders[p]) > 1 or not show_multi_provider_only: 502 if len(allproviders[p]) > 1 or not show_multi_provider_only:
503 pref = preferred_versions[p] 503 pref = preferred_versions[p]
504 preffile = bb.cache.Cache.virtualfn2realfn(pref[1])[0] 504 realfn = bb.cache.Cache.virtualfn2realfn(pref[1])
505 preffile = realfn[0]
506 # We only display once per recipe, we should prefer non extended versions of the
507 # recipe if present (so e.g. in OpenEmbedded, openssl rather than nativesdk-openssl
508 # which would otherwise sort first).
509 if realfn[1] and realfn[0] in self.bbhandler.cooker.recipecache.pkg_fn:
510 continue
505 if preffile not in preffiles: 511 if preffile not in preffiles:
506 preflayer = self.get_file_layer(preffile) 512 preflayer = self.get_file_layer(preffile)
507 multilayer = False 513 multilayer = False