[gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-headers/files/, sys-kernel/linux-headers/

[Sam James]

commit:     87dd049078d78e654436f3cb084091ef69376ee8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 31 02:46:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 31 02:50:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87dd0490

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 <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...linux-headers-5.15-remove-inclusion-sysinfo.h.patch | 18 +++++++++---------
 ...ers-5.15-r2.ebuild => linux-headers-5.15-r3.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@×××.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
similarity index 100%
rename from sys-kernel/linux-headers/linux-headers-5.15-r2.ebuild
rename to sys-kernel/linux-headers/linux-headers-5.15-r3.ebuild