From 9c3b84d5ee86b4eaeff9821e720069130310b143 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 6 Feb 2018 11:21:54 -0500 Subject: linux-libc-headers: update to v4.15 (From OE-Core rev: ef96628d850f1154c7e59bca418ef3a7c9a2bcc1) Signed-off-by: Bruce Ashfield Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...mpat.h-fix-some-issues-arising-from-in6.h.patch | 29 ++++++++--------- ...t.h-prevent-redefinition-of-struct-ethhdr.patch | 36 +++------------------- .../linux-libc-headers_4.14.13.bb | 11 ------- .../linux-libc-headers/linux-libc-headers_4.15.bb | 11 +++++++ 4 files changed, 31 insertions(+), 56 deletions(-) delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.13.bb create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.bb (limited to 'meta/recipes-kernel/linux-libc-headers') diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch index 8bb775ccf7..a3fa59001d 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch @@ -11,11 +11,11 @@ Upstream-Status: Submitted include/uapi/linux/libc-compat.h | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) -Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h +Index: linux-4.15/include/uapi/linux/libc-compat.h =================================================================== ---- linux-4.8-rc4.orig/include/uapi/linux/libc-compat.h -+++ linux-4.8-rc4/include/uapi/linux/libc-compat.h -@@ -48,13 +48,12 @@ +--- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:37:44.724314379 -0500 ++++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:38:02.148913820 -0500 +@@ -49,13 +49,12 @@ #ifndef _UAPI_LIBC_COMPAT_H #define _UAPI_LIBC_COMPAT_H @@ -33,7 +33,7 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h * that would already be defined. */ #define __UAPI_DEF_IF_IFCONF 0 -@@ -98,15 +97,7 @@ +@@ -99,15 +98,7 @@ #define __UAPI_DEF_IN_CLASS 0 #define __UAPI_DEF_IN6_ADDR 0 @@ -49,7 +49,7 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h #define __UAPI_DEF_SOCKADDR_IN6 0 #define __UAPI_DEF_IPV6_MREQ 0 #define __UAPI_DEF_IPPROTO_V6 0 -@@ -114,10 +105,10 @@ +@@ -115,10 +106,10 @@ #define __UAPI_DEF_IN6_PKTINFO 0 #define __UAPI_DEF_IP6_MTUINFO 0 @@ -62,7 +62,7 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h * __UAPI_DEF_* defines and adjust appropriately. */ #define __UAPI_DEF_IN_ADDR 1 #define __UAPI_DEF_IN_IPPROTO 1 -@@ -127,7 +118,7 @@ +@@ -128,7 +119,7 @@ #define __UAPI_DEF_IN_CLASS 1 #define __UAPI_DEF_IN6_ADDR 1 @@ -71,20 +71,21 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h * coordinate. */ #define __UAPI_DEF_IN6_ADDR_ALT 1 #define __UAPI_DEF_SOCKADDR_IN6 1 -@@ -149,7 +140,7 @@ - /* If we did not see any headers from any supported C libraries, +@@ -170,7 +161,7 @@ * 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 /* __KERNEL__ */ /* Definitions for if.h */ - #define __UAPI_DEF_IF_IFCONF 1 -@@ -182,6 +173,6 @@ - /* Definitions for xattr.h */ + #ifndef __UAPI_DEF_IF_IFCONF +@@ -262,7 +253,7 @@ #define __UAPI_DEF_XATTR 1 + #endif -#endif /* __GLIBC__ */ +#endif /* __KERNEL__ */ - #endif /* _UAPI_LIBC_COMPAT_H */ + /* Definitions for if_ether.h */ + /* allow libcs like musl to deactivate this, glibc does not implement this. */ diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch index 8dc1edc33b..fb7e1de17a 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch @@ -11,37 +11,11 @@ Upstream-Status: Submitted include/uapi/linux/libc-compat.h | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) -Index: linux-4.8-rc4/include/uapi/linux/if_ether.h +Index: linux-4.15/include/uapi/linux/libc-compat.h =================================================================== ---- linux-4.8-rc4.orig/include/uapi/linux/if_ether.h -+++ linux-4.8-rc4/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 -@@ -138,11 +139,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 */ -Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h -=================================================================== ---- linux-4.8-rc4.orig/include/uapi/linux/libc-compat.h -+++ linux-4.8-rc4/include/uapi/linux/libc-compat.h -@@ -50,6 +50,12 @@ +--- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.338370731 -0500 ++++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.334370603 -0500 +@@ -51,6 +51,12 @@ #ifndef __KERNEL__ /* we're used from userspace */ @@ -52,5 +26,5 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h +#endif + /* Coordinate with libc net/if.h header. */ - #if defined(_NET_IF_H) && defined(__USE_MISC) + #if defined(_NET_IF_H) diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.13.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.13.bb deleted file mode 100644 index 455ad4b15e..0000000000 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.13.bb +++ /dev/null @@ -1,11 +0,0 @@ -require linux-libc-headers.inc - -SRC_URI_append_libc-musl = "\ - file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ - file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ - file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ - file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ - " - -SRC_URI[md5sum] = "4e8bb562f8fd33d5ef1feb0435ed2b02" -SRC_URI[sha256sum] = "4ab46d1b5a0f8ef83b80760f89ae4f5c88431b19b3cf79ffa0c66d6b33e45772" diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.bb new file mode 100644 index 0000000000..b511cd1181 --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.bb @@ -0,0 +1,11 @@ +require linux-libc-headers.inc + +SRC_URI_append_libc-musl = "\ + file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ + file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ + file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ + file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ + " + +SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b" +SRC_URI[sha256sum] = "5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769" -- cgit v1.2.3-54-g00ecf