From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 15 Dec 2021 14:51:53 +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 1mxUhF-007LuP-9U for lore@lore.pengutronix.de; Wed, 15 Dec 2021 14:51:53 +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 1mxUhE-0002dl-8C; Wed, 15 Dec 2021 14:51:52 +0100 Received: from mx-relay37-hz1.antispameurope.com ([94.100.133.213]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mxUgf-0002dH-CE for ptxdist@pengutronix.de; Wed, 15 Dec 2021 14:51:18 +0100 Received: from smtp.eckelmann.de ([217.19.183.80]) by mx-relay37-hz1.antispameurope.com; Wed, 15 Dec 2021 14:51:16 +0100 Received: from EX-SRV1.eckelmann.group (2a00:1f08:4007:e030:172:18:30:60) by EX-SRV1.eckelmann.group (2a00:1f08:4007:e030:172:18:30:60) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 15 Dec 2021 14:51:12 +0100 Received: from EUR04-VI1-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.17 via Frontend Transport; Wed, 15 Dec 2021 14:51:12 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nY130njILi4wXTudjyJnpgt7ezzrJ+UvLlHqXBP6YSiAJI2+N7EUk6U+cEhTjww4NzL/4GSHFLBe+B4kHsyPfa79ruc7lqDHD6eDazEOkBpWurWC/As9Otxsi13Y8fw6QgmZR9zVPC9xCkt4QY6Y7v6gVMyp7OvZQ75PDUEIc8DgIhOH/VSbl/xhVZ4GM2/v9wntJ586le5LAxkQzkzksz0nXOdx2ZG6B+VA9YxTAwA3I1nWU2jlwj38yt6t9LAhhbMLaJx8feQ+eiUGvh/aVXJYGspya/dHG9VpJl5fEUYaDZa9HcNry2vwY4LICtx1Pnp1GI+2oSh+PE5VJpUCZw== 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=dUTlItCNUn7TKpaM34HKUd6w3IdeZ3qik/y6sNXG598=; b=kwXDDdc2MAywIGO6a1OM4zgqfsfQaoNFCgoOrqxBlW4x0mSZ6LCZJL1EKrVwQH8t5YY2Rz/2rMltJVd6rUxQxQaA1r6rhVQ7ttbIpR2gE2zIg8bV5PLxIskq4LLgBeeHWzJNuIJ9/vPtTxjgPgK/Dob8bFvIluicyB6pDPCdLOM4sZiQaS+6UnZKDl1Qsln2uMJTRJkG0WXel0NdU08eOyJotfcpFo6p5WAShfIUBLFVCkYnZeJ2gXTzSNW5GNi7Q99URIegq/3CJbhHbd7ijrQMqDRa7aeYN1oBoFVcHDgPPHVUdKVKPIQUk5+r3MmhW9JvL0WMQyLhS9ljR2KOyw== 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=dUTlItCNUn7TKpaM34HKUd6w3IdeZ3qik/y6sNXG598=; b=zDfs+vvgTg4PpeTqhXeTIM6I1NcX8oxeSw8ITBzw/k3WZJig4/fidSjZrkf8G8KwjbsfgQTjqn1vqYUCnad51MRVt0Sg4jMIYuX2iKn/mUhrDkoPgIRMb1SJFUbNQDAs4eaO9Qg9hictihbkKqzkXjqL+7I+C94gJT2sQfbNALM= 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 AM9P189MB1538.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:30d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Wed, 15 Dec 2021 13:50:57 +0000 Received: from AM8P189MB1410.EURP189.PROD.OUTLOOK.COM ([fe80::91dc:16ab:e0ec:60a4]) by AM8P189MB1410.EURP189.PROD.OUTLOOK.COM ([fe80::91dc:16ab:e0ec:60a4%5]) with mapi id 15.20.4778.018; Wed, 15 Dec 2021 13:50:57 +0000 From: Gavin Schenk To: Date: Wed, 15 Dec 2021 14:50:08 +0100 Message-Id: <20211215135007.863164-1-g.schenk@eckelmann.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211208074020.GD15196@pengutronix.de> References: <20211208074020.GD15196@pengutronix.de> X-ClientProxiedBy: AS9PR06CA0057.eurprd06.prod.outlook.com (2603:10a6:20b:463::33) To AM8P189MB1410.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:249::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2998318f-94ad-4542-0881-08d9bfd1ebd6 X-MS-TrafficTypeDiagnostic: AM9P189MB1538:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A9PY2n98Vrx22GYjYy/Za+TtxAWAqeSCuuxFYc19eppdOEenUxm+UiPNjOkXEFEhl8stYadjN75/wtyQzruRWKC5U9Zvli/K8h+kOrC+7ob3psMYbGxhixjhjDSibenaZhS+AA6FD7/luX2I650RUbjiSJtHKU1VjmEtmYbjOLJhQit4cou/lkbd38BnCYZr4eDKmYoOkDjfSZnczndCsF/T+IHl1E514ZH63TXZJSp9pdZS8qeyjqsQeVb5PIHuCJpfw+YB86WUqcqgI66Aemac2wqhvu4vJrL5FBSNRTRMzvYbmT3Gz5oXp878+T421m2a4F4p3t4DdQCwrAg1is9QUpgKApHXexPfNfx+gF1SVwSGm1+oUWFt3L750VMoIrt2mXN13r/STiUcU+ccUlaGKljK/dXn4waRjm3a4Ytq6psVjPwkBAtXXWDSVwnjtY/Oy4F2Mg2j0XBYvIdWekoeZJHD9INil39xqCsgGUl/1tRhfUYlDFl5m5lPdcAzU3z5Mky24Ca19wFZDwCdVtekq+bWtpSfmSeqw4e2se0vYX9BbxPNd3q76cs5C4WmHVhg9cc2xAPkrDhaZI83HIQXdnuaKYBl7ZYFwNwYiw3sFgQ+V59bzn9f6218hsb7AQSKHxP5ybbEGU3UEpUcY7NCeC/kCCOKNOHdA2sE1vXA7k33B6TcI0yQC9vHhJQaAr2pWTh/1Ejp+VKkkngA0w== 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)(396003)(366004)(346002)(376002)(136003)(39840400004)(6916009)(52116002)(2616005)(186003)(6506007)(38100700002)(316002)(83380400001)(38350700002)(8936002)(2906002)(8676002)(26005)(107886003)(508600001)(66556008)(66476007)(66946007)(86362001)(5660300002)(6666004)(6512007)(6486002)(4326008)(1076003)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9ThijQODO4syKi926ilDcN22Qk9zwoKdgGXkDg0WpJr9bGB+N76CqZ69+rhz?= =?us-ascii?Q?MuSQAfgXOh776RiR1StfPq4/AZ8hbnwWB0tNldl1snZBrjvV/40QBgJELiKH?= =?us-ascii?Q?MwA/A42ctIwtbwz8SwF4vhjykrB6CjgChSVg09ObNEuxk5PiLe7lAZpTlYsw?= =?us-ascii?Q?ix7bGPm3vN5fNQunlRRZxutP5zHGuAEpQJGPzG2+NGLVD01+hEINzGfKwq1L?= =?us-ascii?Q?1dAnP6UigKYjib6MsEXeLYD7p3+inQ+jERwt5/om0X3+cZ2MW7jFAnQ6vra4?= =?us-ascii?Q?XbcQq9FQajBt38TiIZr7o2MU3AX4Q8P72ucra3guZjLXqGQ+0OktZWO65uic?= =?us-ascii?Q?i5abpDtZxwXsUkMl86dm7Pyy+AjX4WkcZfz9fTzAePLilKIdy7pVMatxYm2J?= =?us-ascii?Q?Q4Q6CCPrAsqJX+3YwlQLCbKFUB5HxWtwSGYAVkZEr8YhsIdmQX7oRFo6PLl8?= =?us-ascii?Q?2Ejy3EYI3DcJ8C8SY9F/AnTGles4FdM83bVNiGwZ7QOpZF9goLZA7cFH2Etl?= =?us-ascii?Q?FIhIkIXHNHumU1CvQkrvUzqLyu5M8k3EoK4B5F7cC+a1IzifzGhTaN/TVI0v?= =?us-ascii?Q?HIsWFNanZfNlQTyT78d/M72DLujQ6rxVpQ2gBIE+zBp/X+TmsNDVbMPldzJe?= =?us-ascii?Q?xFdXLqDXto0usTPDmBb5YEIcExUOOFbWu4VN7xwLGQAsah7LZhWKna1jrTNE?= =?us-ascii?Q?oS3h7J3YkVH25pboyqbw/aWidfGUGiflK+9NAM/4ahq4dSmoT6kGKplOLwux?= =?us-ascii?Q?7PDVYK1zlKKVWq797uRqhNwsD76E8NHAvh5BS/I/ucQ3746VMAWNOKi4EY1S?= =?us-ascii?Q?JJBhOHUoVbw6XaU1TsPGSM7V7Uek0+PXA4T4Yq1bOkGXfqvDi9B1Y7uwBvlQ?= =?us-ascii?Q?wz1cxYWgj3e+LgWqG6/+7GRSoR8zj4CDcBNwifvGNQ2DtlgXTozagte3mM4U?= =?us-ascii?Q?K6jod9dzi/IMLPPxrrZMidKNuJ+aesxVAkU67/QtCTQekLmnOoZQ37wuNrCB?= =?us-ascii?Q?SddrHIVaLN+ymFTc6MFVUJlQHc2nS3SdLJPsZzGLpU1I8+sw6Md38gg780hq?= =?us-ascii?Q?LFdH8QMGLxPSZsb20/qHKHuz54hCDTZbWvG1qk9x1C3XVCUkxiNiqGjwxd+9?= =?us-ascii?Q?gbGj1D0BW9qMO8NwZ5C2yHFTkC4lpHMmpS7jriwBMw67PHumTluCybMTHIIT?= =?us-ascii?Q?BOdDgem4+yOjBTBNd6LRq9L5RikcZxHJOT6RaDg+FprQWk4MrwCbKEn1Q6+g?= =?us-ascii?Q?85hQQnGvSxxR6C5CyzwlVC6cpBifMbtnhyrG5VOx9R49LBqxxyt0CZTTFwke?= =?us-ascii?Q?0X0n+4ipZ4DXF6kOngEKH5Xrsw7xlPKKfBhSqXi+ng9EdAwJtgdn23qCIBbd?= =?us-ascii?Q?ueYC+A+sc401Nfy2vjIc1shZ81Xd2vayq15cd6GEc6y32gxVC5SLbHIn2KVs?= =?us-ascii?Q?OQZ7BKbAsdPo0ectgovOul3chwKjYKJEZYjuomXcnhHakqqlXwcxoR8EY3UJ?= =?us-ascii?Q?d0Vn7fDV9rXkMi64u6iQwpWwPsmCyJClCZ3fcDWVZsyZiR/S5Hgc5to6Gf3Z?= =?us-ascii?Q?RvQqiplS+/WZWxve8AkrEgTo3r187DDQZO0c6VHzbF9ZCsgvZUOpOUXTKhWI?= =?us-ascii?Q?UgYB3IA5EO3BElOxO828fuc=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 2998318f-94ad-4542-0881-08d9bfd1ebd6 X-MS-Exchange-CrossTenant-AuthSource: AM8P189MB1410.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 13:50:57.7096 (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: K+pCANiUA+XCnnWCVpaJgVcVyRCWkvF7gSA/xmvoXApOHVKRtzMWZGDsdpkRpDj9vDHVYXjOKPk+hIpOxVORTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9P189MB1538 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-relay37-hz1.antispameurope.com with B20C310AA09C X-cloud-security-connect: smtp.eckelmann.de[217.19.183.80], TLS=1, IP=217.19.183.80 X-cloud-security-Digest: b949607870e8ab22fcc946c8c7bd7322 X-cloud-security: scantime:1.549 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=NHnKktH1tu/pYfGbvm/xfaSUb+73/M0jdM0iQaUw5cI=; b=c3Gl5SLqF2vS Zk++2Hqk3ORWw86xPpDMOOFlf8/Eg/suN6tefoB3UwLKBmat2PGQ4TZojfOeeeoz cSf3wsHFm3oHvI5AGLIHg1ZzsQ7DiMXbVQQt1ZNGTofq1JCqNLSyU4x63Sn0a0hx RhCEu8Z6VxolgPiTqo2kjPlo0KCMfrCgwcgDa/QjkB1VnsboHTlNMYoE1WAxugKX 3zBYbeD6b59imR92NzrKXWycttD63y5vaWpmRJ8KZgpkK9KRS5OkXUliC+tS6hru kj7Oyo8pIKDbWHb94swT5S82Zd/mAZY2ozynMwuo8zZH1Yr9qKrJwwxpWTFyFdye bqMcsRR8GQ== 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,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v3] 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 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