summaryrefslogtreecommitdiffstats
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 17:24:47 +0000
commitd27491b6940156a52be4fd4aec32eff3fac4a0d3 (patch)
treee6d6cb75881ead2c199f7a2e5caa62eae870242a
parentce8a2068d41272cd3c3c8be5ec8a4bac77cbb649 (diff)
downloadopenembedded-core-contrib-d27491b6940156a52be4fd4aec32eff3fac4a0d3.tar.gz
openembedded-core-contrib-d27491b6940156a52be4fd4aec32eff3fac4a0d3.tar.bz2
openembedded-core-contrib-d27491b6940156a52be4fd4aec32eff3fac4a0d3.zip
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. (From OE-Core rev: a8c377beadb85b0ff503ec8ddd1a2cd05e363c19) 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)