From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 17 Dec 2021 14:27:52 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1myDH6-009USt-Sh for lore@lore.pengutronix.de; Fri, 17 Dec 2021 14:27:52 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1myDH6-0007Zj-98; Fri, 17 Dec 2021 14:27:52 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1myDGO-0007IE-0J; Fri, 17 Dec 2021 14:27:08 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1myDGN-0052JZ-Pr; Fri, 17 Dec 2021 14:27:07 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1myDGL-00E2a9-VX; Fri, 17 Dec 2021 14:27:06 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 17 Dec 2021 14:27:05 +0100 Message-Id: <20211217132705.3346473-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211215135007.863164-1-g.schenk@eckelmann.de> References: <20211215135007.863164-1-g.schenk@eckelmann.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] timezone: Support for zonetab1970 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Gavin Schenk Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as dfcef6b5c820d0e5d3bc5cecfe6bc0af2cdac83d. Michael [sent from post-receive hook] On Fri, 17 Dec 2021 14:27:05 +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 > Message-Id: <20211215135007.863164-1-g.schenk@eckelmann.de> > Signed-off-by: Michael Olbrich > > 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