diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch | 17 | ||||
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit_3.04.bb | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch b/meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch new file mode 100644 index 0000000000..89d65c23b7 --- /dev/null +++ b/meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | # From glibc 2.36, <linux/mount.h> (included from <linux/fs.h>) and | ||
2 | # <sys/mount.h> (included from glibc) are no longer compatible: | ||
3 | # https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | |||
8 | --- sysvinit-3.04/src/sulogin.c.orig 2022-08-07 23:07:42.952576274 +0200 | ||
9 | +++ sysvinit-3.04/src/sulogin.c 2022-08-07 23:08:26.511470983 +0200 | ||
10 | @@ -51,7 +51,6 @@ | ||
11 | #ifdef __linux__ | ||
12 | # include <sys/statfs.h> | ||
13 | # include <sys/mount.h> | ||
14 | -# include <linux/fs.h> | ||
15 | # include <linux/magic.h> | ||
16 | # include <linux/major.h> | ||
17 | # ifndef TMPFS_MAGIC | ||
diff --git a/meta/recipes-core/sysvinit/sysvinit_3.04.bb b/meta/recipes-core/sysvinit/sysvinit_3.04.bb index f678f65c1e..76b187c196 100644 --- a/meta/recipes-core/sysvinit/sysvinit_3.04.bb +++ b/meta/recipes-core/sysvinit/sysvinit_3.04.bb | |||
@@ -15,6 +15,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/sysvinit/sysvinit-${PV}.tar.xz \ | |||
15 | file://pidof-add-m-option.patch \ | 15 | file://pidof-add-m-option.patch \ |
16 | file://realpath.patch \ | 16 | file://realpath.patch \ |
17 | file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \ | 17 | file://0001-include-sys-sysmacros.h-for-major-minor-defines-in-g.patch \ |
18 | file://sysvinit_remove_linux_fs.patch \ | ||
18 | file://rcS-default \ | 19 | file://rcS-default \ |
19 | file://rc \ | 20 | file://rc \ |
20 | file://rcS \ | 21 | file://rcS \ |