diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-31 08:30:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-05 11:56:01 +0100 |
commit | 98d57df225218a42641ebab8b08b8663403dda5d (patch) | |
tree | a97ab101859f8c90d2306fa58266efa2d9e40946 /meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch | |
parent | ab338be9e317e25fc3c2c761c42dbdd0543eb439 (diff) | |
download | poky-98d57df225218a42641ebab8b08b8663403dda5d.tar.gz |
linux-libc-headers: Refresh musl patches against newer kernel headers version
The musl patches need to be updated against the latest kernel verison
in order to apply. No functionality changes.
(From OE-Core rev: b9dd65b99ecf2ccbac3649cf4449fdba3f25a272)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 31 |
1 files changed, 16 insertions, 15 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 | ||
14 | Index: linux-4.4/include/uapi/linux/libc-compat.h | 14 | Index: 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 | ||