From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 01 Nov 2021 12:40:18 +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 1mhVfm-0003ZH-2R for lore@lore.pengutronix.de; Mon, 01 Nov 2021 12:40:18 +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 1mhVfl-0008Cy-Lu; Mon, 01 Nov 2021 12:40:17 +0100 Received: from mx-relay87-hz1.antispameurope.com ([94.100.132.254]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mhVf6-0007tB-8R for ptxdist@pengutronix.de; Mon, 01 Nov 2021 12:39:36 +0100 Received: from smtp.eckelmann.de ([217.19.183.80]) by mx-relay87-hz1.antispameurope.com; Mon, 01 Nov 2021 12:39:35 +0100 Received: from EX-SRV1.eckelmann.group (2a00:1f08:4007:e030:172:18:30:60) 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.7; Mon, 1 Nov 2021 12:39:25 +0100 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (2a00:1f08:4007:e035:172:18:35:1a) by smtp.eckelmann.de (2a00:1f08:4007:e035:172:18:35:4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.12 via Frontend Transport; Mon, 1 Nov 2021 12:39:25 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EfMPI1JwGnhieoXcx+VR6vPdsjke6wLwz6c+0+b6AcjDEJx52GsnIbLKztnGHCR3ciwey/NZll3xRxkXn99Bbj79joWd8gLH7+SaQAtJJRlT/56CloLgQEXlN+qtjgdEdskqUnqdw83PZEsdz02DWl7Ibz9pxXvnG+UhOnXaq9Bzy/WG9CqNDTJqA6x8BGkiD756/sVAKJuP0Ap8uBuWK99ZFvs7iAPus7NBS2rAsHXX1k3qm2+NzbONAQpRrEXsMao3I3XMqbexJk7tLNaEGOx7aPtPFuXiF0qdFsflhvuPVxS3k3RplowYri75VX4l9rWztqNP+6EjoRjYzdkxAw== 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=rSEjHccD2GM00QNXS7BGXCQF9gZyGoHsbQQFSh/LhFQ=; b=N/LSKFhE3W+HfF95fp3whAL1VtHFsZ2NpMF8FvBGzgd/Yh4uXMlGuIvktf3GKi+IRVkQ3As9O87/3/xzd2s3x8kAyCrs2vo4kb/Aws107YgX4NYv+KILf4gS+9rfKsWN0UfNLJ8+5qOPdqJfooj+8AsSdc6GolSEprvP6tBNr363Prlc1LPINLervaxFGa1SZU+NhQAECcMcgJdoATuc0tQ365sb96GyZU+Fb8ORofIaleHb6ms+JI1Q4U7zHuYKgIJt0Hrxvj1YpM8iTCVU6P/9KjrPEr7tkd0Tn3EShFcTD2wu5lWnkJxOjj2ZbRlPEbyaQaKRuxzB+PPrv9GjNQ== 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=rSEjHccD2GM00QNXS7BGXCQF9gZyGoHsbQQFSh/LhFQ=; b=XEKqwywT9TyKNYFHopotYN1xVO4c7icQGUiwWzUxlmJEmP2Dv39Ds6vy6D09hkj/iJN/kEMsHVNrAdRKQDH2SOn7j0Vly6M9VqBPJU19WzRlU4iZkFj6FQy7xbJWFS1eOJJXWKg0m3ogNxT+ZxnSZamYh0YAarUU1gv5pn/zVsY= 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 AM0P189MB0721.EURP189.PROD.OUTLOOK.COM (2603:10a6:208:198::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.17; Mon, 1 Nov 2021 11:39:14 +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.4649.019; Mon, 1 Nov 2021 11:39:14 +0000 From: Gavin Schenk To: Date: Mon, 1 Nov 2021 12:38:48 +0100 Message-Id: <20211101113848.145063-3-g.schenk@eckelmann.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211101113848.145063-1-g.schenk@eckelmann.de> References: <20211101113848.145063-1-g.schenk@eckelmann.de> X-ClientProxiedBy: AS9PR06CA0351.eurprd06.prod.outlook.com (2603:10a6:20b:466::17) To AM8P189MB1410.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:249::12) MIME-Version: 1.0 Received: from NB061.eckelmann.group (176.198.172.190) by AS9PR06CA0351.eurprd06.prod.outlook.com (2603:10a6:20b:466::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.14 via Frontend Transport; Mon, 1 Nov 2021 11:39:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7fe48b2a-af7c-4bf0-0e3e-08d99d2c3aec X-MS-TrafficTypeDiagnostic: AM0P189MB0721: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QyczZj6CMJTsh2DjWjYb2lQnRDvklQJFOV+WVHBxqRDq0V5yCLUAYMRnDvIjIGar7fDmjA6+Gg6U7vbLfZvKMBYs4FJ9v4CE72Q4mFPu6EJoYqpNO7n1+171ONEe4APkKNx0GBlks0zUXnNzuFRJlpqG1iCcHXqJnoDYAnmnxcMtguKL50I8gw8KeVsYbMO9NqwS+1NAZIBEu45sYYFVMVbjDunan8gTkpSnfCQOPNif2H+Kpv9zGulGliZ6z7NKqMgoaSzOz53Jy0JUSnnjLXaaowVVNuyiAe1QXAeQtTEiAkrb2tBKbEmgeJvynirxPv61WNuW6g2QoLbKYA6frKshVo1zvV2iqhxaagJJRC6FBddE8UOKIp5X4ZBEEKpiFM9TiX2De/3gFxPnLdC25DhXl8vBSHJYiFggkWvnVRFz8NyZkNzTYhKSNP/Tvz2Xs4lDgPissxQMcxBguOzc6rpYzFDbCUHYdZDi4xr8MF+D5GuRr8P0l0ueZVB0hyUMqIgOxNo5coW2uqt/BV1at27s9TMs+TwKfJCH6Ykf9H/+NApf2390TIqVgpWUFzTQl+Gc3Jmy7fp/qC0N6fBC8OevrQHllURwNgV3YD/h/09yGyCPgeCG+WyD3q8qbAn2OAy+1hC3Z+NNA8tBSr2+lxvx2YrdQg1W9AqqzE+hChzF3FduKPE6rXCqP7915DQi6hWKaLG3Ev+NtX1wDENOVw== 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)(346002)(39840400004)(366004)(136003)(396003)(508600001)(8936002)(52116002)(186003)(6916009)(1076003)(107886003)(6486002)(83380400001)(8676002)(316002)(38100700002)(38350700002)(6512007)(36756003)(6666004)(6506007)(5660300002)(26005)(2906002)(4326008)(2616005)(956004)(66476007)(66556008)(66946007)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?CKiEJjVozQixLA/uAzvVW3Z64iK7cBFG0cNcqKLRfPI/9dRWIXDpJXv8JbzU?= =?us-ascii?Q?jImJQrWqcSoC9pzG1DVuPTpQKTxjKpT6io5QqEKg0f+GyaKOZYXcDTkS9/87?= =?us-ascii?Q?vwzY2i3gSPOJrDJzbeW5yaQ/WpwqaRZ7cjC8r+4+F0replEfRACHEQUl5FFF?= =?us-ascii?Q?OgK/fhvhTZEgiqME32oYP62YZsl54sUSjolf5voCCxGIe6IFbsBlUR23KJ6s?= =?us-ascii?Q?m6ut/BNjBs6Uec4VO3G4C58JnpG9TdRdHjXrQoK+q8TXbPkYpObX4d0vFfMP?= =?us-ascii?Q?OclEWey34Qk9q1qDPza4tXdQY6egeXGpPLGY/D3q0JPt9nWQx+P0lFjVEQyd?= =?us-ascii?Q?xVyhpT4EMkusZ5380eDPgNU3gqr2wKBd3nIL2pN57o2GI9/XOWf3+1pMNnVf?= =?us-ascii?Q?J1FB38S4mx5TrTIAeqtv1CCVzVJRpqcnSTJIIfPFUJavVO6Q0nzU5Lid84uK?= =?us-ascii?Q?44+0qMlX9Tk7nBuizVynHcJ8CWciuSe1eh4pxsdSCNDyGMIR2rDX79gOUyxq?= =?us-ascii?Q?MOETAUwA4PHbD8Dqr8P2auad3cKYCEu2VhCEYtBT8SInyxDM7Uqfw0kDYZaz?= =?us-ascii?Q?6JWk+FjKDw0flBhDFk+PG2iD7msbHH4hihh8b+wb4V/wF40JrQIdHBSDavU1?= =?us-ascii?Q?fUcUNwtblit7LF0MvWeWcNG4wmQ0oACXfS/oA/cfi6Pn5Gq55gB8AgPVT5+B?= =?us-ascii?Q?9qcE6yp0+cs05UiFAleYHYOw4AXcO2dWjcCwaGE/dS2uj0el6lftox4eWS+L?= =?us-ascii?Q?VfrThFejScUZ19FfiBKiU+4jS4uyR9XRei2iySOsz49+qceOfHi3GH3PPXZr?= =?us-ascii?Q?KWL+SjRL22o7kS1W6+9MRNRIY5R+/NwGJUyN4RsueEDctV53yqG0H9NnDEZj?= =?us-ascii?Q?WtLSLHAcs50la7o9vExWIUiWJvFJalYBHvVh1hHWpgfP0PzmCRNrwS9ojNcu?= =?us-ascii?Q?7P7PUixGKT64/VwYP1Y4fdeGFH1n2TvWVHIzcfbIZlTwJ8ert2PqtgHHqSAi?= =?us-ascii?Q?f+l0grRyGOmsoUzMCKuS2BBKQnRjcJ/Gde/OMjlVhsBDRWIN8gN1H+omRSe2?= =?us-ascii?Q?LsJfDNfvt2tgMe92xMN3zjr5Lg2nYBdoqFmkHN2Cw3D9vUBMnmN8uzTyOtvL?= =?us-ascii?Q?fq7mBLmMt7o2RRDR9n6fGinfd90PjguSJKhzOR5Tm1H8eYE10iCWR5Cu7xU0?= =?us-ascii?Q?pIJ9Ipk52dGn4E68wHtp4V/tSTcRja3eoDMS1upq+cOlqhGG/zae9WozF0C9?= =?us-ascii?Q?dMh1W0mz8eCVo26YMo1/YGlDN0FsR1Qz/7F1ACUCm59GAq3EQqLGUyPtIcvZ?= =?us-ascii?Q?umWZ3Rh/e1R11pQUX1n0DgkVrfmbPqsPHFgUc8Mbalwf9wo1mjmLusZ4Ncp/?= =?us-ascii?Q?9a7AsUFdSeiXTwt+44z8Wf71yGpW9z3VkrF/uTv4+SLHs9WHzfU5gTfkkC1T?= =?us-ascii?Q?QJSxniFo3Q9hrDeJjUa2c9F1Vy3I5P1Yhc/DflYb5V4WOMgJ8anfojblcmEF?= =?us-ascii?Q?00qgeHDbE1nztY2D2/ryah0ILCGuoEPMzwNVPzZpOQtPJ8XCWPUK8fAIqTXV?= =?us-ascii?Q?3fxfttb6ufRz3/RGDonda+4nA+RBX1b0oZ5XOSmbWaLdplXWhPO2j0ZDEUzC?= =?us-ascii?Q?uiipNRCFJWTzR/bbR3fzBjc=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 7fe48b2a-af7c-4bf0-0e3e-08d99d2c3aec X-MS-Exchange-CrossTenant-AuthSource: AM8P189MB1410.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2021 11:39:14.3471 (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: jgz5/9EWGYm16rnkTPZIcUfdsfOB0ZoB+FncGQoSGu71o0KiUlzKMIUDuuaFLFSVw44HhfUTJZ3TSbr1n0GjKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0P189MB0721 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-relay87-hz1.antispameurope.com with 3D6A8E24D9F X-cloud-security-connect: smtp.eckelmann.de[217.19.183.80], TLS=1, IP=217.19.183.80 X-cloud-security-Digest: 4cc0ff6322bd080c4923d988a02826ad X-cloud-security: scantime:1.759 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=NKPC2B1R4C06TVSuHlsByMC6DoXoA70L/ReA7W4VDQI=; b=Uwj7GRvc0woW 39Qhuu9Nm/+G/U/OJj/TEezSuOte0sI1EpoWhUQMLJV9s2p09MTRAT0wofoPPXVJ Zqng8rZaHky42xTaMLwHXwk7ec5ePXExHisX4H6hYh6ujmKo28gXVyuTxHJhyy9M AAJtFXfMhneBgDfGBq7gSGbot0rF7l53IsGH4ul3FvUyTuLY7T7yFkHAOqQjKDPb 9is6zPDWOAdGcso70F8bZvEjbQY3NhVsUZsJr+HhgGBvjWKw4NWH8yODMubjnSXw 2vfOVrMEU3ZKUFVJqMx+foTHyvXb3WLXCp39aYrjBXPuw2yyaCqM96/B+ZDd/Mj2 Ah3zBUzIbw== X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-101.8 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_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS,USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH 2/2] 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. So save some more space, the comments in this file are also stripped. Signed-off-by: Gavin Schenk --- 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