summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch29
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch36
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.15.bb (renamed from meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.13.bb)4
4 files changed, 23 insertions, 48 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 64ffeb5ef7..2e7243f32c 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -27,7 +27,7 @@ SDKGCCVERSION ?= "${GCCVERSION}"
27BINUVERSION ?= "2.29%" 27BINUVERSION ?= "2.29%"
28GDBVERSION ?= "8.0%" 28GDBVERSION ?= "8.0%"
29GLIBCVERSION ?= "2.26%" 29GLIBCVERSION ?= "2.26%"
30LINUXLIBCVERSION ?= "4.14%" 30LINUXLIBCVERSION ?= "4.15%"
31 31
32PREFERRED_VERSION_gcc ?= "${GCCVERSION}" 32PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
33PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}" 33PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
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
11 include/uapi/linux/libc-compat.h | 25 ++++++++----------------- 11 include/uapi/linux/libc-compat.h | 25 ++++++++-----------------
12 1 file changed, 8 insertions(+), 17 deletions(-) 12 1 file changed, 8 insertions(+), 17 deletions(-)
13 13
14Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h 14Index: linux-4.15/include/uapi/linux/libc-compat.h
15=================================================================== 15===================================================================
16--- linux-4.8-rc4.orig/include/uapi/linux/libc-compat.h 16--- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:37:44.724314379 -0500
17+++ linux-4.8-rc4/include/uapi/linux/libc-compat.h 17+++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:38:02.148913820 -0500
18@@ -48,13 +48,12 @@ 18@@ -49,13 +49,12 @@
19 #ifndef _UAPI_LIBC_COMPAT_H 19 #ifndef _UAPI_LIBC_COMPAT_H
20 #define _UAPI_LIBC_COMPAT_H 20 #define _UAPI_LIBC_COMPAT_H
21 21
@@ -33,7 +33,7 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
33 * that would already be defined. */ 33 * that would already be defined. */
34 34
35 #define __UAPI_DEF_IF_IFCONF 0 35 #define __UAPI_DEF_IF_IFCONF 0
36@@ -98,15 +97,7 @@ 36@@ -99,15 +98,7 @@
37 #define __UAPI_DEF_IN_CLASS 0 37 #define __UAPI_DEF_IN_CLASS 0
38 38
39 #define __UAPI_DEF_IN6_ADDR 0 39 #define __UAPI_DEF_IN6_ADDR 0
@@ -49,7 +49,7 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
49 #define __UAPI_DEF_SOCKADDR_IN6 0 49 #define __UAPI_DEF_SOCKADDR_IN6 0
50 #define __UAPI_DEF_IPV6_MREQ 0 50 #define __UAPI_DEF_IPV6_MREQ 0
51 #define __UAPI_DEF_IPPROTO_V6 0 51 #define __UAPI_DEF_IPPROTO_V6 0
52@@ -114,10 +105,10 @@ 52@@ -115,10 +106,10 @@
53 #define __UAPI_DEF_IN6_PKTINFO 0 53 #define __UAPI_DEF_IN6_PKTINFO 0
54 #define __UAPI_DEF_IP6_MTUINFO 0 54 #define __UAPI_DEF_IP6_MTUINFO 0
55 55
@@ -62,7 +62,7 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
62 * __UAPI_DEF_* defines and adjust appropriately. */ 62 * __UAPI_DEF_* defines and adjust appropriately. */
63 #define __UAPI_DEF_IN_ADDR 1 63 #define __UAPI_DEF_IN_ADDR 1
64 #define __UAPI_DEF_IN_IPPROTO 1 64 #define __UAPI_DEF_IN_IPPROTO 1
65@@ -127,7 +118,7 @@ 65@@ -128,7 +119,7 @@
66 #define __UAPI_DEF_IN_CLASS 1 66 #define __UAPI_DEF_IN_CLASS 1
67 67
68 #define __UAPI_DEF_IN6_ADDR 1 68 #define __UAPI_DEF_IN6_ADDR 1
@@ -71,20 +71,21 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
71 * coordinate. */ 71 * coordinate. */
72 #define __UAPI_DEF_IN6_ADDR_ALT 1 72 #define __UAPI_DEF_IN6_ADDR_ALT 1
73 #define __UAPI_DEF_SOCKADDR_IN6 1 73 #define __UAPI_DEF_SOCKADDR_IN6 1
74@@ -149,7 +140,7 @@ 74@@ -170,7 +161,7 @@
75 /* If we did not see any headers from any supported C libraries,
76 * or we are being included in the kernel, then define everything 75 * or we are being included in the kernel, then define everything
77 * that we need. */ 76 * that we need. Check for previous __UAPI_* definitions to give
77 * unsupported C libraries a way to opt out of any kernel definition. */
78-#else /* !defined(__GLIBC__) */ 78-#else /* !defined(__GLIBC__) */
79+#else /* __KERNEL__ */ 79+#else /* __KERNEL__ */
80 80
81 /* Definitions for if.h */ 81 /* Definitions for if.h */
82 #define __UAPI_DEF_IF_IFCONF 1 82 #ifndef __UAPI_DEF_IF_IFCONF
83@@ -182,6 +173,6 @@ 83@@ -262,7 +253,7 @@
84 /* Definitions for xattr.h */
85 #define __UAPI_DEF_XATTR 1 84 #define __UAPI_DEF_XATTR 1
85 #endif
86 86
87-#endif /* __GLIBC__ */ 87-#endif /* __GLIBC__ */
88+#endif /* __KERNEL__ */ 88+#endif /* __KERNEL__ */
89 89
90 #endif /* _UAPI_LIBC_COMPAT_H */ 90 /* Definitions for if_ether.h */
91 /* 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
11 include/uapi/linux/libc-compat.h | 6 ++++++ 11 include/uapi/linux/libc-compat.h | 6 ++++++
12 2 files changed, 9 insertions(+), 1 deletion(-) 12 2 files changed, 9 insertions(+), 1 deletion(-)
13 13
14Index: linux-4.8-rc4/include/uapi/linux/if_ether.h 14Index: linux-4.15/include/uapi/linux/libc-compat.h
15=================================================================== 15===================================================================
16--- linux-4.8-rc4.orig/include/uapi/linux/if_ether.h 16--- linux-4.15.orig/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.338370731 -0500
17+++ linux-4.8-rc4/include/uapi/linux/if_ether.h 17+++ linux-4.15/include/uapi/linux/libc-compat.h 2018-02-05 17:40:42.334370603 -0500
18@@ -22,6 +22,7 @@ 18@@ -51,6 +51,12 @@
19 #define _UAPI_LINUX_IF_ETHER_H
20
21 #include <linux/types.h>
22+#include <linux/libc-compat.h>
23
24 /*
25 * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
26@@ -138,11 +139,12 @@
27 * This is an Ethernet frame header.
28 */
29
30+#if __UAPI_DEF_ETHHDR
31 struct ethhdr {
32 unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
33 unsigned char h_source[ETH_ALEN]; /* source ether addr */
34 __be16 h_proto; /* packet type ID field */
35 } __attribute__((packed));
36-
37+#endif
38
39 #endif /* _UAPI_LINUX_IF_ETHER_H */
40Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
41===================================================================
42--- linux-4.8-rc4.orig/include/uapi/linux/libc-compat.h
43+++ linux-4.8-rc4/include/uapi/linux/libc-compat.h
44@@ -50,6 +50,12 @@
45 19
46 #ifndef __KERNEL__ /* we're used from userspace */ 20 #ifndef __KERNEL__ /* we're used from userspace */
47 21
@@ -52,5 +26,5 @@ Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
52+#endif 26+#endif
53+ 27+
54 /* Coordinate with libc net/if.h header. */ 28 /* Coordinate with libc net/if.h header. */
55 #if defined(_NET_IF_H) && defined(__USE_MISC) 29 #if defined(_NET_IF_H)
56 30
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.15.bb
index 455ad4b15e..b511cd1181 100644
--- 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.15.bb
@@ -7,5 +7,5 @@ SRC_URI_append_libc-musl = "\
7 file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ 7 file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \
8 " 8 "
9 9
10SRC_URI[md5sum] = "4e8bb562f8fd33d5ef1feb0435ed2b02" 10SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b"
11SRC_URI[sha256sum] = "4ab46d1b5a0f8ef83b80760f89ae4f5c88431b19b3cf79ffa0c66d6b33e45772" 11SRC_URI[sha256sum] = "5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 05:54:55 +0000