Re: [ptxdist] [APPLIED] timezone: Support for zonetab1970

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

Thanks, applied as dfcef6b5c820d0e5d3bc5cecfe6bc0af2cdac83d.

Michael

[sent from post-receive hook]

On Fri, 17 Dec 2021 14:27:05 +0100, Gavin Schenk <g.schenk@eckelmann.de> 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.
> 
> Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
> Message-Id: <20211215135007.863164-1-g.schenk@eckelmann.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make
> index c77deb9c5781..648942f9e4fe 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.make b/rules/timezone.make
> index c1fd3fbc3608..794e0d61e9b2 100644
> --- a/rules/timezone.make
> +++ b/rules/timezone.make
> @@ -87,6 +87,11 @@ $(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.
> +	@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
> +
>  	@$(call touch)
>  
>  # ----------------------------------------------------------------------------
> @@ -116,6 +121,8 @@ ifneq ($(call remove_quotes,$(PTXCONF_TIMEZONE_LOCALTIME)),)
>  		/etc/localtime)
>  endif
>  
> +	@$(call install_copy, timezone, 0, 0, 0644, -, /usr/share/zoneinfo/zone1970.tab)
> +
>  	@$(call install_finish, timezone)
>  
>  	@$(call touch)

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