[oe-commits] Markus Lehtonen : devtool: call parse_recipe with correct arguments

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 8b0fa819c2bac549b323ea8684911442415b02e3
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8b0fa819c2bac549b323ea8684911442415b02e3

Author: Markus Lehtonen <markus.lehtonen at linux.intel.com>
Date:   Thu Apr 16 19:37:57 2015 +0300

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]

Signed-off-by: Markus Lehtonen <markus.lehtonen at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/lib/devtool/standard.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 54920b2..d5ded2f 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')