diff --git a/srcpkgs/kernel-libc-headers/patches/1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch b/srcpkgs/kernel-libc-headers/patches/1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch index 0b4cfb1220..0fc6df3c2c 100644 --- a/srcpkgs/kernel-libc-headers/patches/1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch +++ b/srcpkgs/kernel-libc-headers/patches/1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch @@ -1,5 +1,5 @@ ---- ./include/uapi/linux/kernel.h.orig -+++ ./include/uapi/linux/kernel.h +--- include/uapi/linux/kernel.h.orig ++++ include/uapi/linux/kernel.h @@ -1,7 +1,9 @@ #ifndef _UAPI_LINUX_KERNEL_H #define _UAPI_LINUX_KERNEL_H diff --git a/srcpkgs/kernel-libc-headers/patches/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch b/srcpkgs/kernel-libc-headers/patches/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch index ceff65e400..a9c8170efd 100644 --- a/srcpkgs/kernel-libc-headers/patches/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch +++ b/srcpkgs/kernel-libc-headers/patches/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch @@ -1,6 +1,18 @@ ---- include/uapi/linux/libc-compat.h.orig 2015-05-31 15:43:30.635620792 +0200 -+++ include/uapi/linux/libc-compat.h 2015-05-31 15:48:08.787163241 +0200 -@@ -48,30 +48,27 @@ +From 3cd5b95ad2e9ca7d39e2dffe79f9198a36a0e68e Mon Sep 17 00:00:00 2001 +From: rofl0r +Date: Wed, 22 Jan 2014 00:48:28 +0100 +Subject: [PATCH] libc-compat.h: fix some issues arising from in6.h + +namely redefinition of some structs provided by netinet/in.h. +--- + generic/include/linux/libc-compat.h | 23 +++++++---------------- + 1 file changed, 7 insertions(+), 16 deletions(-) + +Index: linux-4.1/include/uapi/linux/libc-compat.h +=================================================================== +--- include/uapi/linux/libc-compat.h ++++ include/uapi/linux/libc-compat.h +@@ -48,24 +48,15 @@ #ifndef _UAPI_LIBC_COMPAT_H #define _UAPI_LIBC_COMPAT_H @@ -9,17 +21,11 @@ +#ifndef __KERNEL__ /* we're used from userspace */ -/* Coordinate with glibc netinet/in.h header. */ --#if defined(_NETINET_IN_H) -+#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. */ -+#ifdef _NETINET_IN_H + #if defined(_NETINET_IN_H) - /* GLIBC headers included first so don't define anything +-/* 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_IN6_ADDR 0 -/* The exception is the in6_addr macros which must be defined @@ -34,14 +40,24 @@ #define __UAPI_DEF_SOCKADDR_IN6 0 #define __UAPI_DEF_IPV6_MREQ 0 #define __UAPI_DEF_IPPROTO_V6 0 - #define __UAPI_DEF_IPV6_OPTIONS 0 +@@ -73,13 +64,13 @@ + #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 -@@ -97,7 +94,7 @@ +- * we need. The expectation is that glibc will check the ++ * we need. The expectation is that the libc will check the + * __UAPI_DEF_* defines and adjust appropriately. */ + #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 +@@ -101,7 +92,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. */ @@ -50,7 +66,7 @@ /* Definitions for in6.h */ #define __UAPI_DEF_IN6_ADDR 1 -@@ -110,6 +107,6 @@ +@@ -116,6 +107,6 @@ /* Definitions for xattr.h */ #define __UAPI_DEF_XATTR 1 diff --git a/srcpkgs/kernel-libc-headers/patches/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/srcpkgs/kernel-libc-headers/patches/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch index 5c85e8143c..ae090f718a 100644 --- a/srcpkgs/kernel-libc-headers/patches/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch +++ b/srcpkgs/kernel-libc-headers/patches/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch @@ -1,5 +1,5 @@ ---- include/uapi/linux/if_ether.h.orig 2015-05-31 15:46:25.659328508 +0200 -+++ include/uapi/linux/if_ether.h 2015-05-31 15:47:19.843238460 +0200 +--- include/uapi/linux/if_ether.h.orig ++++ include/uapi/linux/if_ether.h @@ -22,6 +22,7 @@ #define _UAPI_LINUX_IF_ETHER_H @@ -8,7 +8,7 @@ /* * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -@@ -134,11 +135,12 @@ +@@ -130,11 +131,12 @@ * This is an Ethernet frame header. */ @@ -22,3 +22,18 @@ +#endif #endif /* _UAPI_LINUX_IF_ETHER_H */ +--- include/uapi/linux/libc-compat.h.orig ++++ include/uapi/linux/libc-compat.h +@@ -50,6 +50,12 @@ + + #ifndef __KERNEL__ /* we're used from userspace */ + ++#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. */ + #ifdef _NETINET_IN_H + diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template index 1fea70c45e..8e8a7f3ff2 100644 --- a/srcpkgs/kernel-libc-headers/template +++ b/srcpkgs/kernel-libc-headers/template @@ -1,8 +1,7 @@ # Template file for 'kernel-libc-headers' -# pkgname=kernel-libc-headers -version=3.18.6 -revision=2 +version=4.1.15 +revision=1 bootstrap=yes nostrip=yes noverifyrdeps=yes @@ -11,8 +10,8 @@ wrksrc=linux-${version} short_desc="The Linux API headers for userland development" license="GPL-2" homepage="http://www.kernel.org" -distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz" -checksum=c4c1a4841173aa572d79b7530db92ce493dbefe8049e6f461a46dd897df253f5 +distfiles="http://www.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" +checksum=472288cc966188c5d7c511c6be0f78682843c9ca2d5d6c4d67d77455680359a3 if [ "$CHROOT_READY" ]; then hostmakedepends="perl"