diff options
author | Christopher Larson <chris_larson@mentor.com> | 2016-09-27 11:25:09 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-28 10:16:04 +0100 |
commit | c8089ae2339dc713dbec36bb97eb83975b6a6015 (patch) | |
tree | c9f6d80073ca5db3d93c311910de05ce12285e89 /scripts/lib/recipetool | |
parent | a713b7869a72b66671b95f1000dd5dc9586bf2e7 (diff) | |
download | poky-c8089ae2339dc713dbec36bb97eb83975b6a6015.tar.gz |
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>
Diffstat (limited to 'scripts/lib/recipetool')
-rw-r--r-- | scripts/lib/recipetool/newappend.py | 13 |
1 files changed, 1 insertions, 12 deletions
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): | |||
39 | tinfoil = instance | 39 | tinfoil = instance |
40 | 40 | ||
41 | 41 | ||
42 | def _provide_to_pn(cooker, provide): | ||
43 | """Get the name of the preferred recipe for the specified provide.""" | ||
44 | import bb.providers | ||
45 | filenames = cooker.recipecache.providers[provide] | ||
46 | eligible, foundUnique = bb.providers.filterProviders(filenames, provide, cooker.expanded_data, cooker.recipecache) | ||
47 | filename = eligible[0] | ||
48 | pn = cooker.recipecache.pkg_fn[filename] | ||
49 | return pn | ||
50 | |||
51 | |||
52 | def _get_recipe_file(cooker, pn): | 42 | def _get_recipe_file(cooker, pn): |
53 | import oe.recipeutils | 43 | import oe.recipeutils |
54 | recipefile = oe.recipeutils.pn_to_recipe(cooker, pn) | 44 | recipefile = oe.recipeutils.pn_to_recipe(cooker, pn) |
@@ -70,8 +60,7 @@ def layer(layerpath): | |||
70 | def newappend(args): | 60 | def newappend(args): |
71 | import oe.recipeutils | 61 | import oe.recipeutils |
72 | 62 | ||
73 | pn = _provide_to_pn(tinfoil.cooker, args.target) | 63 | recipe_path = _get_recipe_file(tinfoil.cooker, args.target) |
74 | recipe_path = _get_recipe_file(tinfoil.cooker, pn) | ||
75 | 64 | ||
76 | rd = tinfoil.config_data.createCopy() | 65 | rd = tinfoil.config_data.createCopy() |
77 | rd.setVar('FILE', recipe_path) | 66 | rd.setVar('FILE', recipe_path) |