diff options
| -rw-r--r-- | meta/lib/oe/recipeutils.py | 3 | ||||
| -rw-r--r-- | scripts/lib/devtool/standard.py | 4 |
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): """Find the file in which each of a list of variables is set. Note: requires variable history to be enabled when parsing. """ - envdata = parse_recipe(fn, [], d) varfiles = {} for v in varlist: - history = envdata.varhistory.variable(v) + history = d.varhistory.variable(v) files = [] for event in history: 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): rd, args.append, None, wildcardver=args.wildcard_version, extralines=patchfields) else: - oe.recipeutils.patch_recipe(config_data, recipefile, patchfields) + oe.recipeutils.patch_recipe(rd, recipefile, patchfields) if not 'git://' in orig_src_uri: 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): updaterecipe = True if updaterecipe: logger.info('Updating recipe %s' % os.path.basename(recipefile)) - oe.recipeutils.patch_recipe(config_data, recipefile, + oe.recipeutils.patch_recipe(rd, recipefile, {'SRC_URI': ' '.join(srcuri)}) elif not updatepatches: # Neither patches nor recipe were updated |