From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 22 Sep 2022 10:25:38 +0200 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 1obHWb-00C1wT-U9 for lore@lore.pengutronix.de; Thu, 22 Sep 2022 10:25:38 +0200 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 1obHWa-0003dW-8R; Thu, 22 Sep 2022 10:25:36 +0200 Received: from mail-am6eur05on2057.outbound.protection.outlook.com ([40.107.22.57] helo=EUR05-AM6-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1obHWO-0003cq-Kq for ptxdist@pengutronix.de; Thu, 22 Sep 2022 10:25:25 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UQmK4AbzRsziMAQzsidyT7OR/fO2tcMq+B21geuP/XIRhw4zUFXl9m4xVjvPN0W0f1j4eHKn8ZcMPhtpqotC0HTyCSntE+WwRNNuQRUINlIn1Ki6XIhGv61VX/hbPg08dlOon1dQkS8tawkub50+CPa4ESeKvV9CyN16ReEzf7Rh5IpNzSydK8smLlZp2vJ4inaKpFNOP9su2Ua6EyWBb3exDw6k/26QtlEF6jktOxEJYlasKbwp+ViFdBgheqAoeShwAEK08a4rQW91M6rPTTtXvv/aKeWH4e28NERcaSMfXDgkfB9zMjq98yytNSmZ1yG3dgbfM3U2XpB+/35eWQ== 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=EzgrHxHqQeMaqZTttW7KMXSi0C5ZCdAXZjz06Tb+Em4=; b=mPBd5bevoIkZ+bElPl+FjrYUBZkz6aXO2DTBQ0pC0ZAz0LNFWGGtStXQ/nC3ol5d98oGNyX8BKZLsaK4ZPXCVe08uDjC1yS19YJCTiRnkqnXk1ius9YU6RsXfyaa3RPhge1w2GZJw087DUADet4ikmS1ZCDkE2UqMmTtaXyv9ccZRFdIzvTtQmQbVjCQXKdaGuCPZM37m3B5xqW0gZ7IRTKKvcv4wSKe0PM54THTGA1LlQ55XDlEWZVOUxCnoDS2uwzBlbGOKHf/+eS1kkhzxUvx8Cu0ZJlkmfk1Pv6CaMRxhXANWpzbY+vxm5FnCGqlasBsPaivT8JuCY9gFAhzMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EzgrHxHqQeMaqZTttW7KMXSi0C5ZCdAXZjz06Tb+Em4=; b=dxeKF5aZyHgNTeaW3kLgMPodlcSDaf48kYBX8n6QoBPNJhhArDvilLidErlsATicftkY+eOkbyeCjOfWHT6SBKP2M3uQOz58VRxxlk5M0YhE8rQUzvvBsxOjl1+OA8zy84jOMfvmQwxHmgrG0TvsW0rsX+/6IJA+hSV1CGgYic4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by PAXP251MB0470.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:283::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.21; Thu, 22 Sep 2022 08:25:22 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::e58b:12ba:9a8:df1e]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::e58b:12ba:9a8:df1e%7]) with mapi id 15.20.5654.016; Thu, 22 Sep 2022 08:25:22 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Thu, 22 Sep 2022 10:25:09 +0200 Message-Id: <20220922082509.3534544-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GV3P280CA0093.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:8::22) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|PAXP251MB0470:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b1b11fe-531d-4abb-f242-08da9c73fdba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bMrswsnr1GZWnGUFzUUQNIQnJGl414QDAnXDtmZQycgyJyk39o21yGR8sQ87qtWvzhoHcFWr6F7ys7RM8H7wcnkaZH//6a0AL6pRW5JomLsbWePb4JFiVivZpfkhiNyt/0QtTLt8OHEZztoXYDpMxcS6um8Vwh33qrWfxUbKmx99WAzGpZIhpV6qbNXKTsBHj9TRQYFV5A8vMrg2RhRBy3MfIbmAS1kD93aDOELVhEHcgxMYsOWRwOnXtsIye8IwuUpWmpOkm9XQQUqV39bNdw+SwAjp5SujE8+yO/SC7uboRf6V63iopBfey6ORVDdjjyiwVY6/mpwL76nPbc86Xco84BqN8dvLS85kKnJ/pdPejFGKG8kIrhqte4rbR0w/z/xqU+Y1At7YKzCQ6uDrs1LcNSrr8tBbVzCHdreuL0T8Cc7gCtAfCyrwDiRpfvhAorX20fUlWUPsz7knheX0fwcaacUyKpc0efP10UO86NmjxjYuJ6MyBkQLTGjodni3OihUKyqaTz8hafSKigFPUDvI/WB1kDQkhAuFCSSNth8+1+MZdSibUMOFA2MkmH5THuf50+Fz5B/IwOgkvvZvJ+IYbSvu6jamlFbYi9QLhKJ7sFkDYJo9qKDZ+1W7JoV4fkeQyjvIeynA0JcW2u3UA41qTPavkzbz8jARNQ3ktyMaxZJqUuh4sHX6Pddwz2LfZNhux4Rj9Fnz2Z9dOwKd8WBzm1+g6FU9VlddKfBd1dO/lmCs53VAgv0VYu/f+G9YugdDoiS5GkSDstUznD6IPOkWqV4eBIkInc9g7MLczD4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230022)(39830400003)(366004)(376002)(396003)(136003)(346002)(451199015)(316002)(6916009)(36756003)(86362001)(1076003)(38350700002)(2616005)(83380400001)(186003)(38100700002)(66946007)(6506007)(966005)(6486002)(66556008)(6666004)(66476007)(2906002)(6512007)(26005)(52116002)(41300700001)(8936002)(8676002)(478600001)(44832011)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xz81Mky7S8BKsTZ3IckCYWijjImKWsZ3XYJGHk93tYMSn40oQX2Cpnm67MhQ?= =?us-ascii?Q?D0KFjDFoBCR0fKNFJjnuJHALQ0sMvGAk68rlPWk3DrWycHRbwVxImBtdZkzc?= =?us-ascii?Q?LsGlIDkS9RE/EsXxVRZL1E7x32DIV+QJKcE49k586Ha263gWP4haDaPmMr7d?= =?us-ascii?Q?UYLU2fY+N89z+DEOFGySteM75HE0GVaHCZbrpd3CyNr10voi5j7kKJUPBeCv?= =?us-ascii?Q?TTCygkhGRdOj1wE3cqxT7vKCZIYgCsIABTlo2sooSVa4cpDC9Ne2XaCd4U9P?= =?us-ascii?Q?F04V6F5dlqwkCbXA5+4u157fVbInLG7R/cATz9L9mDSaEI5ix6+RbYKL27RW?= =?us-ascii?Q?bfbXXfgkmpGVF6xhgLVtsqb9QEJdvnhX/4Uqcxc++uNc4P4pC5w2jBnwOGrK?= =?us-ascii?Q?sNRQiAzgMjAohTdpyjg1L9p3rOywjRE43GpqOPPm49y7eJHX9t4DZpaS4G2d?= =?us-ascii?Q?/BNagEyERV7os9myauzP8Zb4jlkjRuTumXWcNv/CPEucyyef7to6108UTdx+?= =?us-ascii?Q?rGJn6olvJ4czziczDimTsvcUOJUEa6K/+tgVVVcp409ZZBruXmP+eWzUxtuS?= =?us-ascii?Q?F5SmoryqfatSBgmLKXD/V3HwYQLgtP3gqyfC39DpT1IPzfudZR8ecQT8/x4t?= =?us-ascii?Q?TL0kYOA5Jo1XN55+wPm03Cx6ZhjzyYaJrSANMliuEOgXAtI4J67WH8YNfKch?= =?us-ascii?Q?fFHaeX8D0hQ7m68+9Yv096ahl0pi9RrmjCy9odnev5+9pfL7NUVYURRk1bqV?= =?us-ascii?Q?tV8T2XH7f4d4ssBPNxeEyRzSY8owdvoUZG/+GZHXMCKJjIuxKdlKnxvuQee5?= =?us-ascii?Q?zmy51EhhBliTZpWYZRZc0x6K2xItIBqYU6+kHNozCJ3D+7Ni8mRExNf+JFCG?= =?us-ascii?Q?4foxLs+AN7Gnfb5NTh4P/w+dArbTdMuMy+c9C9pbpLvr0+DSyi9SpRPl434p?= =?us-ascii?Q?oimxJFn/1dijo9su3+fa4Q1VijpAnmyHe7drUk3Oq792fdBVaRjVwwdy5VsE?= =?us-ascii?Q?0GvmPgdoBBrakRleRzSEHSL4sSlpC9p6Zcp92MhSKkjPEkWdZJFBzivc2rmZ?= =?us-ascii?Q?lhg81Nkp09sMT1SYQ/rzBV7x0O9sA6xodXav7mQU4BbiCraTqA0Qvnyv2kIA?= =?us-ascii?Q?ao2dTcpk5cQMl1zOB3/yR4+dDlnW5mV0PFzhQrmzY6uaP6nt2vuhVRNEPaon?= =?us-ascii?Q?t/wn2C7MBbMBht1bD38yvt5d1eKt2cfiV4GhhbtjQxaKw1eWFm9s/s0oRXMw?= =?us-ascii?Q?khpewFTUQzRtg39Yxn8ba/vnKKCguoHrN4z4Fyr8RNFWAsN9IFIsWB0UP6EP?= =?us-ascii?Q?S2h5N++k0Pico9d+LmyQGR1lsi5ra2a9U2r2iMK2FIoDx9JCdVlYnDlUEz6I?= =?us-ascii?Q?WtSjQA8GCYMEYBTvlbB+6xJ7j6g1/1DQQ4RNBXE53Fd4UgqF1T5MClfjaPRY?= =?us-ascii?Q?OyuQYTdYKmwIxr82RyuFwOsXry/O3pSHGbrawODB8KI2E1bfDjm35QybcffX?= =?us-ascii?Q?T5smGJAJEWTHBxti8K4q2+MH+Nc6Vx1oNA7GBV07zboO8mPJls+gWqAAbqtd?= =?us-ascii?Q?sbGGo5wFylnaMUNZNailMpsvPi02JmanluzSAqzu6NZbHJ4Qf0sCoCL3XC5F?= =?us-ascii?Q?sg=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b1b11fe-531d-4abb-f242-08da9c73fdba X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2022 08:25:21.9811 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: L2DQevwOSzTPCG9/RrpZLXRHZHFUg31X7gVmhvrjgh588s6DrvGi3tfslGrzZxvJ/+r9cKiGCCn1O6RMfItj67xF3GVrM5VGVWQsSnNApWM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP251MB0470 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] efivar: Fix build issues for glibc-2.36. 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 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 glibc has changed usage conditions of sys/mount.h and linux/mount.h https://github.com/rhboot/efivar/commit/bc65d63ebf8fe6ac8a099ff15ca200986dba1565 Signed-off-by: Christian Melki --- ...x-glibc-2.36-build-mount.h-conflicts.patch | 54 +++++++++++++++++++ patches/efivar-38/series | 3 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 patches/efivar-38/0004-Fix-glibc-2.36-build-mount.h-conflicts.patch diff --git a/patches/efivar-38/0004-Fix-glibc-2.36-build-mount.h-conflicts.patch b/patches/efivar-38/0004-Fix-glibc-2.36-build-mount.h-conflicts.patch new file mode 100644 index 000000000..883e0c780 --- /dev/null +++ b/patches/efivar-38/0004-Fix-glibc-2.36-build-mount.h-conflicts.patch @@ -0,0 +1,54 @@ +From: Robbie Harwood +Date: Thu, 28 Jul 2022 16:11:24 -0400 +Subject: [PATCH] Fix glibc 2.36 build (mount.h conflicts) + +glibc has decided that sys/mount.h and linux/mount.h are no longer +usable at the same time. This broke the build, since linux/fs.h itself +includes linux/mount.h. For now, fix the build by only including +sys/mount.h where we need it. + +See-also: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E +Resolves: #227 +Signed-off-by: Robbie Harwood +--- + src/gpt.c | 1 + + src/linux.c | 1 + + src/util.h | 1 - + 3 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/gpt.c b/src/gpt.c +index 1eda04970314..21413c3b1ad0 100644 +--- a/src/gpt.c ++++ b/src/gpt.c +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/linux.c b/src/linux.c +index 47e45ae46e73..1780816f6343 100644 +--- a/src/linux.c ++++ b/src/linux.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff --git a/src/util.h b/src/util.h +index 3300666f4270..1e67e4476f01 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -23,7 +23,6 @@ + #include + #include + #include +-#include + #include + #include + #include diff --git a/patches/efivar-38/series b/patches/efivar-38/series index 0c17e143b..235881843 100644 --- a/patches/efivar-38/series +++ b/patches/efivar-38/series @@ -3,4 +3,5 @@ 0001-src-Makefile-build-util.c-separately-for-makeguids.patch 0002-docs-Remove-docs-building.patch 0003-fix-building-with-binutils-2.36.patch -# 051f21d7f5a24e87b0ddfd14b98df864 - git-ptx-patches magic +0004-Fix-glibc-2.36-build-mount.h-conflicts.patch +# a80afc43ec18684521a15f0f59588a87 - git-ptx-patches magic -- 2.34.1