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. (From OE-Core rev: 4a5028dc3d1ab2f97465e63db5b05de73daebdfa) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
a713b7869a
commit
c8089ae233
|
@ -39,16 +39,6 @@ def tinfoil_init(instance):
|
||||||
tinfoil = 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):
|
def _get_recipe_file(cooker, pn):
|
||||||
import oe.recipeutils
|
import oe.recipeutils
|
||||||
recipefile = oe.recipeutils.pn_to_recipe(cooker, pn)
|
recipefile = oe.recipeutils.pn_to_recipe(cooker, pn)
|
||||||
|
@ -70,8 +60,7 @@ def layer(layerpath):
|
||||||
def newappend(args):
|
def newappend(args):
|
||||||
import oe.recipeutils
|
import oe.recipeutils
|
||||||
|
|
||||||
pn = _provide_to_pn(tinfoil.cooker, args.target)
|
recipe_path = _get_recipe_file(tinfoil.cooker, args.target)
|
||||||
recipe_path = _get_recipe_file(tinfoil.cooker, pn)
|
|
||||||
|
|
||||||
rd = tinfoil.config_data.createCopy()
|
rd = tinfoil.config_data.createCopy()
|
||||||
rd.setVar('FILE', recipe_path)
|
rd.setVar('FILE', recipe_path)
|
||||||
|
|
Loading…
Reference in New Issue