From 0f23a3af8e96206fe486e018fef0ca0129f727e7 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 16 Aug 2015 12:46:42 +0100 Subject: 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). (From OE-Core rev: 6ba969f1ac5a1a0e277a21287fc5ae1622a6b14e) Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- scripts/lib/devtool/standard.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/lib') 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 -- cgit v1.2.3-54-g00ecf