From 4dc652a0c33321f5079448b0f182c8b8f7b2b4f6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 7 Apr 2015 14:14:04 +0100 Subject: 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: 8e0211d121e4cb1124dfe879db751ad00f5c978b) Signed-off-by: Richard Purdie Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- bitbake/bin/bitbake-layers | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bitbake') 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. if len(allproviders[p]) > 1 or not show_multi_provider_only: pref = preferred_versions[p] - preffile = bb.cache.Cache.virtualfn2realfn(pref[1])[0] + realfn = bb.cache.Cache.virtualfn2realfn(pref[1]) + preffile = realfn[0] + # We only display once per recipe, we should prefer non extended versions of the + # recipe if present (so e.g. in OpenEmbedded, openssl rather than nativesdk-openssl + # which would otherwise sort first). + if realfn[1] and realfn[0] in self.bbhandler.cooker.recipecache.pkg_fn: + continue if preffile not in preffiles: preflayer = self.get_file_layer(preffile) multilayer = False -- cgit v1.2.3-54-g00ecf