From 3f7500265c39637f48740388d30d8860a31e6cdb Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Thu, 1 Nov 2018 21:14:43 +0100 Subject: [PATCH] kernel-libc-headers: update to 4.19.0. --- .../1-5-kernel-libc-compat-musl-support.patch | 21 ++++++---- .../patches/1-6-musl-libc-net-compat.patch | 36 +++++----------- ...fc1ab363e6fab1f321430d69be17a8b92bd7.patch | 42 ------------------- srcpkgs/kernel-libc-headers/template | 12 +++--- 4 files changed, 28 insertions(+), 83 deletions(-) delete mode 100644 srcpkgs/kernel-libc-headers/patches/2220fc1ab363e6fab1f321430d69be17a8b92bd7.patch diff --git a/srcpkgs/kernel-libc-headers/patches/1-5-kernel-libc-compat-musl-support.patch b/srcpkgs/kernel-libc-headers/patches/1-5-kernel-libc-compat-musl-support.patch index 0385f5d3f69..99ab5f791a6 100644 --- a/srcpkgs/kernel-libc-headers/patches/1-5-kernel-libc-compat-musl-support.patch +++ b/srcpkgs/kernel-libc-headers/patches/1-5-kernel-libc-compat-musl-support.patch @@ -1,10 +1,12 @@ ---- include/uapi/linux/libc-compat.h.orig -+++ include/uapi/linux/libc-compat.h -@@ -165,10 +165,102 @@ +Source: yopito +Upstream: No +Reason: musl compatibility +--- include/uapi/linux/libc-compat.h 2018-11-01 21:44:22.016378667 +0100 ++++ include/uapi/linux/libc-compat.h 2018-11-01 21:54:14.382052324 +0100 +@@ -170,11 +170,102 @@ #define __UAPI_DEF_XATTR 1 #endif -+ +/* + * Support of guessed LIBC musl, since neither glibc nor kernel space. + * Written for musl libc 1.1.16. Mimics the glibc support above. @@ -98,17 +100,18 @@ + /* 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. */ + * 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 */ - #define __UAPI_DEF_IF_IFCONF 1 -@@ -208,6 +300,6 @@ - /* Definitions for xattr.h */ + #ifndef __UAPI_DEF_IF_IFCONF +@@ -266,6 +357,6 @@ #define __UAPI_DEF_XATTR 1 + #endif -#endif /* __GLIBC__ */ +#endif /* __KERNEL__ or __GLIBC__ or libc */ - #endif /* _LIBC_COMPAT_H */ + #endif /* _UAPI_LIBC_COMPAT_H */ diff --git a/srcpkgs/kernel-libc-headers/patches/1-6-musl-libc-net-compat.patch b/srcpkgs/kernel-libc-headers/patches/1-6-musl-libc-net-compat.patch index 9ac04dc9f18..65a70e18443 100644 --- a/srcpkgs/kernel-libc-headers/patches/1-6-musl-libc-net-compat.patch +++ b/srcpkgs/kernel-libc-headers/patches/1-6-musl-libc-net-compat.patch @@ -52,32 +52,6 @@ diff -u -r linux-4.9.8-bak/include/uapi/linux/if_arp.h linux-4.9.8/include/uapi/ +#endif #endif /* _UAPI_LINUX_IF_ARP_H */ -diff -u -r linux-4.9.8-bak/include/uapi/linux/if_ether.h linux-4.9.8/include/uapi/linux/if_ether.h ---- include/uapi/linux/if_ether.h 2018-05-14 23:49:28.882768986 +0200 -+++ include/uapi/linux/if_ether.h 2018-05-14 23:50:03.155912977 +0200 -@@ -22,6 +22,7 @@ - #define _UAPI_LINUX_IF_ETHER_H - - #include -+#include - - /* - * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -@@ -137,12 +138,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 -u -r linux-4.9.8-bak/include/uapi/linux/libc-compat.h linux-4.9.8/include/uapi/linux/libc-compat.h --- include/uapi/linux/libc-compat.h 2018-05-14 23:49:28.885768999 +0200 +++ include/uapi/linux/libc-compat.h 2018-05-14 23:50:03.156912981 +0200 @@ -123,3 +97,13 @@ diff -u -r linux-4.9.8-bak/include/uapi/linux/libc-compat.h linux-4.9.8/include/ /* If we did not see any headers from any supported C libraries, * or we are being included in the kernel, then define everything +--- include/uapi/linux/if_ether.h 2018-11-01 21:25:05.338466089 +0100 ++++ include/uapi/linux/if_ether.h 2018-11-01 21:26:07.819172903 +0100 +@@ -23,6 +23,7 @@ + #define _UAPI_LINUX_IF_ETHER_H + + #include ++#include + + /* + * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble diff --git a/srcpkgs/kernel-libc-headers/patches/2220fc1ab363e6fab1f321430d69be17a8b92bd7.patch b/srcpkgs/kernel-libc-headers/patches/2220fc1ab363e6fab1f321430d69be17a8b92bd7.patch deleted file mode 100644 index bda2aa9afec..00000000000 --- a/srcpkgs/kernel-libc-headers/patches/2220fc1ab363e6fab1f321430d69be17a8b92bd7.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2220fc1ab363e6fab1f321430d69be17a8b92bd7 Mon Sep 17 00:00:00 2001 -From: Denys Dmytriyenko -Date: Tue, 14 Feb 2017 15:00:47 -0500 -Subject: uapi: add missing install of dma-buf.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -As part of c11e391da2a8fe973c3c2398452000bed505851e "dma-buf: Add ioctls to -allow userspace to flush" a new uapi header file dma-buf.h was added, but an -entry was not added on Kbuild to install it. This patch resolves this omission -so that "make headers_install" installs this header. - -Signed-off-by: Denys Dmytriyenko -Reviewed-by: Tomi Valkeinen -Cc: Ville Syrjälä -Cc: David Herrmann -Cc: Sumit Semwal -Cc: Daniel Vetter -Cc: Tiago Vignatti -Cc: Daniel Vetter -Signed-off-by: Daniel Vetter -Link: http://patchwork.freedesktop.org/patch/msgid/1487102447-59265-1-git-send-email-denis@denix.org ---- - include/uapi/linux/Kbuild | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild -index f330ba4..900129c 100644 ---- include/uapi/linux/Kbuild -+++ include/uapi/linux/Kbuild -@@ -109,6 +109,7 @@ header-y += dlm_netlink.h - header-y += dlm_plock.h - header-y += dm-ioctl.h - header-y += dm-log-userspace.h -+header-y += dma-buf.h - header-y += dn.h - header-y += dqblk_xfs.h - header-y += edd.h --- -cgit v1.1 - diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template index 74fbf393651..d0dabb6aa3f 100644 --- a/srcpkgs/kernel-libc-headers/template +++ b/srcpkgs/kernel-libc-headers/template @@ -1,17 +1,17 @@ # Template file for 'kernel-libc-headers' pkgname=kernel-libc-headers -version=4.9.8 -revision=4 +version=4.19.0 +revision=1 bootstrap=yes nostrip=yes noverifyrdeps=yes noshlibprovides=yes -wrksrc=linux-${version} +wrksrc=linux-${version%.*} short_desc="The Linux API headers for userland development" -license="GPL-2" +license="GPL-2.0-only" homepage="http://www.kernel.org" -distfiles="$KERNEL_SITE/kernel/v4.x/linux-${version}.tar.xz" -checksum=150bb7f2dd4849b5d21b8ccd8d05294a48229e1fcb93a22e7b806a79ec0b0e45 +distfiles="$KERNEL_SITE/kernel/v4.x/linux-${version%.*}.tar.xz" +checksum=0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 if [ "$CHROOT_READY" ]; then hostmakedepends="perl"