From 8c773d0d35c86693363dca906257cdd226b4c3da Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 6 Feb 2017 09:40:36 +0100 Subject: [PATCH] kernel-libc-headers: get rid of obsolete patches. --- ...h-fix-some-issues-arising-from-in6.h.patch | 76 ------------------- ...revent-redefinition-of-struct-ethhdr.patch | 39 ---------- 2 files changed, 115 deletions(-) delete mode 100644 srcpkgs/kernel-libc-headers/patches/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch delete mode 100644 srcpkgs/kernel-libc-headers/patches/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch 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 deleted file mode 100644 index a9c8170efd2..00000000000 --- a/srcpkgs/kernel-libc-headers/patches/3-4-libc-compat.h-fix-some-issues-arising-from-in6.h.patch +++ /dev/null @@ -1,76 +0,0 @@ -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 - --/* We have included glibc headers... */ --#if defined(__GLIBC__) -+#ifndef __KERNEL__ /* we're used from userspace */ - --/* Coordinate with glibc netinet/in.h header. */ -+/* 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_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 -@@ -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 -+ * 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. */ --#else /* !defined(__GLIBC__) */ -+#else /* __KERNEL__ */ - - /* Definitions for in6.h */ - #define __UAPI_DEF_IN6_ADDR 1 -@@ -116,6 +107,6 @@ - /* Definitions for xattr.h */ - #define __UAPI_DEF_XATTR 1 - --#endif /* __GLIBC__ */ -+#endif /* __KERNEL__ */ - - #endif /* _UAPI_LIBC_COMPAT_H */ 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 deleted file mode 100644 index ae090f718a2..00000000000 --- a/srcpkgs/kernel-libc-headers/patches/4-4-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- include/uapi/linux/if_ether.h.orig -+++ include/uapi/linux/if_ether.h -@@ -22,6 +22,7 @@ - #define _UAPI_LINUX_IF_ETHER_H - - #include -+#include - - /* - * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -@@ -130,11 +131,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 */ ---- 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 -