From patchwork Fri Jul 31 10:04:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 502518 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id EF5E21402F4 for ; Fri, 31 Jul 2015 22:07:49 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=s2iGfle4; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7AE734BA07; Fri, 31 Jul 2015 14:07:48 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id W_RVP52aK9HU; Fri, 31 Jul 2015 14:07:48 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 48E994BA0B; Fri, 31 Jul 2015 14:07:47 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 05F414B8D3 for ; Fri, 31 Jul 2015 12:04:30 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tNlwtM-5z1Mr for ; Fri, 31 Jul 2015 12:04:29 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pd0-f172.google.com (mail-pd0-f172.google.com [209.85.192.172]) by theia.denx.de (Postfix) with ESMTPS id 88C594B8CB for ; Fri, 31 Jul 2015 12:04:25 +0200 (CEST) Received: by pdbbh15 with SMTP id bh15so40131082pdb.1 for ; Fri, 31 Jul 2015 03:04:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BSqZd6rwjCYEHzgphvQmQJIpYdefD6FM+8Yt87JQ65I=; b=s2iGfle4B5adFKmS9jwgr6ZMMFd3lSah0sCF6qx3+h7R/gGCrVVgHRNLSrX+YdegdA OjcAuS4ujlF8qHewMNCoqlj7R6z0OJflkiqfF7RECrHTZ3Ymz74Pukq8OlhGHhZlii6i Eh2MvBQkwah9OchqyDe6CK5Vq6IJJdU4gLRknwsoOlypLF4CQLdAL6O/NBb2xsleO6Yv eDJewyGCf2NuQRUGULMoVgyKXUZwfUQa7t5M/6aAzltlGwzXyrS8gsb8v6JOYhoQeQd3 HokHqU+7xeAxbPJbOcFQ5Q6L4lr5kJsgfkSVFZUwZkHqrApTnjsVKcZVaXbObwZ+BmQd RZkA== X-Received: by 10.70.129.162 with SMTP id nx2mr5152357pdb.167.1438337063479; Fri, 31 Jul 2015 03:04:23 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc (2-163-36-202-static.alliedtelesis.co.nz. [202.36.163.2]) by smtp.gmail.com with ESMTPSA id de2sm6777417pdb.15.2015.07.31.03.04.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 31 Jul 2015 03:04:21 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Fri, 31 Jul 2015 22:04:01 +1200 Message-Id: <1438337042-30762-1-git-send-email-judge.packham@gmail.com> X-Mailer: git-send-email 2.5.0.rc0 In-Reply-To: References: X-Mailman-Approved-At: Fri, 31 Jul 2015 14:07:45 +0200 Cc: Marek Vasut , Tom Rini , Stefan Roese , Vagrant Cascadian , Chris Packham , lunar@debian.org, Roger Meier , "Albert ARIBAUD \(3ADEV\)" , Michal Marek , Holger Levsen , reproducible-builds@lists.alioth.debian.org Subject: [U-Boot] [PATCH] Makefile: Use correct timezone for U_BOOT_TZ X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" When building with SOURCE_DATE_EPOCH the timezone is in UTC. When building normally the timezone is taken from the build machine's locale setting. Fixes: f3f431a71272 ("Reproducible U-Boot build support, using SOURCE_DATE_EPOCH") Signed-off-by: Chris Packham Tested-by: Bin Meng Tested-By: Paul Kocialkowski --- Hopefully this will suit everyone. I've done a quick sanity test with sandbox and the date shown in the version output looks to be what I expect with/without SOURCE_DATE_EPOCH. Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 394ed09..f75c730 100644 --- a/Makefile +++ b/Makefile @@ -1230,10 +1230,16 @@ define filechk_version.h endef define filechk_timestamp.h - (SOURCE_DATE="$${SOURCE_DATE_EPOCH:+@$$SOURCE_DATE_EPOCH}"; \ - LC_ALL=C date -u -d "$${SOURCE_DATE:-now}" +'#define U_BOOT_DATE "%b %d %C%y"'; \ - LC_ALL=C date -u -d "$${SOURCE_DATE:-now}" +'#define U_BOOT_TIME "%T"'; \ - LC_ALL=C date -u -d "$${SOURCE_DATE:-now}" +'#define U_BOOT_TZ "%z"' ) + (if test -n "$${SOURCE_DATE_EPOCH}"; then \ + SOURCE_DATE="@$${SOURCE_DATE_EPOCH}"; \ + LC_ALL=C date -u -d "$${SOURCE_DATE}" +'#define U_BOOT_DATE "%b %d %C%y"'; \ + LC_ALL=C date -u -d "$${SOURCE_DATE}" +'#define U_BOOT_TIME "%T"'; \ + LC_ALL=C date -u -d "$${SOURCE_DATE}" +'#define U_BOOT_TZ "%z"'; \ + else \ + LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"'; \ + LC_ALL=C date +'#define U_BOOT_TIME "%T"'; \ + LC_ALL=C date +'#define U_BOOT_TZ "%z"'; \ + fi) endef $(version_h): include/config/uboot.release FORCE