summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/lib/oe/recipeutils.py3
-rw-r--r--scripts/lib/devtool/standard.py4
2 files changed, 3 insertions, 4 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index cd742130de..d4fa72651c 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -79,10 +79,9 @@ def get_var_files(fn, varlist, d):
79 """Find the file in which each of a list of variables is set. 79 """Find the file in which each of a list of variables is set.
80 Note: requires variable history to be enabled when parsing. 80 Note: requires variable history to be enabled when parsing.
81 """ 81 """
82 envdata = parse_recipe(fn, [], d)
83 varfiles = {} 82 varfiles = {}
84 for v in varlist: 83 for v in varlist:
85 history = envdata.varhistory.variable(v) 84 history = d.varhistory.variable(v)
86 files = [] 85 files = []
87 for event in history: 86 for event in history:
88 if 'file' in event and not 'flag' in event: 87 if 'file' in event and not 'flag' in event:
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index e85e1ad860..e1c5584a83 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -630,7 +630,7 @@ def _update_recipe_srcrev(args, srctree, rd, config_data):
630 rd, args.append, None, wildcardver=args.wildcard_version, 630 rd, args.append, None, wildcardver=args.wildcard_version,
631 extralines=patchfields) 631 extralines=patchfields)
632 else: 632 else:
633 oe.recipeutils.patch_recipe(config_data, recipefile, patchfields) 633 oe.recipeutils.patch_recipe(rd, recipefile, patchfields)
634 634
635 if not 'git://' in orig_src_uri: 635 if not 'git://' in orig_src_uri:
636 logger.info('You will need to update SRC_URI within the recipe to ' 636 logger.info('You will need to update SRC_URI within the recipe to '
@@ -742,7 +742,7 @@ def _update_recipe_patch(args, config, srctree, rd, config_data):
742 updaterecipe = True 742 updaterecipe = True
743 if updaterecipe: 743 if updaterecipe:
744 logger.info('Updating recipe %s' % os.path.basename(recipefile)) 744 logger.info('Updating recipe %s' % os.path.basename(recipefile))
745 oe.recipeutils.patch_recipe(config_data, recipefile, 745 oe.recipeutils.patch_recipe(rd, recipefile,
746 {'SRC_URI': ' '.join(srcuri)}) 746 {'SRC_URI': ' '.join(srcuri)})
747 elif not updatepatches: 747 elif not updatepatches:
748 # Neither patches nor recipe were updated 748 # Neither patches nor recipe were updated