diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2013-09-06 17:53:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-06 22:19:26 +0100 |
commit | 756cc69ebf8bfe8455d0c90f288dd51be2499773 (patch) | |
tree | 9df2925c00d550b59fca2109f652fbec28020260 | |
parent | 94483ee5ae9f4051bccd660c4718c36564e17161 (diff) | |
download | bitbake-756cc69ebf8bfe8455d0c90f288dd51be2499773.tar.gz |
bitbake: Ensure ${DATE} and ${TIME} are consistent
Due to the worker split the ${DATE} and ${TIME} variables could end up
with different values for different workers.
E.g., a task like do_rootfs that is run within a fakeroot environment
had a slightly different view of the time than another task that was not
fakerooted which made it impossible to correctly refer to the image
generated by do_rootfs from the other task.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | bin/bitbake-worker | 2 | ||||
-rw-r--r-- | lib/bb/runqueue.py | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/bin/bitbake-worker b/bin/bitbake-worker index 2f21e7c66..66b6aabfd 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -148,6 +148,8 @@ def fork_off_task(cfg, data, workerdata, fn, task, taskname, appends, quieterror data.setVar("BB_WORKERCONTEXT", "1") data.setVar("BUILDNAME", workerdata["buildname"]) + data.setVar("DATE", workerdata["date"]) + data.setVar("TIME", workerdata["time"]) bb.parse.siggen.set_taskdata(workerdata["hashes"], workerdata["hash_deps"], workerdata["sigchecksums"]) ret = 0 try: diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 8d36f282c..79e612e03 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -853,6 +853,8 @@ class RunQueue: "logdefaultdomain" : bb.msg.loggerDefaultDomains, "prhost" : self.cooker.prhost, "buildname" : self.cfgData.getVar("BUILDNAME", True), + "date" : self.cfgData.getVar("DATE", True), + "time" : self.cfgData.getVar("TIME", True), } worker.stdin.write("<cookerconfig>" + pickle.dumps(self.cooker.configuration) + "</cookerconfig>") |