From af86c079dd9942748cfe920871db6d3f5130e05a Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 16 Apr 2015 19:37:57 +0300 Subject: devtool: call parse_recipe with correct arguments Give the correct data object ("config data" instead of "recipe data") as an argument to oe.recipeutils.patch_recipe() Fixes [YOCTO #7595] (From OE-Core master rev: 7d2b918019b0afe215a6489dad697afac34f73e9) (From OE-Core rev: f8427fe565e44e46246146bdaae66a5d83ae8c9d) Signed-off-by: Markus Lehtonen Signed-off-by: Richard Purdie --- scripts/lib/devtool/standard.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 54920b26f8..d5ded2f680 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -482,7 +482,7 @@ def update_recipe(args, config, basepath, workspace): if remove_patches(srcuri, removepatches): patchfields['SRC_URI'] = ' '.join(srcuri) - oe.recipeutils.patch_recipe(rd, recipefile, patchfields) + oe.recipeutils.patch_recipe(tinfoil.config_data, recipefile, patchfields) if not 'git://' in orig_src_uri: logger.info('You will need to update SRC_URI within the recipe to point to a git repository where you have pushed your changes') @@ -564,7 +564,8 @@ def update_recipe(args, config, basepath, workspace): updaterecipe = True if updaterecipe: logger.info('Updating recipe %s' % os.path.basename(recipefile)) - oe.recipeutils.patch_recipe(rd, recipefile, {'SRC_URI': ' '.join(srcuri)}) + oe.recipeutils.patch_recipe(tinfoil.config_data, + recipefile, {'SRC_URI': ' '.join(srcuri)}) elif not updatepatches: # Neither patches nor recipe were updated logger.info('No patches need updating') -- cgit v1.2.3-54-g00ecf