summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbitbake/bin/bitbake-runtask2
-rw-r--r--bitbake/lib/bb/build.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/bin/bitbake-runtask b/bitbake/bin/bitbake-runtask
index cd033d1590..2f5ebea792 100755
--- a/bitbake/bin/bitbake-runtask
+++ b/bitbake/bin/bitbake-runtask
@@ -86,6 +86,6 @@ if taskname.endswith("_setscene"):
86 86
87ret = 0 87ret = 0
88if sys.argv[3] != "True": 88if sys.argv[3] != "True":
89 ret = bb.build.exec_task(taskname, the_data) 89 ret = bb.build.exec_task(fn, taskname, the_data)
90sys.exit(ret) 90sys.exit(ret)
91 91
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index ee138a914a..1d0ae463c1 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -268,7 +268,7 @@ def exec_func_shell(func, d, runfile, logfile, flags):
268 raise FuncFailed("function %s failed" % func, logfile) 268 raise FuncFailed("function %s failed" % func, logfile)
269 269
270 270
271def exec_task(task, d): 271def exec_task(fn, task, d):
272 """Execute an BB 'task' 272 """Execute an BB 'task'
273 273
274 The primary difference between executing a task versus executing 274 The primary difference between executing a task versus executing
@@ -292,6 +292,7 @@ def exec_task(task, d):
292 data.setVar('OVERRIDES', 'task-%s:%s' % (task[3:], old_overrides), localdata) 292 data.setVar('OVERRIDES', 'task-%s:%s' % (task[3:], old_overrides), localdata)
293 data.update_data(localdata) 293 data.update_data(localdata)
294 data.expandKeys(localdata) 294 data.expandKeys(localdata)
295 data.setVar('BB_FILENAME', fn, d)
295 data.setVar('BB_CURRENTTASK', task[3:], d) 296 data.setVar('BB_CURRENTTASK', task[3:], d)
296 event.fire(TaskStarted(task, localdata), localdata) 297 event.fire(TaskStarted(task, localdata), localdata)
297 prefuncs = (data.getVarFlag(task, 'prefuncs', localdata) or "").split() 298 prefuncs = (data.getVarFlag(task, 'prefuncs', localdata) or "").split()