]> code.ossystems Code Review - openembedded-core.git/commitdiff
devtool: call parse_recipe with correct arguments
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Thu, 16 Apr 2015 16:37:57 +0000 (19:37 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 19 Apr 2015 12:34:05 +0000 (13:34 +0100)
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@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/lib/devtool/standard.py

index 54920b26f89fd73c35b35211440c377214e35206..d5ded2f680ef5599bbd74ba09256c4bda2110fc8 100644 (file)
@@ -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')