diff options
Diffstat (limited to 'meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch deleted file mode 100644 index 8c078f69d0..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | Subject: [PATCH] Avoid in6_addr redefinition | ||
2 | |||
3 | Due to both <netinet/in.h> and <linux/in6.h> being included, the | ||
4 | in6_addr is being redefined: once from the C library headers and once | ||
5 | from the kernel headers. This causes some build failures with for | ||
6 | example the musl C library. | ||
7 | |||
8 | In order to fix this, use just the C library header <netinet/in.h>. | ||
9 | Original patch taken from | ||
10 | http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch. | ||
11 | |||
12 | (Refreshed the patch for 4.6 release) | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | ||
17 | Signed-off-by: Maxin B. John <maxin.john@intel.com> | ||
18 | ---- | ||
19 | diff -Naur iproute2-4.6.0-orig/include/libiptc/ipt_kernel_headers.h iproute2-4.6.0/include/libiptc/ipt_kernel_headers.h | ||
20 | --- iproute2-4.6.0-orig/include/libiptc/ipt_kernel_headers.h 2016-05-23 12:03:23.821826910 +0300 | ||
21 | +++ iproute2-4.6.0/include/libiptc/ipt_kernel_headers.h 2016-05-23 12:04:23.714078154 +0300 | ||
22 | @@ -6,7 +6,6 @@ | ||
23 | #include <limits.h> | ||
24 | |||
25 | #include <netinet/ip.h> | ||
26 | -#include <netinet/in.h> | ||
27 | #include <netinet/ip_icmp.h> | ||
28 | #include <netinet/tcp.h> | ||
29 | #include <netinet/udp.h> | ||
30 | diff -Naur iproute2-4.6.0-orig/include/linux/if_bridge.h iproute2-4.6.0/include/linux/if_bridge.h | ||
31 | --- iproute2-4.6.0-orig/include/linux/if_bridge.h 2016-05-23 12:03:23.821826910 +0300 | ||
32 | +++ iproute2-4.6.0/include/linux/if_bridge.h 2016-05-23 12:04:23.716078129 +0300 | ||
33 | @@ -15,7 +15,6 @@ | ||
34 | |||
35 | #include <linux/types.h> | ||
36 | #include <linux/if_ether.h> | ||
37 | -#include <linux/in6.h> | ||
38 | |||
39 | #define SYSFS_BRIDGE_ATTR "bridge" | ||
40 | #define SYSFS_BRIDGE_FDB "brforward" | ||
41 | diff -Naur iproute2-4.6.0-orig/include/linux/netfilter.h iproute2-4.6.0/include/linux/netfilter.h | ||
42 | --- iproute2-4.6.0-orig/include/linux/netfilter.h 2016-05-23 12:03:23.821826910 +0300 | ||
43 | +++ iproute2-4.6.0/include/linux/netfilter.h 2016-05-23 12:04:23.717078117 +0300 | ||
44 | @@ -4,8 +4,6 @@ | ||
45 | #include <linux/types.h> | ||
46 | |||
47 | #include <linux/sysctl.h> | ||
48 | -#include <linux/in.h> | ||
49 | -#include <linux/in6.h> | ||
50 | |||
51 | /* Responses from hook functions. */ | ||
52 | #define NF_DROP 0 | ||
53 | diff -Naur iproute2-4.6.0-orig/include/linux/netfilter_ipv4/ip_tables.h iproute2-4.6.0/include/linux/netfilter_ipv4/ip_tables.h | ||
54 | --- iproute2-4.6.0-orig/include/linux/netfilter_ipv4/ip_tables.h 2016-05-18 21:56:02.000000000 +0300 | ||
55 | +++ iproute2-4.6.0/include/linux/netfilter_ipv4/ip_tables.h 2016-05-23 12:09:22.888337961 +0300 | ||
56 | @@ -17,7 +17,6 @@ | ||
57 | |||
58 | #include <linux/types.h> | ||
59 | |||
60 | -#include <linux/if.h> | ||
61 | #include <linux/netfilter_ipv4.h> | ||
62 | |||
63 | #include <linux/netfilter/x_tables.h> | ||
64 | diff -Naur iproute2-4.6.0-orig/include/linux/xfrm.h iproute2-4.6.0/include/linux/xfrm.h | ||
65 | --- iproute2-4.6.0-orig/include/linux/xfrm.h 2016-05-23 12:03:23.821826910 +0300 | ||
66 | +++ iproute2-4.6.0/include/linux/xfrm.h 2016-05-23 12:04:23.718078104 +0300 | ||
67 | @@ -1,7 +1,6 @@ | ||
68 | #ifndef _LINUX_XFRM_H | ||
69 | #define _LINUX_XFRM_H | ||
70 | |||
71 | -#include <linux/in6.h> | ||
72 | #include <linux/types.h> | ||
73 | |||
74 | /* All of the structures in this file may not change size as they are | ||
75 | diff -Naur iproute2-4.6.0-orig/include/utils.h iproute2-4.6.0/include/utils.h | ||
76 | --- iproute2-4.6.0-orig/include/utils.h 2016-05-23 12:03:23.821826910 +0300 | ||
77 | +++ iproute2-4.6.0/include/utils.h 2016-05-23 12:04:23.718078104 +0300 | ||
78 | @@ -1,6 +1,7 @@ | ||
79 | #ifndef __UTILS_H__ | ||
80 | #define __UTILS_H__ 1 | ||
81 | |||
82 | +#include <sys/param.h> /* MAXPATHLEN */ | ||
83 | #include <sys/types.h> | ||
84 | #include <asm/types.h> | ||
85 | #include <resolv.h> | ||