sysvinit: Fix build against glibc 2.36

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/sysvinit b/lfs/sysvinit
index 0126b283ee4fbb3670c539590a130030c787cf23..ec0a5c292942e8c5889bfa1f00c0a5ca87307644 100644 (file)
--- a/lfs/sysvinit
+++ b/lfs/sysvinit
@@ -73,6 +73,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Newer C libraries omit this include from sys/types.h.
        # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysvinit-2.98_build_mountpoint.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch
        cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \
                -e "/include.*sys\/stat.h/a#include <sys/sysmacros.h>\n"
        cd $(DIR_APP) && sed -e "s/libcrypt.a/libcrypt.so/g" -i src/Makefile

diff --git a/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch b/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch
new file mode 100644 (file)
index 0000000..ee6f621
--- /dev/null
+++ b/src/patches/sysvinit-3.00-fix-glibc-2.36-headers.patch
@@ -0,0 +1,10 @@
+--- sysvinit-3.00/src/sulogin.c~       2022-08-09 09:43:41.993484098 +0000
++++ sysvinit-3.00/src/sulogin.c        2022-08-09 09:45:04.897252500 +0000
+@@ -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