diff options
Diffstat (limited to 'meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch')
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch | 29 |
1 files changed, 15 insertions, 14 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 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 | ||
14 | Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h | 14 | Index: 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. */ | ||