From 041212fa37bb83acac5ce4ceb9b7b77ad172c5c3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 16 Aug 2016 18:00:13 +0100 Subject: devtool/recipetool/meta: Adapt to bitbake API changes for multi-configuration builds Unfortunately to implenent multiconfig support in bitbake some APIs had to change. This updates code in OE to match the changes in bitbake. Its mostly periperhal changes around devtool/recipetool [Will need a bitbake version requirement bump which I'll make when merging] Signed-off-by: Richard Purdie --- scripts/lib/devtool/__init__.py | 3 +-- scripts/lib/devtool/standard.py | 2 +- scripts/lib/devtool/upgrade.py | 2 +- scripts/lib/recipetool/append.py | 3 +-- scripts/lib/recipetool/setvar.py | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) (limited to 'scripts/lib') diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index 65eb4527bc..216b7c345a 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py @@ -146,8 +146,7 @@ def parse_recipe(config, tinfoil, pn, appends, filter_workspace=True): not path.startswith(config.workspace_path)] else: append_files = None - return oe.recipeutils.parse_recipe(recipefile, append_files, - tinfoil.config_data) + return oe.recipeutils.parse_recipe(tinfoil.cooker, recipefile, append_files) def check_workspace_recipe(workspace, pn, checksrc=True, bbclassextend=False): """ diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 9c09533b54..3de2401325 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -221,7 +221,7 @@ def add(args, config, basepath, workspace): initial_rev = stdout.rstrip() tinfoil = setup_tinfoil(config_only=True, basepath=basepath) - rd = oe.recipeutils.parse_recipe(recipefile, None, tinfoil.config_data) + rd = oe.recipeutils.parse_recipe(tinfoil.cooker, recipefile, None) if not rd: return 1 diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 8ea72ef2b5..fc2f919383 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -318,7 +318,7 @@ def _create_new_recipe(newpv, md5, sha256, srcrev, srcbranch, workspace, tinfoil newvalues['SRC_URI[md5sum]'] = md5 newvalues['SRC_URI[sha256sum]'] = sha256 - rd = oe.recipeutils.parse_recipe(fullpath, None, tinfoil.config_data) + rd = oe.recipeutils.parse_recipe(tinfoil.cooker, fullpath, None) oe.recipeutils.patch_recipe(rd, fullpath, newvalues) return fullpath, copied diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py index 5d73d307e0..1e0fc1ee85 100644 --- a/scripts/lib/recipetool/append.py +++ b/scripts/lib/recipetool/append.py @@ -115,8 +115,7 @@ def _parse_recipe(pn, tinfoil): # Error already logged return None append_files = tinfoil.cooker.collection.get_file_appends(recipefile) - rd = oe.recipeutils.parse_recipe(recipefile, append_files, - tinfoil.config_data) + rd = oe.recipeutils.parse_recipe(tinfoil.cooker, recipefile, append_files) return rd def determine_file_source(targetpath, rd): diff --git a/scripts/lib/recipetool/setvar.py b/scripts/lib/recipetool/setvar.py index 657d2b6a7b..85701c06a9 100644 --- a/scripts/lib/recipetool/setvar.py +++ b/scripts/lib/recipetool/setvar.py @@ -51,7 +51,7 @@ def setvar(args): if args.recipe_only: patches = [oe.recipeutils.patch_recipe_file(args.recipefile, varvalues, patch=args.patch)] else: - rd = oe.recipeutils.parse_recipe(args.recipefile, None, tinfoil.config_data) + rd = oe.recipeutils.parse_recipe(tinfoil.cooker, args.recipefile, None) if not rd: return 1 patches = oe.recipeutils.patch_recipe(rd, args.recipefile, varvalues, patch=args.patch) -- cgit 1.2.3-korg