From 25702f3a2f78d13bab6bcca7e9dd331200ebdb09 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 7 Jul 2015 16:28:11 +0100 Subject: bitbake: cooker: Improve DATE/TIME handling Currently, once set, DATE and TIME in the metadata remain unchanged. This is suboptimal for cases where cooker is reused. This ties setting the variables into the BuildStarted event which seems like a more appropriate time to do so. It also changes BUILDNAME to be based off DATE/TIME by default if not already set so that the data is more consistent. We therefore need to expand the value rather than the previous default of not doing so. This change does mean the date/time values are in sync across all variables too. It does mean bitbake now has special knowledge of DATE/TIME but that would seen unavoidable (other than doing this in event handlers which has its own set of downsides). [YOCTO #5187] (Bitbake rev: f883cf240266ee7be2cbd8971a8164cf4df9e372) Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/cooker.py') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index f31bca6f34..72ae8b09c7 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -1174,9 +1174,12 @@ class BBCooker: """ Setup any variables needed before starting a build """ + t = time.gmtime() if not self.data.getVar("BUILDNAME", False): - self.data.setVar("BUILDNAME", time.strftime('%Y%m%d%H%M')) - self.data.setVar("BUILDSTART", time.strftime('%m/%d/%Y %H:%M:%S', time.gmtime())) + self.data.setVar("BUILDNAME", "${DATE}${TIME}") + self.data.setVar("BUILDSTART", time.strftime('%m/%d/%Y %H:%M:%S', t)) + self.data.setVar("DATE", time.strftime('%Y%m%d', t)) + self.data.setVar("TIME", time.strftime('%H%M%S', t)) def matchFiles(self, bf): """ @@ -1275,7 +1278,7 @@ class BBCooker: taskdata = bb.taskdata.TaskData(self.configuration.abort) taskdata.add_provider(self.data, self.recipecache, item) - buildname = self.data.getVar("BUILDNAME", False) + buildname = self.data.getVar("BUILDNAME", True) bb.event.fire(bb.event.BuildStarted(buildname, [item]), self.expanded_data) # Execute the runqueue -- cgit v1.2.3-54-g00ecf