aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-17 00:21:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-19 16:35:37 +0000
commita8c377beadb85b0ff503ec8ddd1a2cd05e363c19 (patch)
treec4606efdf4339e1744fc116fb47a14d44535891a
parentecbc1db7ed1f9848dee69507de8eb289b8ddeba0 (diff)
downloadopenembedded-core-contrib-a8c377beadb85b0ff503ec8ddd1a2cd05e363c19.tar.gz
image: Ensure we don't expand TMPDIR in image commands
Similarly to DATETIME, don't expand TMPDIR in image commands. This ensures some of the stamp comparisons we make in the QA tests work correctly. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index a2e966e7ad..e85869da7b 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -369,7 +369,9 @@ python () {
# Delete DATETIME so we don't expand any references to it now
# This means the task's hash can be stable rather than having hardcoded
# date/time values. It will get expanded at execution time.
+ # Similarly TMPDIR since otherwise we see QA stamp comparision problems
localdata.delVar('DATETIME')
+ localdata.delVar('TMPDIR')
image_cmd = localdata.getVar("IMAGE_CMD", True)
vardeps.add('IMAGE_CMD_' + realt)