bitbake/build.py: When looking up extra stamp info for setscene tasks, use the real...

(Fixed based on a bug reported by Dongxiao Xu <dongxiao.xu@intel.com>)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index e723c7ea85f1f2a974718d62fdb1b7430a2063a0..42d1726daa7a3db0f97c12a7d4f4f2b0e5b1112a 100644 (file)
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -384,13 +384,17 @@ def stamp_internal(taskname, d, file_name):
     In the bitbake core, d can be a CacheData and file_name will be set.
     When called in task context, d will be a data store, file_name will not be set
     """
+    taskflagname = taskname
+    if taskname.endswith("_setscene") and taskname != "do_setscene":
+        taskflagname = taskname.replace("_setscene", "")
+
     if file_name:
         stamp = d.stamp[file_name]
-        extrainfo = d.stamp_extrainfo[file_name].get(taskname) or ""
+        extrainfo = d.stamp_extrainfo[file_name].get(taskflagname) or ""
     else:
         stamp = d.getVar('STAMP', True)
         file_name = d.getVar('BB_FILENAME', True)
-        extrainfo = d.getVarFlag(taskname, 'stamp-extra-info', True) or ""
+        extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or ""
 
     if not stamp:
         return