From: Paul Kocialkowski Date: Wed, 07 Oct 2015 19:59:35 +0200 Subject: [U-Boot] [PATCH] Fix variation in timestamps caused by timezone differences. In-Reply-To: <1443802311-31054-1-git-send-email-vagrant@debian.org> References: <1443802311-31054-1-git-send-email-vagrant@debian.org> Message-ID: <1444240775.3220.2.camel@paulk.fr> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Le vendredi 02 octobre 2015 ? 09:11 -0700, Vagrant Cascadian a ?crit : > When building with SOURCE_DATE_EPOCH set, avoid use of mktime in > default_image.c, which converts the timestamp into localtime. This > causes variation based on timezone when building u-boot.img and > u-boot-sunxi-with-spl.bin targets. I have tested this with the Cubieboard2_defconfig when setting SOURCE_DATE_EPOCH and changing TZ. This corrects the problem in the way I suggested, so this is: Tested-by: Paul Kocialkowski Acked-by: Paul Kocialkowski Thanks! > Signed-off-by: Vagrant Cascadian > --- > > tools/default_image.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/tools/default_image.c b/tools/default_image.c > index 18940af..3ed7014 100644 > --- a/tools/default_image.c > +++ b/tools/default_image.c > @@ -89,7 +89,6 @@ static void image_set_header(void *ptr, struct stat > *sbuf, int ifd, > { > uint32_t checksum; > char *source_date_epoch; > - struct tm *time_universal; > time_t time; > > image_header_t * hdr = (image_header_t *)ptr; > @@ -103,13 +102,10 @@ static void image_set_header(void *ptr, struct > stat *sbuf, int ifd, > if (source_date_epoch != NULL) { > time = (time_t) strtol(source_date_epoch, NULL, 10); > > - time_universal = gmtime(&time); > - if (time_universal == NULL) { > + if (gmtime(&time) == NULL) { > fprintf(stderr, "%s: SOURCE_DATE_EPOCH is > not valid\n", > __func__); > time = 0; > - } else { > - time = mktime(time_universal); > } > } else { > time = sbuf->st_mtime; -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: This is a digitally signed message part URL: