summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-04-16 19:37:57 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-19 13:34:43 +0100
commitd7a9b5ea5553dff3330523f85d358dd6b8503c1c (patch)
treebdcc72546607e451452488ba6f5356f5b300d7b3
parent494bf2d943de5665d529fb98c0db5be635b58b45 (diff)
downloadpoky-d7a9b5ea5553dff3330523f85d358dd6b8503c1c.tar.gz
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 rev: 7d2b918019b0afe215a6489dad697afac34f73e9) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/standard.py5
1 files changed, 3 insertions, 2 deletions
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):
482 if remove_patches(srcuri, removepatches): 482 if remove_patches(srcuri, removepatches):
483 patchfields['SRC_URI'] = ' '.join(srcuri) 483 patchfields['SRC_URI'] = ' '.join(srcuri)
484 484
485 oe.recipeutils.patch_recipe(rd, recipefile, patchfields) 485 oe.recipeutils.patch_recipe(tinfoil.config_data, recipefile, patchfields)
486 486
487 if not 'git://' in orig_src_uri: 487 if not 'git://' in orig_src_uri:
488 logger.info('You will need to update SRC_URI within the recipe to point to a git repository where you have pushed your changes') 488 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):
564 updaterecipe = True 564 updaterecipe = True
565 if updaterecipe: 565 if updaterecipe:
566 logger.info('Updating recipe %s' % os.path.basename(recipefile)) 566 logger.info('Updating recipe %s' % os.path.basename(recipefile))
567 oe.recipeutils.patch_recipe(rd, recipefile, {'SRC_URI': ' '.join(srcuri)}) 567 oe.recipeutils.patch_recipe(tinfoil.config_data,
568 recipefile, {'SRC_URI': ' '.join(srcuri)})
568 elif not updatepatches: 569 elif not updatepatches:
569 # Neither patches nor recipe were updated 570 # Neither patches nor recipe were updated
570 logger.info('No patches need updating') 571 logger.info('No patches need updating')