[OE-core] [PATCH] devtool: call parse_recipe with correct arguments

[Paul Eggleton]

On Thursday 16 April 2015 19:37:57 Markus Lehtonen wrote:
> 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>
> ---
>  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')

Ah yes, that would explain it!

Acked-by: Paul Eggleton <paul.eggleton at linux.intel.com>

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre