1 |
commit: 966301a1394d71452359ef78039225076bada734 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 1 06:33:28 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 1 06:33:28 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=966301a1 |
7 |
|
8 |
sys-kernel/linux-headers: drop patch in patchset for 5.10 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
...x-headers-5.10-remove-inclusion-sysinfo.h.patch | 24 ---------------------- |
13 |
.../linux-headers/linux-headers-5.10-r2.ebuild | 1 - |
14 |
2 files changed, 25 deletions(-) |
15 |
|
16 |
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 |
17 |
deleted file mode 100644 |
18 |
index 7f23d77a71a5..000000000000 |
19 |
--- a/sys-kernel/linux-headers/files/linux-headers-5.10-remove-inclusion-sysinfo.h.patch |
20 |
+++ /dev/null |
21 |
@@ -1,24 +0,0 @@ |
22 |
-https://git.alpinelinux.org/aports/tree/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch |
23 |
-https://bugs.gentoo.org/828726 |
24 |
- |
25 |
-From: rofl0r <retnyg@×××.net> |
26 |
-Date: Mon, 20 Jan 2014 21:31:34 +0100 |
27 |
-Subject: [PATCH 3/3] remove inclusion of sysinfo.h in kernel.h |
28 |
- |
29 |
-the declaration of struct sysinfo clashes with userspace. |
30 |
-it's not quite clear why that header was included from kernel.h, |
31 |
-as none of its functionality is needed. |
32 |
---- a/include/uapi/linux/kernel.h |
33 |
-+++ b/include/uapi/linux/kernel.h |
34 |
-@@ -2,7 +2,9 @@ |
35 |
- #ifndef _UAPI_LINUX_KERNEL_H |
36 |
- #define _UAPI_LINUX_KERNEL_H |
37 |
- |
38 |
-+#ifdef __GLIBC__ |
39 |
- #include <linux/sysinfo.h> |
40 |
-+#endif |
41 |
- #include <linux/const.h> |
42 |
- |
43 |
- #endif /* _UAPI_LINUX_KERNEL_H */ |
44 |
- |
45 |
- |
46 |
|
47 |
diff --git a/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild b/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild |
48 |
index cbacecb5291d..ce31c0eacbdf 100644 |
49 |
--- a/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild |
50 |
+++ b/sys-kernel/linux-headers/linux-headers-5.10-r2.ebuild |
51 |
@@ -31,7 +31,6 @@ src_prepare() { |
52 |
if use elibc_musl ; then |
53 |
# TODO: May need forward porting to newer versions |
54 |
eapply "${FILESDIR}"/${PN}-5.10-Use-stddefs.h-instead-of-compiler.h.patch |
55 |
- eapply "${FILESDIR}"/${PN}-5.10-remove-inclusion-sysinfo.h.patch |
56 |
fi |
57 |
|
58 |
default |