| Message ID | 1438422202-4198-1-git-send-email-judge.packham@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
Hi Tom, On Sat, Aug 1, 2015 at 9:43 PM, Chris Packham <judge.packham@gmail.com> wrote: > 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. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> > Tested-by: Bin Meng <bmeng.cn@gmail.com> > Tested-by: Paul Kocialkowski <contact@paulk.fr> > --- > > Changes in v2: > - Collect some tested-by tags > - Remove reference to f3f431a71272 in the commit message > - Drop Ccs that were erroneously added when submitting v1, remaining Ccs > are from the original mailing list thread > > 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 > -- > 2.5.0.rc0 > Ping? I think this may have been missed due to an excessive Cc list (which I've now culled).
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