sysvinit: Fix mount.h conflicts seen with glibc 2.36+
PATCH 1/1 sysvinit: Fix mount.h conflicts seen with glibc 2.36+
Signed-off-by Khem Raj <[email protected]>
--- .../sysvinit/sysvinit_remove_linux_fs.patch | 17 +++++++++++++++++ meta/recipes-core/sysvinit/sysvinit_3.04.bb | 1 + 2 files changed, 18 insertions(+) create mode 100644 meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch
meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch new file +17 -0
@@ -0,0 +1,17 @@ +# From glibc 2.36, <linux/mount.h> (included from <linux/fs.h>) and +# <sys/mount.h> (included from glibc) are no longer compatible: +# https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> + +--- sysvinit-3.04/src/sulogin.c.orig 2022-08-07 23:07:42.952576274 +0200 ++++ sysvinit-3.04/src/sulogin.c 2022-08-07 23:08:26.511470983 +0200 +@@ -51,7 +51,6 @@ + #ifdef __linux__ + # include <sys/statfs.h> + # include <sys/mount.h> +-# include <linux/fs.h> + # include <linux/magic.h> + # include <linux/major.h> + # ifndef TMPFS_MAGIC
meta/recipes-core/sysvinit/sysvinit_3.04.bb +1 -0
@@ -15,6 +15,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ file://pidof-add-m-option.patch \ file://realpath.patch \ file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \ + file://sysvinit_remove_linux_fs.patch \ file://rcS-default \ file://rc \ file://rcS \
Signature · 1 line
2.37.1