summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/__init__.py3
-rw-r--r--scripts/lib/devtool/standard.py2
-rw-r--r--scripts/lib/devtool/upgrade.py2
-rw-r--r--scripts/lib/recipetool/append.py3
-rw-r--r--scripts/lib/recipetool/setvar.py2
-rwxr-xr-xscripts/oe-check-sstate6
6 files changed, 8 insertions, 10 deletions
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):
146 not path.startswith(config.workspace_path)] 146 not path.startswith(config.workspace_path)]
147 else: 147 else:
148 append_files = None 148 append_files = None
149 return oe.recipeutils.parse_recipe(recipefile, append_files, 149 return oe.recipeutils.parse_recipe(tinfoil.cooker, recipefile, append_files)
150 tinfoil.config_data)
151 150
152def check_workspace_recipe(workspace, pn, checksrc=True, bbclassextend=False): 151def check_workspace_recipe(workspace, pn, checksrc=True, bbclassextend=False):
153 """ 152 """
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):
221 initial_rev = stdout.rstrip() 221 initial_rev = stdout.rstrip()
222 222
223 tinfoil = setup_tinfoil(config_only=True, basepath=basepath) 223 tinfoil = setup_tinfoil(config_only=True, basepath=basepath)
224 rd = oe.recipeutils.parse_recipe(recipefile, None, tinfoil.config_data) 224 rd = oe.recipeutils.parse_recipe(tinfoil.cooker, recipefile, None)
225 if not rd: 225 if not rd:
226 return 1 226 return 1
227 227
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
318 newvalues['SRC_URI[md5sum]'] = md5 318 newvalues['SRC_URI[md5sum]'] = md5
319 newvalues['SRC_URI[sha256sum]'] = sha256 319 newvalues['SRC_URI[sha256sum]'] = sha256
320 320
321 rd = oe.recipeutils.parse_recipe(fullpath, None, tinfoil.config_data) 321 rd = oe.recipeutils.parse_recipe(tinfoil.cooker, fullpath, None)
322 oe.recipeutils.patch_recipe(rd, fullpath, newvalues) 322 oe.recipeutils.patch_recipe(rd, fullpath, newvalues)
323 323
324 return fullpath, copied 324 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):
115 # Error already logged 115 # Error already logged
116 return None 116 return None
117 append_files = tinfoil.cooker.collection.get_file_appends(recipefile) 117 append_files = tinfoil.cooker.collection.get_file_appends(recipefile)
118 rd = oe.recipeutils.parse_recipe(recipefile, append_files, 118 rd = oe.recipeutils.parse_recipe(tinfoil.cooker, recipefile, append_files)
119 tinfoil.config_data)
120 return rd 119 return rd
121 120
122def determine_file_source(targetpath, rd): 121def 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):
51 if args.recipe_only: 51 if args.recipe_only:
52 patches = [oe.recipeutils.patch_recipe_file(args.recipefile, varvalues, patch=args.patch)] 52 patches = [oe.recipeutils.patch_recipe_file(args.recipefile, varvalues, patch=args.patch)]
53 else: 53 else:
54 rd = oe.recipeutils.parse_recipe(args.recipefile, None, tinfoil.config_data) 54 rd = oe.recipeutils.parse_recipe(tinfoil.cooker, args.recipefile, None)
55 if not rd: 55 if not rd:
56 return 1 56 return 1
57 patches = oe.recipeutils.patch_recipe(rd, args.recipefile, varvalues, patch=args.patch) 57 patches = oe.recipeutils.patch_recipe(rd, args.recipefile, varvalues, patch=args.patch)
diff --git a/scripts/oe-check-sstate b/scripts/oe-check-sstate
index 8aab86adb3..d06efe436a 100755
--- a/scripts/oe-check-sstate
+++ b/scripts/oe-check-sstate
@@ -40,13 +40,13 @@ def translate_virtualfns(tasks):
40 try: 40 try:
41 tinfoil.prepare(False) 41 tinfoil.prepare(False)
42 42
43 pkg_fn = tinfoil.cooker.recipecache.pkg_fn 43 recipecaches = tinfoil.cooker.recipecaches
44 outtasks = [] 44 outtasks = []
45 for task in tasks: 45 for task in tasks:
46 fn, taskname = task.rsplit(':', 1) 46 (mc, fn, taskname) = bb.runqueue.split_tid(task)
47 if taskname.endswith('_setscene'): 47 if taskname.endswith('_setscene'):
48 taskname = taskname[:-9] 48 taskname = taskname[:-9]
49 outtasks.append('%s:%s' % (pkg_fn[fn], taskname)) 49 outtasks.append('%s:%s' % (recipecaches[mc].pkg_fn[fn], taskname))
50 finally: 50 finally:
51 tinfoil.shutdown() 51 tinfoil.shutdown()
52 return outtasks 52 return outtasks