1 files changed, 3 insertions, 2 deletions

diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index 3fc01486ca..968e2ea562 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -373,7 +373,7 @@ def exec_task(fn, task, d):
             event.fire(failedevent, d)
         return 1
 
-def stamp_internal(task, d, file_name):
+def stamp_internal(taskname, d, file_name):
     """
     Internal stamp helper function
     Makes sure the stamp directory exists
@@ -386,11 +386,12 @@ def stamp_internal(task, d, file_name):
         stamp = d.stamp[file_name]
     else:
         stamp = d.getVar('STAMP', True)
+        file_name = d.getVar('BB_FILENAME', True)
 
     if not stamp:
         return
 
-    stamp = "%s.%s" % (stamp, task)
+    stamp = bb.parse.siggen.stampfile(stamp, file_name, taskname)
 
     bb.utils.mkdirhier(os.path.dirname(stamp))