diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-08-09 00:32:16 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-12 19:22:04 +0100 |
commit | a0402e7822228241130e79133bca38f9f4a62043 (patch) | |
tree | 4482ed1af7736c969cd7b88edb0c4d4bd1bf78fc /meta/recipes-core/sysvinit/sysvinit | |
parent | 483f285c4de1272fec799c247cec4ba010db34d5 (diff) | |
download | poky-a0402e7822228241130e79133bca38f9f4a62043.tar.gz |
sysvinit: Fix mount.h conflicts seen with glibc 2.36+
(From OE-Core rev: 938e6452974e0700f2fc2f070c76484aec05a910)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/sysvinit/sysvinit')
-rw-r--r-- | meta/recipes-core/sysvinit/sysvinit/sysvinit_remove_linux_fs.patch | 17 |
1 files changed, 17 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 | ||