commit: 966301a1394d71452359ef78039225076bada734 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jan 1 06:33:28 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jan 1 06:33:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=966301a1
sys-kernel/linux-headers: drop patch in patchset for 5.10 Signed-off-by: Sam James <sam <AT> gentoo.org> ...x-headers-5.10-remove-inclusion-sysinfo.h.patch | 24 ---------------------- .../linux-headers/linux-headers-5.10-r2.ebuild | 1 - 2 files changed, 25 deletions(-) diff --git a/sys-kernel/linux-headers/files/linux-headers-5.10-remove-inclusion-sysinfo.h.patch b/sys-kernel/linux-headers/files/linux-headers-5.10-remove-inclusion-sysinfo.h.patch deleted file mode 100644 index 7f23d77a71a5..000000000000 --- a/sys-kernel/linux-headers/files/linux-headers-5.10-remove-inclusion-sysinfo.h.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://git.alpinelinux.org/aports/tree/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch -https://bugs.gentoo.org/828726 - -From: rofl0r <ret...@gmx.net> -Date: Mon, 20 Jan 2014 21:31:34 +0100 -Subject: [PATCH 3/3] remove inclusion of sysinfo.h in kernel.h - -the declaration of struct sysinfo clashes with userspace. -it's not quite clear why that header was included from kernel.h, -as none of its functionality is needed. ---- a/include/uapi/linux/kernel.h -+++ b/include/uapi/linux/kernel.h -@@ -2,7 +2,9 @@ - #ifndef _UAPI_LINUX_KERNEL_H - #define _UAPI_LINUX_KERNEL_H - -+#ifdef __GLIBC__ - #include <linux/sysinfo.h> -+#endif - #include <linux/const.h> - - #endif /* _UAPI_LINUX_KERNEL_H */ - - diff --git a/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild b/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild index cbacecb5291d..ce31c0eacbdf 100644 --- a/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild +++ b/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild @@ -31,7 +31,6 @@ src_prepare() { if use elibc_musl ; then # TODO: May need forward porting to newer versions eapply "${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch - eapply "${FILESDIR}"/${PN}-5.10-remove-inclusion-sysinfo.h.patch fi default
