commit: 2960f84da706a4e1bfb9273542d3f8bb216adb64 Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Thu Jul 11 18:03:23 2019 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Thu Jul 11 18:03:23 2019 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2960f84d
sys-kernel/linux-headers: Version bump, cleanup patches Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> sys-kernel/linux-headers/Manifest | 2 + .../files/libc-4.16-portability.patch | 13 ------ ...bc-5.1-cleanup-portability-for-non-glibc.patch} | 33 +++++++-------- .../libc-5.1-remove-sysinfo_h-from-kernel_h.patch | 32 +++++++++++++++ sys-kernel/linux-headers/linux-headers-5.1.ebuild | 47 ++++++++++++++++++++++ 5 files changed, 98 insertions(+), 29 deletions(-) diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest index 87fa4bc..591954d 100644 --- a/sys-kernel/linux-headers/Manifest +++ b/sys-kernel/linux-headers/Manifest @@ -6,6 +6,7 @@ DIST gentoo-headers-4.18-1.tar.xz 4040 BLAKE2B fc4462bc8e59a58658c6bd2669840d710 DIST gentoo-headers-4.19-1.tar.xz 4040 BLAKE2B 4ccaf4fb6bde84f0b1f29534cf2f6effca48cb81d63b33086a1ec667069bcb57a3c3d5697c50bff8521343954d01d9c27139d62a9cf2c9f5f12bc0461441f4af SHA512 511accdfd104d9cc84b568132f1eb822f97d35120a438768c313c2cc2651197414dae7af05db81e26b32fb4febbf1e0812030fcb98395f6f65271f6605dc7bb6 DIST gentoo-headers-4.20-1.tar.xz 4040 BLAKE2B 05f8cae4014a6f0ad926e704d5272b05228b91e29a4e14269695cd665110c054a69f0ecab5dec5d23c430cce0726aa7c5c34c85edde0df34dd0e7f8dd5ff7cb6 SHA512 19fa005b648e7dead85edc1b779595c392c28b4699cc4352e6996bbe37fb49de4d2d6b632303338e4db99a4e2e01b56ba1f3777646a416358dc509fb15623f99 DIST gentoo-headers-5.0-1.tar.xz 4040 BLAKE2B e26c8a76207603b96c63ef556e10d88cf549a318f89b5d07f0f37ac4f50625d0d17b794f8904e0cb35fb2074b3b09ee5fc09a1855779790da6e9fe569017e094 SHA512 51aeb2c5b6e232a193ead486a85b148f59c378d4208a2aecfa6647272fdf248705ce37b7d22baf84b688bbcfa283d16031757b7cd3952d739ef9c20ae71bd615 +DIST gentoo-headers-5.1-1.tar.xz 4040 BLAKE2B 556faf2b2ef4dd0ccfc6bbf884e41a3ca0645d4e762121fe22f79950ca20ab07ab7c6179c022107c81b072a4bc1e4c70a750e837a371a9937df8d1bed3e751f6 SHA512 df56638d4b4971ee1cec7355a23bfe125cc6baeece8579ef4b0cd79b5c4015eb7593525815eba55d4a3b30f007c1be499a6b5aefab533ccc564406fe40e1a337 DIST gentoo-headers-base-4.14.tar.xz 8017944 BLAKE2B e967a3f26fa002f62af72c165cf960e855f5d84dd105b3f136e5ae24f4cdfc9e5f8b217a83955b325ca4bd6bda0a9d4c4de02d8d79fd4aa72191bc63db96183a SHA512 2a4e83a9ee36ffa85b59ebac1e12f4f1c572825b767928a42c4748d924d04f0536bab4d9375ca68c11ad867c226f386c40c7c4d0158d1ab00c838eb5b2f9f21a DIST gentoo-headers-base-4.15.tar.xz 8199628 BLAKE2B 79a4f694a8335ed4bf1df94ab7829f41d3476165d0ce822a13e47461d7e3ee4cdb5e88acb9960a92ba1142adeb9951c19e17405c37b80d461b8577c7d1dfa37a SHA512 7698ae90e356cb6105d3b1fc5351264774428b5caa405e8695925965ab2ff3a08c0dfe3587a69a87405ecc45c6cd3040c3a9f751d6e6dc8eddf8b28ded4e2584 DIST gentoo-headers-base-4.16-r1.tar.xz 8227040 BLAKE2B 95b2d64a614430e49d849ab54c58cbc3a850faea1bb5d9f7f43733d7b745ceb5ea3d1f8cc4dbb36c20797ae7d10bd736b99d17f5bfd0cdb90ecedb4eeb0f8610 SHA512 9b7cc82a322bd43dbf07c63d465200c87b838252e449028a363f3ff10921fe3889b503f20184168c7413d792c3d33b4324d89c89b95c8143a4a3c9c3e7e2d28e @@ -14,3 +15,4 @@ DIST gentoo-headers-base-4.18.tar.xz 7878256 BLAKE2B 9a97fed9ae4d16af57bb4aa069c DIST gentoo-headers-base-4.19.tar.xz 7956220 BLAKE2B 5b6868188b6cb505556b8f307972be6b27c0201e8287f6a2c4d0ac8bf16cfe048cb05afacf879731ba81de5e2a8c5afc4adad007e00b12efb8b2a158a666f4dd SHA512 ef0f159cb31651bf8e00c31d8ac807e64413c7bf88807e1ab4779524db10eec4726b65af0fad034a0cb2e000cd61a6008bcc174828061ffaf633c170dd09645c DIST gentoo-headers-base-4.20.tar.xz 8041716 BLAKE2B 09e95aedfd4288fb27ad6c1e4f53992d205e9402efb315a8c764a2836ba856c7ec3f509d30c21e656e1ca9fdeb4530d807a10e0a74e3510c8e90aa82b222bafe SHA512 705c0cf3244039ef319002f17ea702fa91673eac6bb6a790c8451cad1f16951328e1ca1e3d26043708fcdc78bfaa1ff065322947e23b41c4acb9ed2b8acba427 DIST gentoo-headers-base-5.0-bug-679630.tar.xz 8102772 BLAKE2B b5ee691936b704133373027618b8a281371ee9ebbf6166b33af427d733e48ba3a9ea3f2d7be370b76769d6cae9cff01727d519a21789fcd95cee14d8cb285bf0 SHA512 59ef893a397a75bc0a87653de79be3bfbe12a952b325a679a940b0f59ecc853b3ffbed9a8c7eced81a082c3ba4471c9429841b52d8c64c6d49c69f727314f192 +DIST linux-5.1.tar.xz 106244476 BLAKE2B ae3c63ced819737e34f8ec3a78138f87704a2f2956454411e3a4830ec8c0aaf2c288af6ca080f1892540e50f4a422482360010be8641afdeeeaf7231e7d8da97 SHA512 ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236 diff --git a/sys-kernel/linux-headers/files/libc-4.16-portability.patch b/sys-kernel/linux-headers/files/libc-4.16-portability.patch index 9828411..abc6935 100644 --- a/sys-kernel/linux-headers/files/libc-4.16-portability.patch +++ b/sys-kernel/linux-headers/files/libc-4.16-portability.patch @@ -1,16 +1,3 @@ -diff -Naur gentoo-headers-base-4.16.orig/include/uapi/linux/kernel.h gentoo-headers-base-4.16/include/uapi/linux/kernel.h ---- gentoo-headers-base-4.16.orig/include/uapi/linux/kernel.h 2018-04-04 23:45:32.000000000 -0700 -+++ gentoo-headers-base-4.16/include/uapi/linux/kernel.h 2018-04-08 17:51:18.477168271 -0700 -@@ -2,7 +2,9 @@ - #ifndef _UAPI_LINUX_KERNEL_H - #define _UAPI_LINUX_KERNEL_H - -+#ifdef __GLIBC__ - #include <linux/sysinfo.h> -+#endif - - /* - * 'kernel.h' contains some often-used function prototypes etc diff -Naur gentoo-headers-base-4.16.orig/include/uapi/linux/libc-compat.h gentoo-headers-base-4.16/include/uapi/linux/libc-compat.h --- gentoo-headers-base-4.16.orig/include/uapi/linux/libc-compat.h 2018-04-04 23:45:32.000000000 -0700 +++ gentoo-headers-base-4.16/include/uapi/linux/libc-compat.h 2018-04-08 17:53:43.004162639 -0700 diff --git a/sys-kernel/linux-headers/files/libc-4.16-portability.patch b/sys-kernel/linux-headers/files/libc-5.1-cleanup-portability-for-non-glibc.patch similarity index 85% copy from sys-kernel/linux-headers/files/libc-4.16-portability.patch copy to sys-kernel/linux-headers/files/libc-5.1-cleanup-portability-for-non-glibc.patch index 9828411..2c4695d 100644 --- a/sys-kernel/linux-headers/files/libc-4.16-portability.patch +++ b/sys-kernel/linux-headers/files/libc-5.1-cleanup-portability-for-non-glibc.patch @@ -1,19 +1,17 @@ -diff -Naur gentoo-headers-base-4.16.orig/include/uapi/linux/kernel.h gentoo-headers-base-4.16/include/uapi/linux/kernel.h ---- gentoo-headers-base-4.16.orig/include/uapi/linux/kernel.h 2018-04-04 23:45:32.000000000 -0700 -+++ gentoo-headers-base-4.16/include/uapi/linux/kernel.h 2018-04-08 17:51:18.477168271 -0700 -@@ -2,7 +2,9 @@ - #ifndef _UAPI_LINUX_KERNEL_H - #define _UAPI_LINUX_KERNEL_H - -+#ifdef __GLIBC__ - #include <linux/sysinfo.h> -+#endif - - /* - * 'kernel.h' contains some often-used function prototypes etc -diff -Naur gentoo-headers-base-4.16.orig/include/uapi/linux/libc-compat.h gentoo-headers-base-4.16/include/uapi/linux/libc-compat.h ---- gentoo-headers-base-4.16.orig/include/uapi/linux/libc-compat.h 2018-04-04 23:45:32.000000000 -0700 -+++ gentoo-headers-base-4.16/include/uapi/linux/libc-compat.h 2018-04-08 17:53:43.004162639 -0700 +From 92982d8d0757a991d2dcf9a872d97a79969b611a Mon Sep 17 00:00:00 2001 +From: Jory Pratt <[email protected]> +Date: Thu, 11 Jul 2019 12:45:59 -0500 +Subject: [PATCH 2/2] Cleanup for portability with non GLIBC systems + +Signed-off-by: Jory Pratt <[email protected]> +--- + include/uapi/linux/libc-compat.h | 57 ++++++++++++++++++-------------- + 1 file changed, 32 insertions(+), 25 deletions(-) + +diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h +index 8254c937c9f4..233069447934 100644 +--- a/include/uapi/linux/libc-compat.h ++++ b/include/uapi/linux/libc-compat.h @@ -49,47 +49,57 @@ #ifndef _UAPI_LIBC_COMPAT_H #define _UAPI_LIBC_COMPAT_H @@ -157,3 +155,6 @@ diff -Naur gentoo-headers-base-4.16.orig/include/uapi/linux/libc-compat.h gentoo +#endif /* defined(__KERNEL__) */ #endif /* _UAPI_LIBC_COMPAT_H */ +-- +2.22.0 + diff --git a/sys-kernel/linux-headers/files/libc-5.1-remove-sysinfo_h-from-kernel_h.patch b/sys-kernel/linux-headers/files/libc-5.1-remove-sysinfo_h-from-kernel_h.patch new file mode 100644 index 0000000..969d528 --- /dev/null +++ b/sys-kernel/linux-headers/files/libc-5.1-remove-sysinfo_h-from-kernel_h.patch @@ -0,0 +1,32 @@ +From 9915d8ad785a80f0ef798dbe5f14d67a1c098d24 Mon Sep 17 00:00:00 2001 +From: rofl0r <[email protected]> +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. + +Signed-off-by: Khem Raj <[email protected]> +Upstream-Status: Submitted +--- + include/uapi/linux/kernel.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h +index 0ff8f7477847..b2d59deef093 100644 +--- 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 + + /* + * 'kernel.h' contains some often-used function prototypes etc +-- +2.22.0 + diff --git a/sys-kernel/linux-headers/linux-headers-5.1.ebuild b/sys-kernel/linux-headers/linux-headers-5.1.ebuild new file mode 100644 index 0000000..cefeccf --- /dev/null +++ b/sys-kernel/linux-headers/linux-headers-5.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +ETYPE="headers" +H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc x86 xtensa" +inherit kernel-2 +detect_version + +PATCH_VER="1" +SRC_URI="${KERNEL_URI} + ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz} + ${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz} +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + +DEPEND="app-arch/xz-utils + dev-lang/perl" +RDEPEND="" + +S=${WORKDIR}/linux-${PV} + +src_unpack() { + unpack ${A} +} + +src_prepare() { + default + + [[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PV}/*.patch + eapply "${FILESDIR}"/libc-5.1-remove-sysinfo_h-from-kernel_h.patch + eapply "${FILESDIR}"/libc-5.1-cleanup-portability-for-non-glibc.patch +} + +src_install() { + kernel-2_src_install + + # hrm, build system sucks + find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete + find "${ED}" -depth -type d -delete 2>/dev/null +} + +src_test() { + emake ARCH=$(tc-arch-kernel) headers_check +}
