summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-08-16 12:46:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-19 17:57:54 +0100
commit6ba969f1ac5a1a0e277a21287fc5ae1622a6b14e (patch)
tree2b2c96fe07077c81b2125ba6964f5e45215b7772 /scripts
parentb63fca00c2e24ad0c8b8b3c492d93ee4372fa92d (diff)
downloadopenembedded-core-contrib-6ba969f1ac5a1a0e277a21287fc5ae1622a6b14e.tar.gz
lib/oe/recipeutils: avoid parsing in get_var_files()
Let's have the caller do this and then the function is a bit more flexible (e.g. we can choose to parse with bbappends or not); fix up calls to this function appropriately (of which there are only two, both within devtool). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/standard.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index e85e1ad860..e1c5584a83 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -630,7 +630,7 @@ def _update_recipe_srcrev(args, srctree, rd, config_data):
rd, args.append, None, wildcardver=args.wildcard_version,
extralines=patchfields)
else:
- oe.recipeutils.patch_recipe(config_data, recipefile, patchfields)
+ oe.recipeutils.patch_recipe(rd, recipefile, patchfields)
if not 'git://' in orig_src_uri:
logger.info('You will need to update SRC_URI within the recipe to '
@@ -742,7 +742,7 @@ def _update_recipe_patch(args, config, srctree, rd, config_data):
updaterecipe = True
if updaterecipe:
logger.info('Updating recipe %s' % os.path.basename(recipefile))
- oe.recipeutils.patch_recipe(config_data, recipefile,
+ oe.recipeutils.patch_recipe(rd, recipefile,
{'SRC_URI': ' '.join(srcuri)})
elif not updatepatches:
# Neither patches nor recipe were updated