From 4a5028dc3d1ab2f97465e63db5b05de73daebdfa Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Tue, 27 Sep 2016 11:25:09 -0700 Subject: recipetool: newappend: drop _provide_to_pn This function was broken by the multi-config changes, and isn't needed anymore now that recipeutils.pn_to_recipe can handle provides. Without this, the newappend sub-command fails. Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- scripts/lib/recipetool/newappend.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/recipetool/newappend.py b/scripts/lib/recipetool/newappend.py index 4fbb40a358..fbdd7bcef5 100644 --- a/scripts/lib/recipetool/newappend.py +++ b/scripts/lib/recipetool/newappend.py @@ -39,16 +39,6 @@ def tinfoil_init(instance): tinfoil = instance -def _provide_to_pn(cooker, provide): - """Get the name of the preferred recipe for the specified provide.""" - import bb.providers - filenames = cooker.recipecache.providers[provide] - eligible, foundUnique = bb.providers.filterProviders(filenames, provide, cooker.expanded_data, cooker.recipecache) - filename = eligible[0] - pn = cooker.recipecache.pkg_fn[filename] - return pn - - def _get_recipe_file(cooker, pn): import oe.recipeutils recipefile = oe.recipeutils.pn_to_recipe(cooker, pn) @@ -70,8 +60,7 @@ def layer(layerpath): def newappend(args): import oe.recipeutils - pn = _provide_to_pn(tinfoil.cooker, args.target) - recipe_path = _get_recipe_file(tinfoil.cooker, pn) + recipe_path = _get_recipe_file(tinfoil.cooker, args.target) rd = tinfoil.config_data.createCopy() rd.setVar('FILE', recipe_path) -- cgit 1.2.3-korg