Re: [ptxdist] [PATCH 2/2] timezone: Support for zonetab1970

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Mon, Nov 01, 2021 at 12:38:48PM +0100, Gavin Schenk wrote:
> zonetab1970 contains a table where each row stands for a timezone where
> civil timestamps have agreed since 1970.
> 
> zonetab1970 is used by systemd in the timedatectl list-timezones
> command that was broken without this data.
> 
> zonetab1970 is intended to be delivered with the complete data set from
> tzdata package. Since PTXDIST offers the option to deliver timezones
> only partially, the solution is to correct the file during installation.
> Deselected timezone entries are removed from the file during INSTALL
> step.
> 
> So save some more space, the comments in this file are also stripped.
> 
> Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
> ---
>  rules/host-tz-database.make | 2 +-
>  rules/timezone.in           | 9 +++++++++
>  rules/timezone.make         | 6 ++++++
>  3 files changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make
> index fe4d36467..006060496 100644
> --- a/rules/host-tz-database.make
> +++ b/rules/host-tz-database.make
> @@ -67,6 +67,6 @@ HOST_TZ_DATABASE_CONF_TOOL	:= NO
>  HOST_TZ_DATABASE_MAKE_OPT	:= \
>  	zic TZDIR=/usr/share/zoneinfo CFLAGS=-DSTD_INSPIRED
>  HOST_TZ_DATABASE_INSTALL_OPT	:= \
> -	posix_only TZDIR=/usr/share/zoneinfo
> +	REDO=posix_only TZDIR=/usr/share/zoneinfo install
>  
>  # vim: syntax=make
> diff --git a/rules/timezone.in b/rules/timezone.in
> index ae26de02b..d351ac472 100644
> --- a/rules/timezone.in
> +++ b/rules/timezone.in
> @@ -252,4 +252,13 @@ config TIMEZONE_ZULU
>  	bool
>  	prompt "Zulu"
>  
> +config TIMEZONE_ZONETAB_1970
> +	bool
> +	prompt "zone1970.tab"
> +	help
> +	   install zone1970.tab
> +
> +	   This file is used by systemd's timedatectl to determine the available time
> +	   zones.

I think we can always install the file. It's not that big.

> +
>  endif
> diff --git a/rules/timezone.make b/rules/timezone.make
h> index c1fd3fbc3..2b3c1fb36 100644
> --- a/rules/timezone.make
> +++ b/rules/timezone.make
> @@ -87,6 +87,8 @@ $(STATEDIR)/timezone.install:
>  	@for target in $(TIMEZONE-y); do \
>  		$(call add_zoneinfo, $$target, $(TIMEZONE_PKGDIR)/usr/share, $(PTXDIST_SYSROOT_HOST)/usr); \
>  	done
> +# Fix entries in zonetab to match the selected PTXCONF_TIMEZONE_* options.
> +	@awk "\$$0 ~ /^#/ { next } {if (system(\"test -f '$(TIMEZONE_PKGDIR)/usr/share/zoneinfo/\" \$$3 \"'\") == 0) { print } }" $(PTXDIST_SYSROOT_HOST)/usr/share/zoneinfo/zone1970.tab > $(TIMEZONE_PKGDIR)/usr/share/zoneinfo/zone1970.tab

	@grep "\($$(find TIMEZONE_PKGDIR)/usr/share/zoneinfo -type f -printf '%P\|')#\)" \
		$(PTXDIST_SYSROOT_HOST)/usr/share/zoneinfo/zone1970.tab > \
		$(TIMEZONE_PKGDIR)/usr/share/zoneinfo/zone1970.tab

Is a bit more compact and forks less processes.

Michael

>  	@$(call touch)
>  
>  # ----------------------------------------------------------------------------
> @@ -116,6 +118,10 @@ ifneq ($(call remove_quotes,$(PTXCONF_TIMEZONE_LOCALTIME)),)
>  		/etc/localtime)
>  endif
>  
> +ifdef PTXCONF_TIMEZONE_ZONETAB_1970
> +	$(call install_copy, timezone, 0, 0, 0644, -, /usr/share/zoneinfo/zone1970.tab)
> +endif
> +
>  	@$(call install_finish, timezone)
>  
>  	@$(call touch)
> -- 
> 2.30.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de