summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch31
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch25
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch11
3 files changed, 31 insertions, 36 deletions
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 6ad479863e..8bb775ccf7 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,10 +11,10 @@ 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.4/include/uapi/linux/libc-compat.h 14Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
15=================================================================== 15===================================================================
16--- linux-4.4.orig/include/uapi/linux/libc-compat.h 16--- linux-4.8-rc4.orig/include/uapi/linux/libc-compat.h
17+++ linux-4.4/include/uapi/linux/libc-compat.h 17+++ linux-4.8-rc4/include/uapi/linux/libc-compat.h
18@@ -48,13 +48,12 @@ 18@@ -48,13 +48,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
@@ -23,16 +23,17 @@ Index: linux-4.4/include/uapi/linux/libc-compat.h
23-#if defined(__GLIBC__) 23-#if defined(__GLIBC__)
24+#ifndef __KERNEL__ /* we're used from userspace */ 24+#ifndef __KERNEL__ /* we're used from userspace */
25 25
26-/* Coordinate with glibc netinet/in.h header. */ 26-/* Coordinate with glibc net/if.h header. */
27+/* Coordinate with libc netinet/in.h header. */ 27-#if defined(_NET_IF_H) && defined(__USE_MISC)
28 #if defined(_NETINET_IN_H) 28+/* Coordinate with libc net/if.h header. */
29+#if defined(_NET_IF_H)
29 30
30-/* GLIBC headers included first so don't define anything 31-/* GLIBC headers included first so don't define anything
31+/* LIBC headers included first so don't define anything 32+/* LIBC headers included first so don't define anything
32 * that would already be defined. */ 33 * that would already be defined. */
33 #define __UAPI_DEF_IN_ADDR 0 34
34 #define __UAPI_DEF_IN_IPPROTO 0 35 #define __UAPI_DEF_IF_IFCONF 0
35@@ -64,15 +63,7 @@ 36@@ -98,15 +97,7 @@
36 #define __UAPI_DEF_IN_CLASS 0 37 #define __UAPI_DEF_IN_CLASS 0
37 38
38 #define __UAPI_DEF_IN6_ADDR 0 39 #define __UAPI_DEF_IN6_ADDR 0
@@ -48,7 +49,7 @@ Index: linux-4.4/include/uapi/linux/libc-compat.h
48 #define __UAPI_DEF_SOCKADDR_IN6 0 49 #define __UAPI_DEF_SOCKADDR_IN6 0
49 #define __UAPI_DEF_IPV6_MREQ 0 50 #define __UAPI_DEF_IPV6_MREQ 0
50 #define __UAPI_DEF_IPPROTO_V6 0 51 #define __UAPI_DEF_IPPROTO_V6 0
51@@ -80,10 +71,10 @@ 52@@ -114,10 +105,10 @@
52 #define __UAPI_DEF_IN6_PKTINFO 0 53 #define __UAPI_DEF_IN6_PKTINFO 0
53 #define __UAPI_DEF_IP6_MTUINFO 0 54 #define __UAPI_DEF_IP6_MTUINFO 0
54 55
@@ -61,7 +62,7 @@ Index: linux-4.4/include/uapi/linux/libc-compat.h
61 * __UAPI_DEF_* defines and adjust appropriately. */ 62 * __UAPI_DEF_* defines and adjust appropriately. */
62 #define __UAPI_DEF_IN_ADDR 1 63 #define __UAPI_DEF_IN_ADDR 1
63 #define __UAPI_DEF_IN_IPPROTO 1 64 #define __UAPI_DEF_IN_IPPROTO 1
64@@ -93,7 +84,7 @@ 65@@ -127,7 +118,7 @@
65 #define __UAPI_DEF_IN_CLASS 1 66 #define __UAPI_DEF_IN_CLASS 1
66 67
67 #define __UAPI_DEF_IN6_ADDR 1 68 #define __UAPI_DEF_IN6_ADDR 1
@@ -70,16 +71,16 @@ Index: linux-4.4/include/uapi/linux/libc-compat.h
70 * coordinate. */ 71 * coordinate. */
71 #define __UAPI_DEF_IN6_ADDR_ALT 1 72 #define __UAPI_DEF_IN6_ADDR_ALT 1
72 #define __UAPI_DEF_SOCKADDR_IN6 1 73 #define __UAPI_DEF_SOCKADDR_IN6 1
73@@ -115,7 +106,7 @@ 74@@ -149,7 +140,7 @@
74 /* If we did not see any headers from any supported C libraries, 75 /* If we did not see any headers from any supported C libraries,
75 * or we are being included in the kernel, then define everything 76 * or we are being included in the kernel, then define everything
76 * that we need. */ 77 * that we need. */
77-#else /* !defined(__GLIBC__) */ 78-#else /* !defined(__GLIBC__) */
78+#else /* __KERNEL__ */ 79+#else /* __KERNEL__ */
79 80
80 /* Definitions for in.h */ 81 /* Definitions for if.h */
81 #define __UAPI_DEF_IN_ADDR 1 82 #define __UAPI_DEF_IF_IFCONF 1
82@@ -138,6 +129,6 @@ 83@@ -182,6 +173,6 @@
83 /* Definitions for xattr.h */ 84 /* Definitions for xattr.h */
84 #define __UAPI_DEF_XATTR 1 85 #define __UAPI_DEF_XATTR 1
85 86
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 c617093749..8dc1edc33b 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,10 +11,10 @@ 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
14diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h 14Index: linux-4.8-rc4/include/uapi/linux/if_ether.h
15index aa63ed0..e94da57 100644 15===================================================================
16--- a/include/uapi/linux/if_ether.h 16--- linux-4.8-rc4.orig/include/uapi/linux/if_ether.h
17+++ b/include/uapi/linux/if_ether.h 17+++ linux-4.8-rc4/include/uapi/linux/if_ether.h
18@@ -22,6 +22,7 @@ 18@@ -22,6 +22,7 @@
19 #define _UAPI_LINUX_IF_ETHER_H 19 #define _UAPI_LINUX_IF_ETHER_H
20 20
@@ -23,7 +23,7 @@ index aa63ed0..e94da57 100644
23 23
24 /* 24 /*
25 * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble 25 * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
26@@ -134,11 +135,12 @@ 26@@ -138,11 +139,12 @@
27 * This is an Ethernet frame header. 27 * This is an Ethernet frame header.
28 */ 28 */
29 29
@@ -37,10 +37,10 @@ index aa63ed0..e94da57 100644
37+#endif 37+#endif
38 38
39 #endif /* _UAPI_LINUX_IF_ETHER_H */ 39 #endif /* _UAPI_LINUX_IF_ETHER_H */
40diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h 40Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h
41index afe15c2..7d0c78a 100644 41===================================================================
42--- a/include/uapi/linux/libc-compat.h 42--- linux-4.8-rc4.orig/include/uapi/linux/libc-compat.h
43+++ b/include/uapi/linux/libc-compat.h 43+++ linux-4.8-rc4/include/uapi/linux/libc-compat.h
44@@ -50,6 +50,12 @@ 44@@ -50,6 +50,12 @@
45 45
46 #ifndef __KERNEL__ /* we're used from userspace */ 46 #ifndef __KERNEL__ /* we're used from userspace */
@@ -51,9 +51,6 @@ index afe15c2..7d0c78a 100644
51+#define __UAPI_DEF_ETHHDR 1 51+#define __UAPI_DEF_ETHHDR 1
52+#endif 52+#endif
53+ 53+
54 /* Coordinate with libc netinet/in.h header. */ 54 /* Coordinate with libc net/if.h header. */
55 #if defined(_NETINET_IN_H) 55 #if defined(_NET_IF_H) && defined(__USE_MISC)
56 56
57--
582.6.4
59
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
index 6d9e8d864e..b5c4e1750e 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch
@@ -13,10 +13,10 @@ Upstream-Status: Submitted
13 include/uapi/linux/kernel.h | 2 ++ 13 include/uapi/linux/kernel.h | 2 ++
14 1 file changed, 2 insertions(+) 14 1 file changed, 2 insertions(+)
15 15
16diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h 16Index: linux-4.8-rc4/include/uapi/linux/kernel.h
17index 321e399..e8ff821 100644 17===================================================================
18--- a/include/uapi/linux/kernel.h 18--- linux-4.8-rc4.orig/include/uapi/linux/kernel.h
19+++ b/include/uapi/linux/kernel.h 19+++ linux-4.8-rc4/include/uapi/linux/kernel.h
20@@ -1,7 +1,9 @@ 20@@ -1,7 +1,9 @@
21 #ifndef _UAPI_LINUX_KERNEL_H 21 #ifndef _UAPI_LINUX_KERNEL_H
22 #define _UAPI_LINUX_KERNEL_H 22 #define _UAPI_LINUX_KERNEL_H
@@ -27,6 +27,3 @@ index 321e399..e8ff821 100644
27 27
28 /* 28 /*
29 * 'kernel.h' contains some often-used function prototypes etc 29 * 'kernel.h' contains some often-used function prototypes etc
30--
312.6.4
32