diff options
| author | Christian Melki <christian.melki@t2data.com> | 2022-09-22 10:25:09 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2022-09-22 17:20:23 +0200 |
| commit | 201f898a82c476c37e7fd9ea61a6618325f04720 (patch) | |
| tree | 6c68524411eafd8cc9e98f5a532b06002737b41b | |
| parent | 2803f56052a2263cbceb4468e127e1ebab2965f4 (diff) | |
| download | ptxdist-201f898a82c476c37e7fd9ea61a6618325f04720.tar.gz ptxdist-201f898a82c476c37e7fd9ea61a6618325f04720.tar.xz | |
efivar: Fix build issues for glibc-2.36.
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 <christian.melki@t2data.com>
Message-Id: <20220922082509.3534544-1-christian.melki@t2data.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/efivar-38/0004-Fix-glibc-2.36-build-mount.h-conflicts.patch | 54 | ||||
| -rw-r--r-- | patches/efivar-38/series | 3 |
2 files changed, 56 insertions, 1 deletions
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 <rharwood@redhat.com> +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 <rharwood@redhat.com> +--- + 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 <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/mount.h> + #include <sys/param.h> + #include <sys/stat.h> + #include <sys/utsname.h> +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 <stdbool.h> + #include <stdio.h> + #include <sys/ioctl.h> ++#include <sys/mount.h> + #include <sys/socket.h> + #include <sys/sysmacros.h> + #include <sys/types.h> +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 <stdio.h> + #include <string.h> + #include <sys/ioctl.h> +-#include <sys/mount.h> + #include <sys/stat.h> + #include <sys/types.h> + #include <tgmath.h> 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 |