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/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.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/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch')
-rw-r--r-- | meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch | 25 |
1 files changed, 11 insertions, 14 deletions
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 | ||
14 | diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h | 14 | Index: linux-4.8-rc4/include/uapi/linux/if_ether.h |
15 | index 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 */ |
40 | diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h | 40 | Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h |
41 | index 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 | -- | ||
58 | 2.6.4 | ||
59 | |||