summaryrefslogtreecommitdiffstats
path: root/scripts
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:05 +0100
commit7d2b918019b0afe215a6489dad697afac34f73e9 (patch)
treead7920eef377493cc58ce2369ef4a83ddd3b7109 /scripts
parent50e75d0cd7190a009776d72a4ae5c3e835895e6b (diff)
downloadopenembedded-core-7d2b918019b0afe215a6489dad697afac34f73e9.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] Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-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):
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')