diff options
| author |   Sam James <sam@gentoo.org> | 2021-12-31 02:46:44 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-12-31 02:50:00 +0000 |
| commit | 87dd049078d78e654436f3cb084091ef69376ee8 (patch) | |
| tree | df3e1582b54d2c5d3b3db2c9d9270c7b263193fe /sys-kernel/linux-headers | |
| parent | app-misc/banner: drop project desktop-misc (diff) | |
| download | gentoo-87dd049078d78e654436f3cb084091ef69376ee8.tar.gz gentoo-87dd049078d78e654436f3cb084091ef69376ee8.tar.bz2 gentoo-87dd049078d78e654436f3cb084091ef69376ee8.zip | |
sys-kernel/linux-headers: fix 5.15 patch
We don't need to drop the const bit, avoids us patching consumers.
Thanks-to: Jory A. Pratt <anarchy@gentoo.org>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-kernel/linux-headers')
| -rw-r--r-- | sys-kernel/linux-headers/files/linux-headers-5.15-remove-inclusion-sysinfo.h.patch | 18 | ||||
| -rw-r--r-- | sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild (renamed from sys-kernel/linux-headers/linux-headers-5.15-r2.ebuild) | 0 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys-kernel/linux-headers/files/linux-headers-5.15-remove-inclusion-sysinfo.h.patch b/sys-kernel/linux-headers/files/linux-headers-5.15-remove-inclusion-sysinfo.h.patch index 064066f19ef6..11760b93227c 100644 --- a/sys-kernel/linux-headers/files/linux-headers-5.15-remove-inclusion-sysinfo.h.patch +++ b/sys-kernel/linux-headers/files/linux-headers-5.15-remove-inclusion-sysinfo.h.patch @@ -1,6 +1,8 @@ -Earlier version: https://git.alpinelinux.org/aports/tree/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch +https://git.alpinelinux.org/aports/tree/main/linux-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch https://bugs.gentoo.org/828726 +[Adapted to drop the const.h change as things may rely on it like btrfs.] + From: rofl0r <retnyg@gmx.net> Date: Mon, 20 Jan 2014 21:31:34 +0100 Subject: [PATCH 3/3] remove inclusion of sysinfo.h in kernel.h @@ -8,17 +10,15 @@ 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 +@@ -4,7 +4,7 @@ -+#ifdef __GLIBC__ + #ifdef __GLIBC__ #include <linux/sysinfo.h> - #include <linux/const.h> -+#endif +-#include <linux/const.h> + #endif ++#include <linux/const.h> #endif /* _UAPI_LINUX_KERNEL_H */ - - diff --git a/sys-kernel/linux-headers/linux-headers-5.15-r2.ebuild b/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild index 7fc09552f9bc..7fc09552f9bc 100644 --- a/sys-kernel/linux-headers/linux-headers-5.15-r2.ebuild +++ b/sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild |