From 373e2096054d0f6bbeb96e8c6596c495df486160 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Fri, 6 Sep 2013 17:53:20 +0200 Subject: [PATCH] bitbake: 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. (Bitbake rev: 756cc69ebf8bfe8455d0c90f288dd51be2499773) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- bitbake/bin/bitbake-worker | 2 ++ bitbake/lib/bb/runqueue.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker index 2f21e7c662..66b6aabfdb 100755 --- a/bitbake/bin/bitbake-worker +++ b/bitbake/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/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 8d36f282cc..79e612e032 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/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("" + pickle.dumps(self.cooker.configuration) + "")