summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-13 20:09:33 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-14 12:30:49 +0000
commit557382ab4203173e0425d01effaf61cf25d73895 (patch)
tree64252c542b4e0efc33b007e3f971db8a3c875177
parent1e29b57e9278f7d62e6357b5893556acdc0d4b9e (diff)
downloadpoky-557382ab4203173e0425d01effaf61cf25d73895.tar.gz
lib/oe/recipeutils: use cooker function instead of bb.providers
We now have a function in cooker itself that can do this lookup; additionally, the rewritten tinfoil's cooker adapter has its own implementation that can work remotely, so if we use it then this function can work in that scenario as well. (From OE-Core rev: 0a6a4be99c1e4ef3c0da53d63f18ad579545d6a8) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/recipeutils.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 1589feb5ce..ae83aabec1 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -29,18 +29,9 @@ meta_vars = ['SUMMARY', 'DESCRIPTION', 'HOMEPAGE', 'BUGTRACKER', 'SECTION']
29 29
30def pn_to_recipe(cooker, pn, mc=''): 30def pn_to_recipe(cooker, pn, mc=''):
31 """Convert a recipe name (PN) to the path to the recipe file""" 31 """Convert a recipe name (PN) to the path to the recipe file"""
32 import bb.providers
33 32
34 if pn in cooker.recipecaches[mc].pkg_pn: 33 best = cooker.findBestProvider(pn, mc)
35 best = bb.providers.findBestProvider(pn, cooker.data, cooker.recipecaches[mc], cooker.recipecaches[mc].pkg_pn) 34 return best[3]
36 return best[3]
37 elif pn in cooker.recipecaches[mc].providers:
38 filenames = cooker.recipecaches[mc].providers[pn]
39 eligible, foundUnique = bb.providers.filterProviders(filenames, pn, cooker.expanded_data, cooker.recipecaches[mc])
40 filename = eligible[0]
41 return filename
42 else:
43 return None
44 35
45 36
46def get_unavailable_reasons(cooker, pn): 37def get_unavailable_reasons(cooker, pn):