summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-07-27 17:06:22 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-13 19:53:24 +1300
commit615762b598698eb60b6ab47cd9b5928b1ccd92b7 (patch)
treeceaf2225e9dc8d222f2fc489f39df282106b08cd
parentd62f18c39bc0ed3b0f5ac8465b393c15f2143ecf (diff)
downloadopenembedded-core-contrib-615762b598698eb60b6ab47cd9b5928b1ccd92b7.tar.gz
openembedded-core-contrib-615762b598698eb60b6ab47cd9b5928b1ccd92b7.tar.bz2
openembedded-core-contrib-615762b598698eb60b6ab47cd9b5928b1ccd92b7.zip
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-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']
def pn_to_recipe(cooker, pn, mc=''):
"""Convert a recipe name (PN) to the path to the recipe file"""
- import bb.providers
- if pn in cooker.recipecaches[mc].pkg_pn:
- best = bb.providers.findBestProvider(pn, cooker.data, cooker.recipecaches[mc], cooker.recipecaches[mc].pkg_pn)
- return best[3]
- elif pn in cooker.recipecaches[mc].providers:
- filenames = cooker.recipecaches[mc].providers[pn]
- eligible, foundUnique = bb.providers.filterProviders(filenames, pn, cooker.expanded_data, cooker.recipecaches[mc])
- filename = eligible[0]
- return filename
- else:
- return None
+ best = cooker.findBestProvider(pn, mc)
+ return best[3]
def get_unavailable_reasons(cooker, pn):