[U-Boot,v3,1/2] Makefile: Use correct timezone for U_BOOT_TZ

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 v3:
- None

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(-)

On 08/13/2015 08:08 AM, Chris Packham 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>

This also re-enables normal building on *BSD style hosts.

Tested-by: Andreas Bießmann <andreas.devel@googlemail.com>

> ---
> 
> Changes in v3:
> - None
> 
> 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 ad51e60..3ff063a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1279,10 +1279,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
>

Le jeudi 13 août 2015 à 18:08 +1200, Chris Packham a écrit :
> 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.

Looks good to me!

> 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 v3:
> - None
> 
> 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 ad51e60..3ff063a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1279,10 +1279,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

On Thu, Aug 13, 2015 at 06:08:27PM +1200, Chris Packham 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>
> Tested-by: Andreas Bießmann <andreas.devel@googlemail.com>

Applied to u-boot/master, thanks!