From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B970B138350 for ; Mon, 4 May 2020 02:05:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 880C8E0885; Mon, 4 May 2020 02:05:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EE5AE0885 for ; Mon, 4 May 2020 02:05:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DBC1534F441 for ; Mon, 4 May 2020 02:05:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D1491F6 for ; Mon, 4 May 2020 02:05:30 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1588557753.980e1ba4c1636b97bcea88710e2202945512c203.anarchy@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: sys-kernel/linux-headers/files/, sys-kernel/linux-headers/ X-VCS-Repository: proj/musl X-VCS-Files: sys-kernel/linux-headers/Manifest sys-kernel/linux-headers/files/libc-4.15-portability.patch sys-kernel/linux-headers/files/libc-4.16-portability.patch sys-kernel/linux-headers/files/libc-4.3-portability.patch sys-kernel/linux-headers/files/libc-4.8-portability.patch sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild sys-kernel/linux-headers/linux-headers-4.15-r1.ebuild sys-kernel/linux-headers/linux-headers-4.16-r2.ebuild sys-kernel/linux-headers/linux-headers-4.17.ebuild sys-kernel/linux-headers/linux-headers-4.18.ebuild sys-kernel/linux-headers/linux-headers-4.19.ebuild sys-kernel/linux-headers/linux-headers-4.20.ebuild sys-kernel/linux-headers/metadata.xml X-VCS-Directories: sys-kernel/linux-headers/files/ sys-kernel/linux-headers/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 980e1ba4c1636b97bcea88710e2202945512c203 X-VCS-Branch: master Date: Mon, 4 May 2020 02:05:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3f43da4c-a798-47bd-9b17-80fa82df376b X-Archives-Hash: 65076b3b9302b3418f45500dcee741fa commit: 980e1ba4c1636b97bcea88710e2202945512c203 Author: Jory Pratt gentoo org> AuthorDate: Mon May 4 02:02:33 2020 +0000 Commit: Jory Pratt gentoo org> CommitDate: Mon May 4 02:02:33 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=980e1ba4 sys-kernel/linux-headers: moved to 5.4::gentoo, current stable Signed-off-by: Jory Pratt gentoo.org> sys-kernel/linux-headers/Manifest | 14 -- .../files/libc-4.15-portability.patch | 165 ------------------- .../files/libc-4.16-portability.patch | 146 ----------------- .../linux-headers/files/libc-4.3-portability.patch | 120 -------------- .../linux-headers/files/libc-4.8-portability.patch | 176 --------------------- .../linux-headers/linux-headers-4.14-r1.ebuild | 58 ------- .../linux-headers/linux-headers-4.15-r1.ebuild | 58 ------- .../linux-headers/linux-headers-4.16-r2.ebuild | 61 ------- sys-kernel/linux-headers/linux-headers-4.17.ebuild | 58 ------- sys-kernel/linux-headers/linux-headers-4.18.ebuild | 61 ------- sys-kernel/linux-headers/linux-headers-4.19.ebuild | 61 ------- sys-kernel/linux-headers/linux-headers-4.20.ebuild | 61 ------- sys-kernel/linux-headers/metadata.xml | 11 -- 13 files changed, 1050 deletions(-) diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest deleted file mode 100644 index 139a59c..0000000 --- a/sys-kernel/linux-headers/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -DIST gentoo-headers-4.14-1.tar.xz 4080 BLAKE2B 5d8bb4453d3b0b739922a86e0e45120fe5ad57c3310ff6a94830a3a7561fb3b5eef7805ff171bdf0d5582fc91848fad948162e63ec4922280c8ed68ba58d50e1 SHA512 e0f806db641c99f3f71e27fde29705685745c9c03b901c943cab5af84e2e9c3af96f5d2d10d8f5328ec7e4dba28b378f534317bf1bee597d429557b981f0a865 -DIST gentoo-headers-4.15-1.tar.xz 4068 BLAKE2B fc99b99637a11dc0cc6b4d79be3e32242f4b4f3c86a4618b3a51839e902ebad045b335f531ca41c10a6a597111f2cf77a0ae17518fb17a8441b26f1bd98c19e7 SHA512 cb973625381ac0115344d9aa1ddd927d75f0c11961526844a9da6a0aebcd28b488a7af3b423ac8358808d998d9d00d51156780905a04c01c6c512215cad6de7d -DIST gentoo-headers-4.16-1.tar.xz 4044 BLAKE2B c35efb14266d7d7f06de79f584c6e13a700c38793d7df399e668d5de269088d8a441a10e9d0b7acc5b6d1a116343d516aba58a4823cf51845fe9913dea81cb76 SHA512 a1fdf775bc27e5db2ccf1f86f12e78a25a4127673eb0a87639d548dc6246b81e5df0e8d56c0314ba833fe82d2825f8620addd408782e2f5152fb0b056b870d7c -DIST gentoo-headers-4.17-1.tar.xz 4072 BLAKE2B 7de125ac87b0344a5ff7dfbbe3d15d62cd3364116750e35b72d9e404512267a497df1ce8c52df0ba97c836df68287fe239bf29fec25d43b11be67aa17833c097 SHA512 0a837b227b7e923232438f1961535fc9becb6ed4c95290da76631489ce318a875bd3cd12ec110dedf77026c5cb9761cf8ae5c9fcf2abd736f0f7b7249228efdd -DIST gentoo-headers-4.18-1.tar.xz 4040 BLAKE2B fc4462bc8e59a58658c6bd2669840d7105f6bcde5e7cc2633f53ae4aaf44a67aebef24d944d9d3edb95abb4110ddeeb86a6fc0cbebcf6cbe23b59b97c16a0daf SHA512 8f58df3a5e5bf26e06c300354ec1e468f40593601e6645dc1b51491f5a678020598c1c72f72e616b499f503d98da4d4bf9cdf804a15cac73f51b7877756dd7fb -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-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 -DIST gentoo-headers-base-4.17.tar.xz 7908432 BLAKE2B b0f39145db10dba1998e3facfb0565dd240ba26ce4b2744cfaaca8cfa2890f70a69cf65464163e053a05b0bf4d464f251d90f1cc266de604da2f8dc0889b34c3 SHA512 4d1f8f7a392a8ffdd1144c1d3126473f91cddfe1f750e9c7916e75aec4c571c1c3d2508c0967db12d8ed3e27623c8b2a5e2a47ff1710d55fbba91a84ec8434d4 -DIST gentoo-headers-base-4.18.tar.xz 7878256 BLAKE2B 9a97fed9ae4d16af57bb4aa069cceeb357ca79314ab57b6fbaec0dde75f9504b166a3b0017582bc00fc10b74298fcd4468332ef210e90e1e3daa4681b88e45f2 SHA512 c623b3962fe06150ecad60fa6c7c89e0ad83fad4c8886513f9948352ce0044420d8eb8ccdaa08f7bc957b892472041dd42709fbf396c93a0d0292ff7edbc713e -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 diff --git a/sys-kernel/linux-headers/files/libc-4.15-portability.patch b/sys-kernel/linux-headers/files/libc-4.15-portability.patch deleted file mode 100644 index 09af412..0000000 --- a/sys-kernel/linux-headers/files/libc-4.15-portability.patch +++ /dev/null @@ -1,165 +0,0 @@ -diff -Naur gentoo-headers-base-4.15.orig/include/uapi/linux/kernel.h gentoo-headers-base-4.15/include/uapi/linux/kernel.h ---- gentoo-headers-base-4.15.orig/include/uapi/linux/kernel.h 2018-01-29 21:22:19.000000000 -0800 -+++ gentoo-headers-base-4.15/include/uapi/linux/kernel.h 2018-01-30 13:05:03.399378810 -0800 -@@ -2,7 +2,9 @@ - #ifndef _UAPI_LINUX_KERNEL_H - #define _UAPI_LINUX_KERNEL_H - -+#ifdef __GLIBC__ - #include -+#endif - - /* - * 'kernel.h' contains some often-used function prototypes etc -diff -Naur gentoo-headers-base-4.15.orig/include/uapi/linux/libc-compat.h gentoo-headers-base-4.15/include/uapi/linux/libc-compat.h ---- gentoo-headers-base-4.15.orig/include/uapi/linux/libc-compat.h 2018-01-29 21:22:19.000000000 -0800 -+++ gentoo-headers-base-4.15/include/uapi/linux/libc-compat.h 2018-01-30 13:14:11.470368995 -0800 -@@ -49,47 +49,57 @@ - #ifndef _UAPI_LIBC_COMPAT_H - #define _UAPI_LIBC_COMPAT_H - --/* We have included glibc headers... */ --#if defined(__GLIBC__) -+/* We're used from userspace... */ -+#if !defined(__KERNEL__) - --/* Coordinate with glibc net/if.h header. */ -+/* Coordinate with libc net/if.h header. */ - #if defined(_NET_IF_H) && defined(__USE_MISC) - --/* GLIBC headers included first so don't define anything -+/* libc headers included first so don't define anything - * that would already be defined. */ - - #define __UAPI_DEF_IF_IFCONF 0 - #define __UAPI_DEF_IF_IFMAP 0 - #define __UAPI_DEF_IF_IFNAMSIZ 0 - #define __UAPI_DEF_IF_IFREQ 0 --/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 --/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+#if !defined(__GLIBC__) -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 -+#else - #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 - #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ -+#endif /* !defined(__GLIBC__) */ - - #else /* _NET_IF_H */ - - /* Linux headers included first, and we must define everything -- * we need. The expectation is that glibc will check the -+ * we need. The expectation is that libc will check the - * __UAPI_DEF_* defines and adjust appropriately. */ - - #define __UAPI_DEF_IF_IFCONF 1 - #define __UAPI_DEF_IF_IFMAP 1 - #define __UAPI_DEF_IF_IFNAMSIZ 1 - #define __UAPI_DEF_IF_IFREQ 1 --/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 --/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 - - #endif /* _NET_IF_H */ - --/* Coordinate with glibc netinet/in.h header. */ -+/* Coordinate with libc netinet/if_ether.h */ -+#ifdef _NETINET_IF_ETHER_H -+#define __UAPI_DEF_ETHHDR 0 -+#else -+/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif /* _NETINET_IF_ETHER_H */ -+ -+/* Coordinate with libc netinet/in.h header. */ - #if defined(_NETINET_IN_H) - --/* GLIBC headers included first so don't define anything -+/* libc headers included first so don't define anything - * that would already be defined. */ - #define __UAPI_DEF_IN_ADDR 0 - #define __UAPI_DEF_IN_IPPROTO 0 -@@ -99,15 +109,7 @@ - #define __UAPI_DEF_IN_CLASS 0 - - #define __UAPI_DEF_IN6_ADDR 0 --/* The exception is the in6_addr macros which must be defined -- * if the glibc code didn't define them. This guard matches -- * the guard in glibc/inet/netinet/in.h which defines the -- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ --#if defined(__USE_MISC) || defined (__USE_GNU) - #define __UAPI_DEF_IN6_ADDR_ALT 0 --#else --#define __UAPI_DEF_IN6_ADDR_ALT 1 --#endif - #define __UAPI_DEF_SOCKADDR_IN6 0 - #define __UAPI_DEF_IPV6_MREQ 0 - #define __UAPI_DEF_IPPROTO_V6 0 -@@ -118,7 +120,7 @@ - #else - - /* Linux headers included first, and we must define everything -- * we need. The expectation is that glibc will check the -+ * we need. The expectation is that libc will check the - * __UAPI_DEF_* defines and adjust appropriately. */ - #define __UAPI_DEF_IN_ADDR 1 - #define __UAPI_DEF_IN_IPPROTO 1 -@@ -128,7 +130,7 @@ - #define __UAPI_DEF_IN_CLASS 1 - - #define __UAPI_DEF_IN6_ADDR 1 --/* We unconditionally define the in6_addr macros and glibc must -+/* We unconditionally define the in6_addr macros and libc must - * coordinate. */ - #define __UAPI_DEF_IN6_ADDR_ALT 1 - #define __UAPI_DEF_SOCKADDR_IN6 1 -@@ -170,7 +172,7 @@ - * or we are being included in the kernel, then define everything - * that we need. Check for previous __UAPI_* definitions to give - * unsupported C libraries a way to opt out of any kernel definition. */ --#else /* !defined(__GLIBC__) */ -+#else /* defined(__KERNEL) */ - - /* Definitions for if.h */ - #ifndef __UAPI_DEF_IF_IFCONF -@@ -185,15 +187,20 @@ - #ifndef __UAPI_DEF_IF_IFREQ - #define __UAPI_DEF_IF_IFREQ 1 - #endif --/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ - #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 - #endif --/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ - #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 - #endif - -+/* Definitions for if_ether.h */ -+/* allow libcs like musl to deactivate this, glibc does not implement this. */ -+#ifndef __UAPI_DEF_ETHHDR -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* Definitions for in.h */ - #ifndef __UAPI_DEF_IN_ADDR - #define __UAPI_DEF_IN_ADDR 1 -@@ -262,12 +269,6 @@ - #define __UAPI_DEF_XATTR 1 - #endif - --#endif /* __GLIBC__ */ -- --/* Definitions for if_ether.h */ --/* allow libcs like musl to deactivate this, glibc does not implement this. */ --#ifndef __UAPI_DEF_ETHHDR --#define __UAPI_DEF_ETHHDR 1 --#endif -+#endif /* defined(__KERNEL__) */ - - #endif /* _UAPI_LIBC_COMPAT_H */ diff --git a/sys-kernel/linux-headers/files/libc-4.16-portability.patch b/sys-kernel/linux-headers/files/libc-4.16-portability.patch deleted file mode 100644 index abc6935..0000000 --- a/sys-kernel/linux-headers/files/libc-4.16-portability.patch +++ /dev/null @@ -1,146 +0,0 @@ -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 -@@ -49,47 +49,57 @@ - #ifndef _UAPI_LIBC_COMPAT_H - #define _UAPI_LIBC_COMPAT_H - --/* We have included glibc headers... */ --#if defined(__GLIBC__) -+/* We're used from userspace... */ -+#if !defined(__KERNEL__) - --/* Coordinate with glibc net/if.h header. */ -+/* Coordinate with libc net/if.h header. */ - #if defined(_NET_IF_H) && defined(__USE_MISC) - --/* GLIBC headers included first so don't define anything -+/* libc headers included first so don't define anything - * that would already be defined. */ - - #define __UAPI_DEF_IF_IFCONF 0 - #define __UAPI_DEF_IF_IFMAP 0 - #define __UAPI_DEF_IF_IFNAMSIZ 0 - #define __UAPI_DEF_IF_IFREQ 0 --/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 --/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+#if !defined(__GLIBC__) -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 -+#else - #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 - #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ -+#endif /* !defined(__GLIBC__) */ - - #else /* _NET_IF_H */ - - /* Linux headers included first, and we must define everything -- * we need. The expectation is that glibc will check the -+ * we need. The expectation is that libc will check the - * __UAPI_DEF_* defines and adjust appropriately. */ - - #define __UAPI_DEF_IF_IFCONF 1 - #define __UAPI_DEF_IF_IFMAP 1 - #define __UAPI_DEF_IF_IFNAMSIZ 1 - #define __UAPI_DEF_IF_IFREQ 1 --/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 --/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 - - #endif /* _NET_IF_H */ - --/* Coordinate with glibc netinet/in.h header. */ -+/* Coordinate with libc netinet/if_ether.h */ -+#ifdef _NETINET_IF_ETHER_H -+#define __UAPI_DEF_ETHHDR 0 -+#else -+/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif /* _NETINET_IF_ETHER_H */ -+ -+/* Coordinate with libc netinet/in.h header. */ - #if defined(_NETINET_IN_H) - --/* GLIBC headers included first so don't define anything -+/* libc headers included first so don't define anything - * that would already be defined. */ - #define __UAPI_DEF_IN_ADDR 0 - #define __UAPI_DEF_IN_IPPROTO 0 -@@ -99,15 +109,7 @@ - #define __UAPI_DEF_IN_CLASS 0 - - #define __UAPI_DEF_IN6_ADDR 0 --/* The exception is the in6_addr macros which must be defined -- * if the glibc code didn't define them. This guard matches -- * the guard in glibc/inet/netinet/in.h which defines the -- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ --#if defined(__USE_MISC) || defined (__USE_GNU) - #define __UAPI_DEF_IN6_ADDR_ALT 0 --#else --#define __UAPI_DEF_IN6_ADDR_ALT 1 --#endif - #define __UAPI_DEF_SOCKADDR_IN6 0 - #define __UAPI_DEF_IPV6_MREQ 0 - #define __UAPI_DEF_IPPROTO_V6 0 -@@ -118,7 +120,7 @@ - #else - - /* Linux headers included first, and we must define everything -- * we need. The expectation is that glibc will check the -+ * we need. The expectation is that libc will check the - * __UAPI_DEF_* defines and adjust appropriately. */ - #define __UAPI_DEF_IN_ADDR 1 - #define __UAPI_DEF_IN_IPPROTO 1 -@@ -128,7 +130,7 @@ - #define __UAPI_DEF_IN_CLASS 1 - - #define __UAPI_DEF_IN6_ADDR 1 --/* We unconditionally define the in6_addr macros and glibc must -+/* We unconditionally define the in6_addr macros and libc must - * coordinate. */ - #define __UAPI_DEF_IN6_ADDR_ALT 1 - #define __UAPI_DEF_SOCKADDR_IN6 1 -@@ -170,7 +172,7 @@ - * or we are being included in the kernel, then define everything - * that we need. Check for previous __UAPI_* definitions to give - * unsupported C libraries a way to opt out of any kernel definition. */ --#else /* !defined(__GLIBC__) */ -+#else /* defined(__KERNEL) */ - - /* Definitions for if.h */ - #ifndef __UAPI_DEF_IF_IFCONF -@@ -185,15 +187,20 @@ - #ifndef __UAPI_DEF_IF_IFREQ - #define __UAPI_DEF_IF_IFREQ 1 - #endif --/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ - #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 - #endif --/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ - #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 - #endif - -+/* Definitions for if_ether.h */ -+/* allow libcs like musl to deactivate this, glibc does not implement this. */ -+#ifndef __UAPI_DEF_ETHHDR -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ - /* Definitions for in.h */ - #ifndef __UAPI_DEF_IN_ADDR - #define __UAPI_DEF_IN_ADDR 1 -@@ -262,6 +269,6 @@ - #define __UAPI_DEF_XATTR 1 - #endif - --#endif /* __GLIBC__ */ -+#endif /* defined(__KERNEL__) */ - - #endif /* _UAPI_LIBC_COMPAT_H */ diff --git a/sys-kernel/linux-headers/files/libc-4.3-portability.patch b/sys-kernel/linux-headers/files/libc-4.3-portability.patch deleted file mode 100644 index b71e4b5..0000000 --- a/sys-kernel/linux-headers/files/libc-4.3-portability.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -urN a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h ---- a/include/uapi/linux/if_ether.h 2015-11-02 12:36:00.000000000 -0600 -+++ b/include/uapi/linux/if_ether.h 2015-11-06 21:07:36.109409947 -0600 -@@ -22,6 +22,7 @@ - #define _UAPI_LINUX_IF_ETHER_H - - #include -+#include - - /* - * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -@@ -134,12 +135,12 @@ - /* - * This is an Ethernet frame header. - */ -- -+#if __UAPI_DEF_ETHHDR - struct ethhdr { - unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ - unsigned char h_source[ETH_ALEN]; /* source ether addr */ - __be16 h_proto; /* packet type ID field */ - } __attribute__((packed)); -- -+#endif - - #endif /* _UAPI_LINUX_IF_ETHER_H */ -diff -urN a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h ---- a/include/uapi/linux/kernel.h 2015-11-02 12:36:00.000000000 -0600 -+++ b/include/uapi/linux/kernel.h 2015-11-06 20:59:38.595400307 -0600 -@@ -1,7 +1,9 @@ - #ifndef _UAPI_LINUX_KERNEL_H - #define _UAPI_LINUX_KERNEL_H - -+#ifdef __GLIBC__ - #include -+#endif - - /* - * 'kernel.h' contains some often-used function prototypes etc -diff -urN a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h ---- a/include/uapi/linux/libc-compat.h 2015-11-02 12:36:00.000000000 -0600 -+++ b/include/uapi/linux/libc-compat.h 2015-11-06 21:09:14.645411936 -0600 -@@ -48,13 +48,18 @@ - #ifndef _UAPI_LIBC_COMPAT_H - #define _UAPI_LIBC_COMPAT_H - --/* We have included glibc headers... */ --#if defined(__GLIBC__) -+#ifndef __KERNEL__ /* we're used from userspace */ - --/* Coordinate with glibc netinet/in.h header. */ -+#ifdef _NETINET_IF_ETHER_H /* musl */ -+#define __UAPI_DEF_ETHHDR 0 -+#else /* glibc uses __NETINET_IF_ETHER_H, and includes the kernel header. */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif -+ -+/* Coordinate with libc netinet/in.h header. */ - #if defined(_NETINET_IN_H) - --/* GLIBC headers included first so don't define anything -+/* libc headers included first so don't define anything - * that would already be defined. */ - #define __UAPI_DEF_IN_ADDR 0 - #define __UAPI_DEF_IN_IPPROTO 0 -@@ -64,15 +69,7 @@ - #define __UAPI_DEF_IN_CLASS 0 - - #define __UAPI_DEF_IN6_ADDR 0 --/* The exception is the in6_addr macros which must be defined -- * if the glibc code didn't define them. This guard matches -- * the guard in glibc/inet/netinet/in.h which defines the -- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ --#if defined(__USE_MISC) || defined (__USE_GNU) - #define __UAPI_DEF_IN6_ADDR_ALT 0 --#else --#define __UAPI_DEF_IN6_ADDR_ALT 1 --#endif - #define __UAPI_DEF_SOCKADDR_IN6 0 - #define __UAPI_DEF_IPV6_MREQ 0 - #define __UAPI_DEF_IPPROTO_V6 0 -@@ -80,10 +77,10 @@ - #define __UAPI_DEF_IN6_PKTINFO 0 - #define __UAPI_DEF_IP6_MTUINFO 0 - --#else -+#else /* defined(_NETINET_IN_H) */ - - /* Linux headers included first, and we must define everything -- * we need. The expectation is that glibc will check the -+ * we need. The expectation is that libc will check the - * __UAPI_DEF_* defines and adjust appropriately. */ - #define __UAPI_DEF_IN_ADDR 1 - #define __UAPI_DEF_IN_IPPROTO 1 -@@ -93,7 +90,7 @@ - #define __UAPI_DEF_IN_CLASS 1 - - #define __UAPI_DEF_IN6_ADDR 1 --/* We unconditionally define the in6_addr macros and glibc must -+/* We unconditionally define the in6_addr macros and libc must - * coordinate. */ - #define __UAPI_DEF_IN6_ADDR_ALT 1 - #define __UAPI_DEF_SOCKADDR_IN6 1 -@@ -115,7 +112,7 @@ - /* If we did not see any headers from any supported C libraries, - * or we are being included in the kernel, then define everything - * that we need. */ --#else /* !defined(__GLIBC__) */ -+#else /* __KERNEL__ */ - - /* Definitions for in.h */ - #define __UAPI_DEF_IN_ADDR 1 -@@ -138,6 +135,6 @@ - /* Definitions for xattr.h */ - #define __UAPI_DEF_XATTR 1 - --#endif /* __GLIBC__ */ -+#endif /* __KERNEL__ */ - - #endif /* _UAPI_LIBC_COMPAT_H */ diff --git a/sys-kernel/linux-headers/files/libc-4.8-portability.patch b/sys-kernel/linux-headers/files/libc-4.8-portability.patch deleted file mode 100644 index f03d8e0..0000000 --- a/sys-kernel/linux-headers/files/libc-4.8-portability.patch +++ /dev/null @@ -1,176 +0,0 @@ -diff -Naur gentoo-headers-base-4.8.orig/include/uapi/linux/if_ether.h gentoo-headers-base-4.8/include/uapi/linux/if_ether.h ---- gentoo-headers-base-4.8.orig/include/uapi/linux/if_ether.h 2016-11-10 14:47:20.000000000 -0800 -+++ gentoo-headers-base-4.8/include/uapi/linux/if_ether.h 2016-11-11 16:50:19.820253766 -0800 -@@ -22,6 +22,7 @@ - #define _UAPI_LINUX_IF_ETHER_H - - #include -+#include - - /* - * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -@@ -138,11 +139,13 @@ - * This is an Ethernet frame header. - */ - -+#if __UAPI_DEF_ETHHDR - struct ethhdr { - unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ - unsigned char h_source[ETH_ALEN]; /* source ether addr */ - __be16 h_proto; /* packet type ID field */ - } __attribute__((packed)); -+#endif - - - #endif /* _UAPI_LINUX_IF_ETHER_H */ -diff -Naur gentoo-headers-base-4.8.orig/include/uapi/linux/kernel.h gentoo-headers-base-4.8/include/uapi/linux/kernel.h ---- gentoo-headers-base-4.8.orig/include/uapi/linux/kernel.h 2016-11-10 14:47:20.000000000 -0800 -+++ gentoo-headers-base-4.8/include/uapi/linux/kernel.h 2016-11-11 16:50:48.052507106 -0800 -@@ -1,7 +1,9 @@ - #ifndef _UAPI_LINUX_KERNEL_H - #define _UAPI_LINUX_KERNEL_H - -+#ifdef __GLIBC__ - #include -+#endif - - /* - * 'kernel.h' contains some often-used function prototypes etc -diff -Naur gentoo-headers-base-4.8.orig/include/uapi/linux/libc-compat.h gentoo-headers-base-4.8/include/uapi/linux/libc-compat.h ---- gentoo-headers-base-4.8.orig/include/uapi/linux/libc-compat.h 2016-11-10 14:47:20.000000000 -0800 -+++ gentoo-headers-base-4.8/include/uapi/linux/libc-compat.h 2016-11-11 17:01:06.673559738 -0800 -@@ -48,47 +48,57 @@ - #ifndef _UAPI_LIBC_COMPAT_H - #define _UAPI_LIBC_COMPAT_H - --/* We have included glibc headers... */ --#if defined(__GLIBC__) -+/* We're used from userspace... */ -+#if !defined(__KERNEL__) - --/* Coordinate with glibc net/if.h header. */ -+/* Coordinate with libc net/if.h header. */ - #if defined(_NET_IF_H) && defined(__USE_MISC) - --/* GLIBC headers included first so don't define anything -+/* libc headers included first so don't define anything - * that would already be defined. */ - - #define __UAPI_DEF_IF_IFCONF 0 - #define __UAPI_DEF_IF_IFMAP 0 - #define __UAPI_DEF_IF_IFNAMSIZ 0 - #define __UAPI_DEF_IF_IFREQ 0 --/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 --/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+#if !defined(__GLIBC__) -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 -+#else - #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 - #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ -+#endif /* !defined(__GLIBC__) */ - - #else /* _NET_IF_H */ - - /* Linux headers included first, and we must define everything -- * we need. The expectation is that glibc will check the -+ * we need. The expectation is that libc will check the - * __UAPI_DEF_* defines and adjust appropriately. */ - - #define __UAPI_DEF_IF_IFCONF 1 - #define __UAPI_DEF_IF_IFMAP 1 - #define __UAPI_DEF_IF_IFNAMSIZ 1 - #define __UAPI_DEF_IF_IFREQ 1 --/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 --/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 - - #endif /* _NET_IF_H */ - --/* Coordinate with glibc netinet/in.h header. */ -+/* Coordinate with libc netinet/if_ether.h */ -+#ifdef _NETINET_IF_ETHER_H -+#define __UAPI_DEF_ETHHDR 0 -+#else -+/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */ -+#define __UAPI_DEF_ETHHDR 1 -+#endif /* _NETINET_IF_ETHER_H */ -+ -+/* Coordinate with libc netinet/in.h header. */ - #if defined(_NETINET_IN_H) - --/* GLIBC headers included first so don't define anything -+/* libc headers included first so don't define anything - * that would already be defined. */ - #define __UAPI_DEF_IN_ADDR 0 - #define __UAPI_DEF_IN_IPPROTO 0 -@@ -98,15 +108,7 @@ - #define __UAPI_DEF_IN_CLASS 0 - - #define __UAPI_DEF_IN6_ADDR 0 --/* The exception is the in6_addr macros which must be defined -- * if the glibc code didn't define them. This guard matches -- * the guard in glibc/inet/netinet/in.h which defines the -- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */ --#if defined(__USE_MISC) || defined (__USE_GNU) - #define __UAPI_DEF_IN6_ADDR_ALT 0 --#else --#define __UAPI_DEF_IN6_ADDR_ALT 1 --#endif - #define __UAPI_DEF_SOCKADDR_IN6 0 - #define __UAPI_DEF_IPV6_MREQ 0 - #define __UAPI_DEF_IPPROTO_V6 0 -@@ -117,7 +119,7 @@ - #else - - /* Linux headers included first, and we must define everything -- * we need. The expectation is that glibc will check the -+ * we need. The expectation is that libc will check the - * __UAPI_DEF_* defines and adjust appropriately. */ - #define __UAPI_DEF_IN_ADDR 1 - #define __UAPI_DEF_IN_IPPROTO 1 -@@ -127,7 +129,7 @@ - #define __UAPI_DEF_IN_CLASS 1 - - #define __UAPI_DEF_IN6_ADDR 1 --/* We unconditionally define the in6_addr macros and glibc must -+/* We unconditionally define the in6_addr macros and libc must - * coordinate. */ - #define __UAPI_DEF_IN6_ADDR_ALT 1 - #define __UAPI_DEF_SOCKADDR_IN6 1 -@@ -168,18 +170,20 @@ - /* If we did not see any headers from any supported C libraries, - * or we are being included in the kernel, then define everything - * that we need. */ --#else /* !defined(__GLIBC__) */ -+#else /* defined(__KERNEL__) */ - - /* Definitions for if.h */ - #define __UAPI_DEF_IF_IFCONF 1 - #define __UAPI_DEF_IF_IFMAP 1 - #define __UAPI_DEF_IF_IFNAMSIZ 1 - #define __UAPI_DEF_IF_IFREQ 1 --/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1 --/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ -+/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ - #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 - -+/* Definitions for if/ether.h */ -+#define __UAPI_DEF_ETHHDR 1 -+ - /* Definitions for in.h */ - #define __UAPI_DEF_IN_ADDR 1 - #define __UAPI_DEF_IN_IPPROTO 1 -@@ -208,6 +212,6 @@ - /* Definitions for xattr.h */ - #define __UAPI_DEF_XATTR 1 - --#endif /* __GLIBC__ */ -+#endif /* defined(__KERNEL__) */ - - #endif /* _UAPI_LIBC_COMPAT_H */ diff --git a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild deleted file mode 100644 index 76a3535..0000000 --- a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 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 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa" -inherit kernel-2 -detect_version - -PATCH_VER="1" -SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz - ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}" - -KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" - -DEPEND="app-arch/xz-utils - dev-lang/perl" -RDEPEND="!!media-sound/alsa-headers" - -S=${WORKDIR}/gentoo-headers-base-${PV} - -src_unpack() { - unpack ${A} -} - -src_prepare() { - default - - [[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch - eapply "${FILESDIR}"/libc-4.8-portability.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() { - # Make sure no uapi/ include paths are used by accident. - egrep -r \ - -e '# *include.*["<]uapi/' \ - "${D}" && die "#include uapi/xxx detected" - - einfo "Possible unescaped attribute/type usage" - egrep -r \ - -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \ - -e '\<([us](8|16|32|64))\>' \ - . - - einfo "Missing linux/types.h include" - egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h - - emake ARCH=$(tc-arch-kernel) headers_check -} diff --git a/sys-kernel/linux-headers/linux-headers-4.15-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.15-r1.ebuild deleted file mode 100644 index 87a839b..0000000 --- a/sys-kernel/linux-headers/linux-headers-4.15-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 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 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc tile x86 xtensa" -inherit kernel-2 -detect_version - -PATCH_VER="1" -SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz - ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}" - -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" - -DEPEND="app-arch/xz-utils - dev-lang/perl" -RDEPEND="!!media-sound/alsa-headers" - -S=${WORKDIR}/gentoo-headers-base-${PV} - -src_unpack() { - unpack ${A} -} - -src_prepare() { - default - - [[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch - eapply "${FILESDIR}"/libc-4.15-portability.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() { - # Make sure no uapi/ include paths are used by accident. - egrep -r \ - -e '# *include.*["<]uapi/' \ - "${D}" && die "#include uapi/xxx detected" - - einfo "Possible unescaped attribute/type usage" - egrep -r \ - -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \ - -e '\<([us](8|16|32|64))\>' \ - . - - einfo "Missing linux/types.h include" - egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h - - emake ARCH=$(tc-arch-kernel) headers_check -} diff --git a/sys-kernel/linux-headers/linux-headers-4.16-r2.ebuild b/sys-kernel/linux-headers/linux-headers-4.16-r2.ebuild deleted file mode 100644 index 6c7b21c..0000000 --- a/sys-kernel/linux-headers/linux-headers-4.16-r2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 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 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 riscv s390 score sh sparc tile x86 xtensa" -inherit kernel-2 -detect_version - -PATCH_VER="1" -SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}-r1.tar.xz - ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz} - https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-${PV}-r1.tar.xz - ${PATCH_VER:+https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-${PV}-${PATCH_VER}.tar.xz} -" - -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" - -DEPEND="app-arch/xz-utils - dev-lang/perl" -RDEPEND="!!media-sound/alsa-headers" - -S=${WORKDIR}/gentoo-headers-base-${PV} - -src_unpack() { - unpack ${A} -} - -src_prepare() { - default - - [[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch - eapply "${FILESDIR}"/libc-4.16-portability.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() { - # Make sure no uapi/ include paths are used by accident. - egrep -r \ - -e '# *include.*["<]uapi/' \ - "${D}" && die "#include uapi/xxx detected" - - einfo "Possible unescaped attribute/type usage" - egrep -r \ - -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \ - -e '\<([us](8|16|32|64))\>' \ - . - - einfo "Missing linux/types.h include" - egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h - - emake ARCH=$(tc-arch-kernel) headers_check -} diff --git a/sys-kernel/linux-headers/linux-headers-4.17.ebuild b/sys-kernel/linux-headers/linux-headers-4.17.ebuild deleted file mode 100644 index bcccca3..0000000 --- a/sys-kernel/linux-headers/linux-headers-4.17.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 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="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz - ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}" - -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" - -DEPEND="app-arch/xz-utils - dev-lang/perl" -RDEPEND="!!media-sound/alsa-headers" - -S=${WORKDIR}/gentoo-headers-base-${PV} - -src_unpack() { - unpack ${A} -} - -src_prepare() { - default - - [[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PV}/*.patch - eapply "${FILESDIR}"/libc-4.16-portability.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() { - # Make sure no uapi/ include paths are used by accident. - egrep -r \ - -e '# *include.*["<]uapi/' \ - "${D}" && die "#include uapi/xxx detected" - - einfo "Possible unescaped attribute/type usage" - egrep -r \ - -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \ - -e '\<([us](8|16|32|64))\>' \ - . - - einfo "Missing linux/types.h include" - egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h - - emake ARCH=$(tc-arch-kernel) headers_check -} diff --git a/sys-kernel/linux-headers/linux-headers-4.18.ebuild b/sys-kernel/linux-headers/linux-headers-4.18.ebuild deleted file mode 100644 index c005627..0000000 --- a/sys-kernel/linux-headers/linux-headers-4.18.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 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="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz - https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-${PV}.tar.xz - ${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="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" - -DEPEND="app-arch/xz-utils - dev-lang/perl" -RDEPEND="" - -S=${WORKDIR}/gentoo-headers-base-${PV} - -src_unpack() { - unpack ${A} -} - -src_prepare() { - default - - [[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PV}/*.patch - eapply "${FILESDIR}"/libc-4.16-portability.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() { - # Make sure no uapi/ include paths are used by accident. - egrep -r \ - -e '# *include.*["<]uapi/' \ - "${D}" && die "#include uapi/xxx detected" - - einfo "Possible unescaped attribute/type usage" - egrep -r \ - -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \ - -e '\<([us](8|16|32|64))\>' \ - . - - einfo "Missing linux/types.h include" - egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h - - emake ARCH=$(tc-arch-kernel) headers_check -} diff --git a/sys-kernel/linux-headers/linux-headers-4.19.ebuild b/sys-kernel/linux-headers/linux-headers-4.19.ebuild deleted file mode 100644 index c005627..0000000 --- a/sys-kernel/linux-headers/linux-headers-4.19.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 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="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz - https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-${PV}.tar.xz - ${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="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" - -DEPEND="app-arch/xz-utils - dev-lang/perl" -RDEPEND="" - -S=${WORKDIR}/gentoo-headers-base-${PV} - -src_unpack() { - unpack ${A} -} - -src_prepare() { - default - - [[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PV}/*.patch - eapply "${FILESDIR}"/libc-4.16-portability.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() { - # Make sure no uapi/ include paths are used by accident. - egrep -r \ - -e '# *include.*["<]uapi/' \ - "${D}" && die "#include uapi/xxx detected" - - einfo "Possible unescaped attribute/type usage" - egrep -r \ - -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \ - -e '\<([us](8|16|32|64))\>' \ - . - - einfo "Missing linux/types.h include" - egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h - - emake ARCH=$(tc-arch-kernel) headers_check -} diff --git a/sys-kernel/linux-headers/linux-headers-4.20.ebuild b/sys-kernel/linux-headers/linux-headers-4.20.ebuild deleted file mode 100644 index c005627..0000000 --- a/sys-kernel/linux-headers/linux-headers-4.20.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 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="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz - https://dev.gentoo.org/~slyfox/distfiles/gentoo-headers-base-${PV}.tar.xz - ${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="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" - -DEPEND="app-arch/xz-utils - dev-lang/perl" -RDEPEND="" - -S=${WORKDIR}/gentoo-headers-base-${PV} - -src_unpack() { - unpack ${A} -} - -src_prepare() { - default - - [[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PV}/*.patch - eapply "${FILESDIR}"/libc-4.16-portability.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() { - # Make sure no uapi/ include paths are used by accident. - egrep -r \ - -e '# *include.*["<]uapi/' \ - "${D}" && die "#include uapi/xxx detected" - - einfo "Possible unescaped attribute/type usage" - egrep -r \ - -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \ - -e '\<([us](8|16|32|64))\>' \ - . - - einfo "Missing linux/types.h include" - egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h - - emake ARCH=$(tc-arch-kernel) headers_check -} diff --git a/sys-kernel/linux-headers/metadata.xml b/sys-kernel/linux-headers/metadata.xml deleted file mode 100644 index fcf3f04..0000000 --- a/sys-kernel/linux-headers/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - toolchain@gentoo.org - Gentoo Toolchain Project - - - cpe:/o:linux:linux_kernel - -