[ptxdist] [PATCH 0/2] Using systemd/timedatectl to handle timedate

[ptxdist] [PATCH 0/2] Using systemd/timedatectl to handle timedate

[Gavin Schenk]

This series fixes the timedatectl command from systemd. I would like to
offer this interface as a whole to customers to handle NTP/RTC, timedate
and timezones. It is my plan to remove some legacy code in BSP and
replace it with this as a standard.

Gavin Schenk (2):
  host-tz-database: Version bump 2020d -> 2021e
  timezone: Support for zonetab1970

 rules/host-tz-database.make | 8 ++++----
 rules/timezone.in           | 9 +++++++++
 rules/timezone.make         | 6 ++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

-- 
2.30.2


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

[ptxdist] [PATCH 1/2] host-tz-database: Version bump 2020d -> 2021e

[Gavin Schenk]

Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
---
 rules/host-tz-database.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make
index c77deb9c5..fe4d36467 100644
--- a/rules/host-tz-database.make
+++ b/rules/host-tz-database.make
@@ -17,10 +17,10 @@ HOST_PACKAGES-$(PTXCONF_HOST_TZ_DATABASE) += host-tz-database
 #
 HOST_TZ_DATABASE	:= tz-database
 HOST_TZ_DATABASE_DIR	:= $(HOST_BUILDDIR)/$(HOST_TZ_DATABASE)
-HOST_TZ_DATABASE_VERSION:= 2020d
+HOST_TZ_DATABASE_VERSION:= 2021e
 
 TZCODE_VERSION		:= $(HOST_TZ_DATABASE_VERSION)
-TZCODE_MD5		:= b4c46a69e5894aac713e8365a9be9411
+TZCODE_MD5		:= 5128fe397d65de8392c4bb0c806c10ed
 TZCODE			:= tzcode$(TZCODE_VERSION)
 TZCODE_SUFFIX		:= tar.gz
 TZCODE_URL		:= \
@@ -31,7 +31,7 @@ TZCODE_DIR		:= $(HOST_TZ_DATABASE_DIR)
 TZCODE_STRIP_LEVEL	:= 0
 
 TZDATA_VERSION		:= $(HOST_TZ_DATABASE_VERSION)
-TZDATA_MD5		:= 2f58d72e31cf073f5076c2cbf182cba3
+TZDATA_MD5		:= 4fdfad906ebc85fef30221c10964cce9
 TZDATA			:= tzdata$(TZDATA_VERSION)
 TZDATA_SUFFIX		:= tar.gz
 TZDATA_URL		:= \
-- 
2.30.2


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

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

[Gavin Schenk]

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.
+
 endif
diff --git a/rules/timezone.make b/rules/timezone.make
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
 	@$(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

Re: [ptxdist] [PATCH 1/2] host-tz-database: Version bump 2020d -> 2021e

[Alexander Dahl]

Hello Gavin,

Am Montag, 1. November 2021, 12:38:47 CET schrieb Gavin Schenk:
> Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
> ---
>  rules/host-tz-database.make | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make
> index c77deb9c5..fe4d36467 100644
> --- a/rules/host-tz-database.make
> +++ b/rules/host-tz-database.make
> @@ -17,10 +17,10 @@ HOST_PACKAGES-$(PTXCONF_HOST_TZ_DATABASE) +=
> host-tz-database #
>  HOST_TZ_DATABASE	:= tz-database
>  HOST_TZ_DATABASE_DIR	:= $(HOST_BUILDDIR)/$(HOST_TZ_DATABASE)
> -HOST_TZ_DATABASE_VERSION:= 2020d
> +HOST_TZ_DATABASE_VERSION:= 2021e
> 
>  TZCODE_VERSION		:= $(HOST_TZ_DATABASE_VERSION)
> -TZCODE_MD5		:= b4c46a69e5894aac713e8365a9be9411
> +TZCODE_MD5		:= 5128fe397d65de8392c4bb0c806c10ed
>  TZCODE			:= tzcode$(TZCODE_VERSION)
>  TZCODE_SUFFIX		:= tar.gz
>  TZCODE_URL		:= \
> @@ -31,7 +31,7 @@ TZCODE_DIR		:= $(HOST_TZ_DATABASE_DIR)
>  TZCODE_STRIP_LEVEL	:= 0
> 
>  TZDATA_VERSION		:= $(HOST_TZ_DATABASE_VERSION)
> -TZDATA_MD5		:= 2f58d72e31cf073f5076c2cbf182cba3
> +TZDATA_MD5		:= 4fdfad906ebc85fef30221c10964cce9
>  TZDATA			:= tzdata$(TZDATA_VERSION)
>  TZDATA_SUFFIX		:= tar.gz
>  TZDATA_URL		:= \

Reviewed-by: Alexander Dahl <ada@thorsis.com>

Announcements were those:

Link: https://mm.icann.org/pipermail/tz-announce/2020-December/000063.html
Link: https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html
Link: https://mm.icann.org/pipermail/tz-announce/2021-January/000065.html
Link: https://mm.icann.org/pipermail/tz-announce/2021-September/000066.html
Link: https://mm.icann.org/pipermail/tz-announce/2021-October/000067.html
Link: https://mm.icann.org/pipermail/tz-announce/2021-October/000068.html
Link: https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html

Greets
Alex




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

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

[Denis Osterland-Heim]

Hi,

Am Montag, den 01.11.2021, 12:38 +0100 schrieb Gavin Schenk:
> 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"
I think `default y if SYSTEMD_TIMEDATE` would be useful here.

Regards Denis

> +help
> +   install zone1970.tab
> +
> +   This file is used by systemd's timedatectl to determine the available time
> +   zones.
> +
>  endif
> diff --git a/rules/timezone.make b/rules/timezone.make
> 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
>  @$(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)
Diehl Connectivity Solutions GmbH
Geschäftsführung: Horst Leonberger
Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht
Nürnberg: HRB 32315

________________________________

Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht.
Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.

- Informationen zum Datenschutz, insbesondere zu Ihren Rechten, erhalten Sie unter:

https://www.diehl.com/group/de/transparenz-und-informationspflichten/

The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by
mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.

- For general information on data protection and your respective rights please visit:

https://www.diehl.com/group/en/transparency-and-information-obligations/


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

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

[Gavin Schenk]

Hi

> > @@ -252,4 +252,13 @@ config TIMEZONE_ZULU
> >  bool
> >  prompt "Zulu"
> >
> > +config TIMEZONE_ZONETAB_1970
> > +bool
> > +prompt "zone1970.tab"
> I think `default y if SYSTEMD_TIMEDATE` would be useful here.

I think "default y if SYSTEMD_TIMEDATE" is a good idea, but does not make a real
difference.

Without any of the other TIMEZONE_* options the result would be an empty zone1970.tab.
I just checked the behaviour on my target.

With an empty zone1970.tab:
root 09:13 : /usr/share/zoneinfo # timedatectl list-timezones
UTC

Without the file the behaviour is the same:
root 09:13 : /usr/share/zoneinfo # timedatectl list-timezones
UTC

The folder /usr/share/zoneinfo of course contains more timezones on this target.

So the dependency is more like "if SYSTEMD_TIMEDATE and at least one TIMEZONE_*
option is set select TIMEZONE_ZONETAB_1970" Can you express that in Kconfig?

Regards
Gavin

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

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

[Gavin Schenk]

Hi,

this is still in my queue so I send a gentle ping.

> > > @@ -252,4 +252,13 @@ config TIMEZONE_ZULU
> > >  bool
> > >  prompt "Zulu"
> > >
> > > +config TIMEZONE_ZONETAB_1970
> > > +bool
> > > +prompt "zone1970.tab"
> > I think `default y if SYSTEMD_TIMEDATE` would be useful here.
> 
> I think "default y if SYSTEMD_TIMEDATE" is a good idea, but does not make a real
> difference.
> 
> Without any of the other TIMEZONE_* options the result would be an empty zone1970.tab.
> I just checked the behaviour on my target.
> 
> With an empty zone1970.tab:
> root 09:13 : /usr/share/zoneinfo # timedatectl list-timezones
> UTC
> 
> Without the file the behaviour is the same:
> root 09:13 : /usr/share/zoneinfo # timedatectl list-timezones
> UTC
> 
> The folder /usr/share/zoneinfo of course contains more timezones on this target.
> 
> So the dependency is more like "if SYSTEMD_TIMEDATE and at least one TIMEZONE_*
> option is set select TIMEZONE_ZONETAB_1970" Can you express that in Kconfig?

RFC
Is a dependency not required here?
If not, can you please apply this series?
If dep is required, is `default y if SYSTEMD_TIMEDATE` the way to go?
If not can you help me to do it right I cannot express it the way I want.


Regards
Gavin

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

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

[Michael Olbrich]

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

[ptxdist] [PATCH v2] timezone: Support for zonetab1970

[Gavin Schenk]

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>
---
Changes since v1:
 - Drop menuentry TIMEZONE_ZONETAB_1970 and install file always
 - Use suggested algorithm that is more compact and forks less processes
   ( Commented lines are not removed any more )

One idea for removing the commented lines is:
@grep "\($$(find TIMEZONE_PKGDIR)/usr/share/zoneinfo -type f -printf '%P\|')34987qiruhqwerkjb43kn5b3j4klrhqwekljrh\)"

Maybe not important, if looking on the file size. With Zone Europe enabled
zone1970.tab contains 3557 bytes. With all zones enabled it increases to
17593 bytes. 

I tested this with all timezones enabled and the long expression
does not exceed limits of shell.

---
 rules/host-tz-database.make | 2 +-
 rules/timezone.make         | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

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.make b/rules/timezone.make
index c1fd3fbc3..68ec669c0 100644
--- a/rules/timezone.make
+++ b/rules/timezone.make
@@ -87,7 +87,10 @@ $(STATEDIR)/timezone.install:
 	@for target in $(TIMEZONE-y); do \
 		$(call add_zoneinfo, $$target, $(TIMEZONE_PKGDIR)/usr/share, $(PTXDIST_SYSROOT_HOST)/usr); \
 	done
-	@$(call touch)
+# 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
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -116,6 +119,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)
-- 
2.30.2


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

Re: [ptxdist] [PATCH v2] timezone: Support for zonetab1970

[Michael Olbrich]

On Fri, Dec 03, 2021 at 04:23:37PM +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.
> 
> Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
> ---
> Changes since v1:
>  - Drop menuentry TIMEZONE_ZONETAB_1970 and install file always
>  - Use suggested algorithm that is more compact and forks less processes
>    ( Commented lines are not removed any more )
> 
> One idea for removing the commented lines is:
> @grep "\($$(find TIMEZONE_PKGDIR)/usr/share/zoneinfo -type f -printf '%P\|')34987qiruhqwerkjb43kn5b3j4klrhqwekljrh\)"
> 
> Maybe not important, if looking on the file size. With Zone Europe enabled
> zone1970.tab contains 3557 bytes. With all zones enabled it increases to
> 17593 bytes. 
> 
> I tested this with all timezones enabled and the long expression
> does not exceed limits of shell.
> 
> ---
>  rules/host-tz-database.make | 2 +-
>  rules/timezone.make         | 7 ++++++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> 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.make b/rules/timezone.make
> index c1fd3fbc3..68ec669c0 100644
> --- a/rules/timezone.make
> +++ b/rules/timezone.make
> @@ -87,7 +87,10 @@ $(STATEDIR)/timezone.install:
>  	@for target in $(TIMEZONE-y); do \
>  		$(call add_zoneinfo, $$target, $(TIMEZONE_PKGDIR)/usr/share, $(PTXDIST_SYSROOT_HOST)/usr); \
>  	done
> -	@$(call touch)

This should not be removed.

Michael

> +# 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
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> @@ -116,6 +119,8 @@ ifneq ($(call remove_quotes,$(PTXCONF_TIMEZONE_LOCALTIME)),)
>  		/etc/localtime)
>  endif
>  
> +	$(call install_copy, timezone, 0, 0, 0644, -, /usr/share/zoneinfo/zone1970.tab)

Don't for get the '@' at the beginning of the line.

Michael

> +
>  	@$(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

[ptxdist] [PATCH v3] timezone: Support for zonetab1970

[Gavin Schenk]

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>
---
Changes since v2:
 - Fixed removed $(call touch) 
 - Fixed missing @ when installing zone1970.tab

Changes since v1:
 - Drop menuentry TIMEZONE_ZONETAB_1970 and install file always
 - Use suggested algorithm that is more compact and forks less processes
   ( Commented lines are not removed any more )

---
rules/host-tz-database.make | 2 +-
 rules/timezone.make         | 7 +++++++
 2 files changed, 8 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.make b/rules/timezone.make
index c1fd3fbc3..794e0d61e 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)
-- 
2.30.2


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

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

[Michael Olbrich]

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

Re: [ptxdist] [PATCH 1/2] host-tz-database: Version bump 2020d -> 2021e

[Alexander Dahl]

Hello,

Am Mon, Nov 01, 2021 at 01:46:58PM +0100 schrieb Alexander Dahl:
> Hello Gavin,
> 
> Am Montag, 1. November 2021, 12:38:47 CET schrieb Gavin Schenk:
> > Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
> > ---
> >  rules/host-tz-database.make | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make
> > index c77deb9c5..fe4d36467 100644
> > --- a/rules/host-tz-database.make
> > +++ b/rules/host-tz-database.make
> > @@ -17,10 +17,10 @@ HOST_PACKAGES-$(PTXCONF_HOST_TZ_DATABASE) +=
> > host-tz-database #
> >  HOST_TZ_DATABASE	:= tz-database
> >  HOST_TZ_DATABASE_DIR	:= $(HOST_BUILDDIR)/$(HOST_TZ_DATABASE)
> > -HOST_TZ_DATABASE_VERSION:= 2020d
> > +HOST_TZ_DATABASE_VERSION:= 2021e
> > 
> >  TZCODE_VERSION		:= $(HOST_TZ_DATABASE_VERSION)
> > -TZCODE_MD5		:= b4c46a69e5894aac713e8365a9be9411
> > +TZCODE_MD5		:= 5128fe397d65de8392c4bb0c806c10ed
> >  TZCODE			:= tzcode$(TZCODE_VERSION)
> >  TZCODE_SUFFIX		:= tar.gz
> >  TZCODE_URL		:= \
> > @@ -31,7 +31,7 @@ TZCODE_DIR		:= $(HOST_TZ_DATABASE_DIR)
> >  TZCODE_STRIP_LEVEL	:= 0
> > 
> >  TZDATA_VERSION		:= $(HOST_TZ_DATABASE_VERSION)
> > -TZDATA_MD5		:= 2f58d72e31cf073f5076c2cbf182cba3
> > +TZDATA_MD5		:= 4fdfad906ebc85fef30221c10964cce9
> >  TZDATA			:= tzdata$(TZDATA_VERSION)
> >  TZDATA_SUFFIX		:= tar.gz
> >  TZDATA_URL		:= \
> 
> Reviewed-by: Alexander Dahl <ada@thorsis.com>
> 
> Announcements were those:
> 
> Link: https://mm.icann.org/pipermail/tz-announce/2020-December/000063.html
> Link: https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html
> Link: https://mm.icann.org/pipermail/tz-announce/2021-January/000065.html
> Link: https://mm.icann.org/pipermail/tz-announce/2021-September/000066.html
> Link: https://mm.icann.org/pipermail/tz-announce/2021-October/000067.html
> Link: https://mm.icann.org/pipermail/tz-announce/2021-October/000068.html
> Link: https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html

Gentle ping on either reword and resend or test and apply?

Greets
Alex


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

[ptxdist] [PATCH v2 1/2] host-tz-database: Version bump 2020d -> 2021e

[Gavin Schenk]

Announcement here:

Link: https://mm.icann.org/pipermail/tz-announce/2020-December/000063.html
Link: https://mm.icann.org/pipermail/tz-announce/2020-December/000064.html
Link: https://mm.icann.org/pipermail/tz-announce/2021-January/000065.html
Link: https://mm.icann.org/pipermail/tz-announce/2021-September/000066.html
Link: https://mm.icann.org/pipermail/tz-announce/2021-October/000067.html
Link: https://mm.icann.org/pipermail/tz-announce/2021-October/000068.html
Link: https://mm.icann.org/pipermail/tz-announce/2021-October/000069.html

Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
Reviewed-by: Alexander Dahl <ada@thorsis.com>

---
 rules/host-tz-database.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/host-tz-database.make b/rules/host-tz-database.make
index c77deb9c5..fe4d36467 100644
--- a/rules/host-tz-database.make
+++ b/rules/host-tz-database.make
@@ -17,10 +17,10 @@ HOST_PACKAGES-$(PTXCONF_HOST_TZ_DATABASE) += host-tz-database
 #
 HOST_TZ_DATABASE	:= tz-database
 HOST_TZ_DATABASE_DIR	:= $(HOST_BUILDDIR)/$(HOST_TZ_DATABASE)
-HOST_TZ_DATABASE_VERSION:= 2020d
+HOST_TZ_DATABASE_VERSION:= 2021e
 
 TZCODE_VERSION		:= $(HOST_TZ_DATABASE_VERSION)
-TZCODE_MD5		:= b4c46a69e5894aac713e8365a9be9411
+TZCODE_MD5		:= 5128fe397d65de8392c4bb0c806c10ed
 TZCODE			:= tzcode$(TZCODE_VERSION)
 TZCODE_SUFFIX		:= tar.gz
 TZCODE_URL		:= \
@@ -31,7 +31,7 @@ TZCODE_DIR		:= $(HOST_TZ_DATABASE_DIR)
 TZCODE_STRIP_LEVEL	:= 0
 
 TZDATA_VERSION		:= $(HOST_TZ_DATABASE_VERSION)
-TZDATA_MD5		:= 2f58d72e31cf073f5076c2cbf182cba3
+TZDATA_MD5		:= 4fdfad906ebc85fef30221c10964cce9
 TZDATA			:= tzdata$(TZDATA_VERSION)
 TZDATA_SUFFIX		:= tar.gz
 TZDATA_URL		:= \
-- 
2.30.2


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

Re: [ptxdist] [APPLIED] host-tz-database: Version bump 2020d -> 2021e

[Michael Olbrich]

Thanks, applied as 4c572d9490635126143f6566d50a19df61270715.

Michael

[sent from post-receive hook]

On Sat, 18 Dec 2021 08:42:06 +0100, Gavin Schenk <g.schenk@eckelmann.de> wrote:
> Signed-off-by: Gavin Schenk <g.schenk@eckelmann.de>
> Message-Id: <20211101113848.145063-2-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 648942f9e4fe..006060496d65 100644
> --- a/rules/host-tz-database.make
> +++ b/rules/host-tz-database.make
> @@ -17,10 +17,10 @@ HOST_PACKAGES-$(PTXCONF_HOST_TZ_DATABASE) += host-tz-database
>  #
>  HOST_TZ_DATABASE	:= tz-database
>  HOST_TZ_DATABASE_DIR	:= $(HOST_BUILDDIR)/$(HOST_TZ_DATABASE)
> -HOST_TZ_DATABASE_VERSION:= 2020d
> +HOST_TZ_DATABASE_VERSION:= 2021e
>  
>  TZCODE_VERSION		:= $(HOST_TZ_DATABASE_VERSION)
> -TZCODE_MD5		:= b4c46a69e5894aac713e8365a9be9411
> +TZCODE_MD5		:= 5128fe397d65de8392c4bb0c806c10ed
>  TZCODE			:= tzcode$(TZCODE_VERSION)
>  TZCODE_SUFFIX		:= tar.gz
>  TZCODE_URL		:= \
> @@ -31,7 +31,7 @@ TZCODE_DIR		:= $(HOST_TZ_DATABASE_DIR)
>  TZCODE_STRIP_LEVEL	:= 0
>  
>  TZDATA_VERSION		:= $(HOST_TZ_DATABASE_VERSION)
> -TZDATA_MD5		:= 2f58d72e31cf073f5076c2cbf182cba3
> +TZDATA_MD5		:= 4fdfad906ebc85fef30221c10964cce9
>  TZDATA			:= tzdata$(TZDATA_VERSION)
>  TZDATA_SUFFIX		:= tar.gz
>  TZDATA_URL		:= \

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