From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 03 Dec 2021 16:24:28 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mtAQG-00017i-K8 for lore@lore.pengutronix.de; Fri, 03 Dec 2021 16:24:28 +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 1mtAQG-0005cs-9F; Fri, 03 Dec 2021 16:24:28 +0100 Received: from mx-relay76-hz1.antispameurope.com ([94.100.133.238]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mtAQ7-0005ch-4t for ptxdist@pengutronix.de; Fri, 03 Dec 2021 16:24:19 +0100 Received: from smtp.eckelmann.de ([217.19.183.80]) by mx-relay76-hz1.antispameurope.com; Fri, 03 Dec 2021 16:24:18 +0100 Received: from EX-SRV2.eckelmann.group (2a00:1f08:4007:e030:172:18:30:61) by EX-SRV2.eckelmann.group (2a00:1f08:4007:e030:172:18:30:61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Fri, 3 Dec 2021 16:24:13 +0100 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (2a00:1f08:4007:e035:172:18:35:1a) by smtp.eckelmann.de (2a00:1f08:4007:e035:172:18:35:5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17 via Frontend Transport; Fri, 3 Dec 2021 16:24:13 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QnmU27+mHO2vp2Qx9qrxi6mnQEJ1Jl6tPx24OUpzrWBTWoTnTSJVp+dfpPn3WYKjEKRGZb6Z61QWkfQtWBhAm99ktZrVfGTd2YNqf2OVu9n3n18hSSvPm4hmJS8mCSYPJWVibzPS+UVUr4UTE8LaJJVMKvnRflB+sni4j/cU3GI0E7I2u+BFZqrDOMHTvpNBOu0ITwa1i3T5jWzb9A0JgatMF3adgv+0/kOKB1Zko8kUWSebUDxBt+goxvJJ0fp2uLfoj/aiodGGUh9SrXFNi195d20h+7uGRHYZ/ZUprea+J/CafonTLzSTTb2fba3q7AVp4nO8nCMnJyr5C6aWYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2gokPOwCCxIrKWAhMlY8MY+yLcQgGVLw5xNwAG+QVfc=; b=GsGK0B708E7fDnRyAoBUzmCUU8eVONNuPsDzOv6kJeMyOx044G+6tstmLJKNA2GWpzN5/huBPcifg7Nl27OICX9GOYdGzNuUakbaSnYf6JQeay6yijm6Xz2zGump8vJOGZNE13996xvmbNVsgsH5YmV1Y+kjj+E//J3z6+0/livGyI40/QC02+xwXKqVlAkrLLyQvjiET4aYNx5HJ5h8tZyy1VUF7VSLa7dlMQmSAFZ+YnaOw5UcPrT1ZwT9PWxet5GaYl11irFL4mN3TgCjSAfDkau16wTECx2bxT1LM3HfAUUcUU/trFv0ursvsjZ75dTAtJprel0eM4PdyoKPbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=eckelmann.de; dmarc=pass action=none header.from=eckelmann.de; dkim=pass header.d=eckelmann.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eckelmannde.onmicrosoft.com; s=selector1-eckelmannde-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2gokPOwCCxIrKWAhMlY8MY+yLcQgGVLw5xNwAG+QVfc=; b=Vf9LRw42rVlvZ/bXSWT598GFXi9NGqm7dxldrvmfTYSEmq0OQAMy7Gg1SAZfky67JdN9j236+whDeH210YOaSPUdY3tbGjScSmdzadOMNmCgL+biY6DaQANghru3WhwLj2lU9I0xqBXpXSrR/zbdY5OpOk95m6yNd+2POQmAf6s= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=eckelmann.de; Received: from AM8P189MB1410.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:249::12) by AM0P189MB0594.EURP189.PROD.OUTLOOK.COM (2603:10a6:208:195::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.28; Fri, 3 Dec 2021 15:23:58 +0000 Received: from AM8P189MB1410.EURP189.PROD.OUTLOOK.COM ([fe80::d5ee:2941:9b2:5955]) by AM8P189MB1410.EURP189.PROD.OUTLOOK.COM ([fe80::d5ee:2941:9b2:5955%9]) with mapi id 15.20.4734.028; Fri, 3 Dec 2021 15:23:58 +0000 From: Gavin Schenk To: Date: Fri, 3 Dec 2021 16:23:37 +0100 Message-Id: <20211203152337.82758-1-g.schenk@eckelmann.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-ClientProxiedBy: AM5PR0602CA0005.eurprd06.prod.outlook.com (2603:10a6:203:a3::15) To AM8P189MB1410.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:249::12) MIME-Version: 1.0 Received: from NB061.eckelmann.group (217.19.183.66) by AM5PR0602CA0005.eurprd06.prod.outlook.com (2603:10a6:203:a3::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.14 via Frontend Transport; Fri, 3 Dec 2021 15:23:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a9775678-8606-420e-c53c-08d9b670ed3c X-MS-TrafficTypeDiagnostic: AM0P189MB0594: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: v8yIPDPqeVLQQK/Pb1qvfpsoa2f/3KxDTc9whqLDd6VKynayLd631588O9uX56BQUHc6qkul0AjJxhK21Daj9k//pkiMWhVWEdpsFz0ukBeyPoL5QX1Am3OEtAENcwL6KzFetz9qpXJHDmWKueRSPPfvo8pzmEcS3IKsISftEpLZ/V435uWnDaXGQGVD9VzbSr/RLz9x/+Rl28Pn8LmKEnKHQwG573Ya0PmKWPiww3eQ6fiL7McYgmYPn91MMtSuYP6vjIl4tf/tYjQvWoJQrU8/PuvpRr5vO/REkP7pveMG1a2CVrU2QWwUAiV5QaRKdT+jzpx4h5GkL7XUN571tsERL94dZw4nJ7AvP98VI+8X7KvvVws2GcZ29yeyrTs/07U8lsZZ5oJYCmH4fM1PYgX7mQ/npGPERhEwrgz4AaKGOvmYA2NgdthU3A2NqGyxr+VTalga4s8J9qZ0/pbXf9GSQauJJI86gUu9t4BnjPUPhb2o++iudCQzFKyCKsmwzdSu1TIwp3lK3KgYOG6nKzLsRWV7Xw9IukBHDcQ3PxId8eiSY+muLm4k7xiadpPLF2ft7+NBk6f1HCGGbXP5T5i6NewUx3CN8AKbB9KVINXIWlqw4GFCyxPcaEXnbxaOVDAxOKTMeGZnj1p57tSnvA3TFKleExOWaPCyKJ6XT++tT15MAbnEXIz2FWifwrFp18PRVGn4eb9Y389mahgVVQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8P189MB1410.EURP189.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(366004)(346002)(39840400004)(136003)(186003)(956004)(26005)(2906002)(52116002)(4326008)(6666004)(6506007)(6486002)(1076003)(107886003)(508600001)(6512007)(36756003)(2616005)(6916009)(86362001)(83380400001)(66556008)(316002)(38350700002)(66476007)(38100700002)(8936002)(5660300002)(8676002)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PiHVxiO9e44paB0pHj9wvN5KFJbduYIXMzhym6vreQOAqpAqiBazcf03fV3W?= =?us-ascii?Q?jtYMlyDozcosjiDaFwGVsquJ0hsHunekZyVjxVvmNAyDnW8ViaoC3npfiSM3?= =?us-ascii?Q?pD5ROsRyuaxGi+AkenHeK4psjMFApOUiL3Ged0Z9nrdZrQiCSxhkTYYaosJb?= =?us-ascii?Q?1Q7GoHi02t+rPh+t7Fr0G+wRSAL6dS8Lia1PIMNd4zijMiLT9vIa+mTvC9z2?= =?us-ascii?Q?YL/BVJNFu8yg4m3mKOJi3qt7d39AlEGnycnbw4xpkMCyYZyEXsOToqvJumNv?= =?us-ascii?Q?q/qiNtDI+vrsHaUWj+XTaBU6nnvU4wZpzCFYlddOhI7EL3vNNikrws9n6+Xc?= =?us-ascii?Q?YMeZG6rjY6jpBwe6gsRgrUvCXkYlVs1sToUmXABgnjJCTHeiGrSXFg7AtcQ0?= =?us-ascii?Q?KN6yCFECKKSne+CEt+AKkJC/i8UoEupWVcwpJLFxEa7e+JbMinTuXG6aPzYZ?= =?us-ascii?Q?L7LhaX3lNu1HJeg9MbCDa+AHdZbgxHW9YskNGQXNTxUH84pxsHWr+wxEG8MV?= =?us-ascii?Q?Nr+M2IsD9QZJBwzJ/nwFn/BGojTUJDTxfwsGl4FP+NGd9e9MjD/WDiMr0cLA?= =?us-ascii?Q?E6zKhEYXkXpfdHNSjTS2m+tXE6QPEC49P+Z1obrECbacJdi4DDldRSKFA9/U?= =?us-ascii?Q?LPPXb2O13KMyjL8jiMlSYayFmxQQ/xcpCjwkxObLUm6nx9tPx2l+idmGv5AI?= =?us-ascii?Q?2oEXlubYwoilXQK75RTzpS/h4dB7YiRrCqj1fKGIJ4h48FHHAFDG+ZKzLe+I?= =?us-ascii?Q?E2lQIpzxj55ifs0Fta8YWaJVL7bFxmSB/CERblU/K2Pt7y28lhAz/qJr7wUY?= =?us-ascii?Q?sL1aXYaBNUsp62hjn+6V8Hi0Ag20gP8mDvLGe5b2e0VrjK8j0XL7WjoiFXMB?= =?us-ascii?Q?x7xLRMCJRTpatTfw7Lhax4h8oGnoTUmqsMPkQrK4GUE4OUlS6+8XkZVAE4CM?= =?us-ascii?Q?+iuIjdivl8E1X3PZIQ/DhPLhsZYPtUPX9BjU+E3nh66GvsEzvxka1PDv1BEH?= =?us-ascii?Q?ZXBQlNycWgKYtphpZt6H+e6AHeoNnktp5nxu2Y+bxr25Ny7L8omBcZJD36q3?= =?us-ascii?Q?vgQdIOXxZN2bBLKjburokDdLfhXybBTfjtezLfiH5c9940jYOOmGI1d3uA/7?= =?us-ascii?Q?5VqwnLvX/421OH97faQraoJqrIbpVfGhnYQrX78tGOIYpIiMaMq8+cwSIbqe?= =?us-ascii?Q?+u9lG53ejAvcaupUzJSy6sSXGsCS1lILq72Gy2WdimTFVff5mp3J76SJhSrZ?= =?us-ascii?Q?X9Tbuz5QLv3i6IDjYUAVbuYNUHqqJn0KB9COc0aDxdpZVxmg0qqy0cznE5JK?= =?us-ascii?Q?Tyy71AgiLG7Iac4coBZqZXSuG0KUwcxq0HS54d2qmBsPafiZLtuZLuIw8kwo?= =?us-ascii?Q?WhpATzkp5l5nMxpAHichcbt4x6ZzIbkH/Gelb6RXi9K2adBQ8pfojQ36Dken?= =?us-ascii?Q?6PsHtMdVub/B43zux5vJJL9nPGTW3NixHRfXZLDp9hI0xbCoZKWsCZGR2NMS?= =?us-ascii?Q?gdCkx2NB39vwizzk9QxZWnxk/LSgGSZOorWEKJyGcaOWLo2U7WAYKa3HAphr?= =?us-ascii?Q?TKXyWQ5cnmkmjF/Pb4JCRWLX8qc8yzFQvTD6bcXhRyDzFPZ2ns13Ko1lfB1b?= =?us-ascii?Q?Pp6mGarX93UEgDOk60N+GJE=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: a9775678-8606-420e-c53c-08d9b670ed3c X-MS-Exchange-CrossTenant-AuthSource: AM8P189MB1410.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Dec 2021 15:23:58.4491 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 62e24f58-823c-4d73-8ff2-db0a5f20156c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: k6tBigcsOj6ptvWPLqbqDNs+ct77VFYK+GHu7Aq8fy27cZoso1KkCpouAuZZuDqNRvfUc7ENWfDwcct/4Anllw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0P189MB0594 X-cloud-security-sender: g.schenk@eckelmann.de X-cloud-security-recipient: ptxdist@pengutronix.de X-cloud-security-Virusscan: CLEAN X-cloud-security-disclaimer: This E-Mail was scanned by E-Mailservice on mx-relay76-hz1.antispameurope.com with 664151BEC7E1 X-cloud-security-connect: smtp.eckelmann.de[217.19.183.80], TLS=1, IP=217.19.183.80 X-cloud-security-Digest: 2d8171015be8e24c869af68b17b073a7 X-cloud-security: scantime:2.000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=eckelmann.de; h=from:to :cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s=hse1; bh=F3uP0kL4ZnbFOk9hXF7F3ykm8l6/h6s0DfsEeibEM4I=; b=E4shD8uQwXFw Gb8JRv6ztq7E4yf34+Ihi91iXZEWFITneN38Xe8ebbAatWE7XBvHoephFveBtElC rXm65geUSm87308nViUPKlrZQ+ikd1YwazP3ELfLGd6gwd3vpw8PmZcfCYuXobgx LY+sjZjbIe7sws6hW/CcwqzZIS4Dei2fnmu1VGqNdcR8+adZADgjdjYTpySDvhik FTsW9qKrtgMUzYHuPQZLsM6N6/SZ1liPyo7lNxnORnX1hV19x/KkPNF4Q0VhJhO0 maW43yaLkZMdH1e0BzI873xAHvgLV/JucdDg9fojbFmX+RKQUcTFqUtYg4V8MjyI zOlycvX11A== X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-100.4 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,RCVD_IN_SBL_CSS,SPF_HELO_NONE, SPF_PASS,USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=no autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] 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 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 --- 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