From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 28 Sep 2022 16:29:51 +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 1odY4N-00HPYI-VB for lore@lore.pengutronix.de; Wed, 28 Sep 2022 16:29:51 +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 1odY4M-0000sq-VY; Wed, 28 Sep 2022 16:29:50 +0200 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 1odY3U-0008Vm-9v; Wed, 28 Sep 2022 16:28:56 +0200 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 1odY3V-003R4L-0C; Wed, 28 Sep 2022 16:28:55 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1odY3S-00EwKL-3f; Wed, 28 Sep 2022 16:28:54 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 28 Sep 2022 16:28:54 +0200 Message-Id: <20220928142854.3560758-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220922082509.3534544-1-christian.melki@t2data.com> References: <20220922082509.3534544-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] 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 Cc: Christian Melki 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 201f898a82c476c37e7fd9ea61a6618325f04720. Michael [sent from post-receive hook] On Wed, 28 Sep 2022 16:28:53 +0200, Christian Melki wrote: > 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 > Message-Id: <20220922082509.3534544-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > 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 000000000000..883e0c780d37 > --- /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 0c17e143b4c1..2358818434f3 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