diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-07 14:14:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-15 18:10:49 +0100 |
commit | 8e0211d121e4cb1124dfe879db751ad00f5c978b (patch) | |
tree | 327f31a0024655e83fcdff4dd528639a704cbf46 | |
parent | 0a9eaa570fdf3862ef26ee537fc74f3be75fd554 (diff) | |
download | bitbake-8e0211d121e4cb1124dfe879db751ad00f5c978b.tar.gz |
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].
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>
-rwxr-xr-x | bin/bitbake-layers | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/bitbake-layers b/bin/bitbake-layers index c1c65aaa1..5116e598b 100755 --- a/bin/bitbake-layers +++ b/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 |