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"):
 
 ret = 0
 if sys.argv[3] != "True":
-    ret = bb.build.exec_task(taskname, the_data)
+    ret = bb.build.exec_task(fn, taskname, the_data)
 sys.exit(ret)
 
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):
     raise FuncFailed("function %s failed" % func, logfile)
 
 
-def exec_task(task, d):
+def exec_task(fn, task, d):
     """Execute an BB 'task'
 
        The primary difference between executing a task versus executing
@@ -292,6 +292,7 @@ def exec_task(task, d):
         data.setVar('OVERRIDES', 'task-%s:%s' % (task[3:], old_overrides), localdata)
         data.update_data(localdata)
         data.expandKeys(localdata)
+        data.setVar('BB_FILENAME', fn, d)
         data.setVar('BB_CURRENTTASK', task[3:], d)
         event.fire(TaskStarted(task, localdata), localdata)
         prefuncs = (data.getVarFlag(task, 'prefuncs', localdata) or "").split()