summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-27 11:20:50 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-27 11:20:58 +0000
commitc34913ea5a4f20ce4bca3c68a65e9f64f1e3910c (patch)
tree1512c47ce59ad1269847ee5dcec019a21868fd8e
parente8e9f56057f3732d2550375a23573ab7231eac22 (diff)
downloadopenembedded-core-c34913ea5a4f20ce4bca3c68a65e9f64f1e3910c.tar.gz
openembedded-core-c34913ea5a4f20ce4bca3c68a65e9f64f1e3910c.tar.bz2
openembedded-core-c34913ea5a4f20ce4bca3c68a65e9f64f1e3910c.zip
bitbake/build.py: When looking up extra stamp info for setscene tasks, use the real taskname
(Fixed based on a bug reported by Dongxiao Xu <dongxiao.xu@intel.com>) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/build.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index e723c7ea85..42d1726daa 100644
--- 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