diff options
Diffstat (limited to 'meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch | 131 |
1 files changed, 0 insertions, 131 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch deleted file mode 100644 index 737a90c6e2..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch +++ /dev/null | |||
@@ -1,131 +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.9 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 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | ||
19 | --- | ||
20 | include/libiptc/ipt_kernel_headers.h | 1 - | ||
21 | include/linux/if_bridge.h | 1 - | ||
22 | include/linux/if_tunnel.h | 2 -- | ||
23 | include/linux/netfilter.h | 2 -- | ||
24 | include/linux/netfilter_ipv4/ip_tables.h | 1 - | ||
25 | include/linux/xfrm.h | 1 - | ||
26 | include/utils.h | 1 + | ||
27 | ip/ip6tunnel.c | 1 - | ||
28 | 8 files changed, 1 insertion(+), 9 deletions(-) | ||
29 | |||
30 | diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h | ||
31 | index a5963e9..42f8610 100644 | ||
32 | --- a/include/libiptc/ipt_kernel_headers.h | ||
33 | +++ b/include/libiptc/ipt_kernel_headers.h | ||
34 | @@ -6,7 +6,6 @@ | ||
35 | #include <limits.h> | ||
36 | |||
37 | #include <netinet/ip.h> | ||
38 | -#include <netinet/in.h> | ||
39 | #include <netinet/ip_icmp.h> | ||
40 | #include <netinet/tcp.h> | ||
41 | #include <netinet/udp.h> | ||
42 | diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h | ||
43 | index b7393dd..a7028ab 100644 | ||
44 | --- a/include/linux/if_bridge.h | ||
45 | +++ b/include/linux/if_bridge.h | ||
46 | @@ -15,7 +15,6 @@ | ||
47 | |||
48 | #include <linux/types.h> | ||
49 | #include <linux/if_ether.h> | ||
50 | -#include <linux/in6.h> | ||
51 | |||
52 | #define SYSFS_BRIDGE_ATTR "bridge" | ||
53 | #define SYSFS_BRIDGE_FDB "brforward" | ||
54 | diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h | ||
55 | index 4f975f5..2680646 100644 | ||
56 | --- a/include/linux/if_tunnel.h | ||
57 | +++ b/include/linux/if_tunnel.h | ||
58 | @@ -2,9 +2,7 @@ | ||
59 | #define _IF_TUNNEL_H_ | ||
60 | |||
61 | #include <linux/types.h> | ||
62 | -#include <linux/if.h> | ||
63 | #include <linux/ip.h> | ||
64 | -#include <linux/in6.h> | ||
65 | #include <asm/byteorder.h> | ||
66 | |||
67 | |||
68 | diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h | ||
69 | index b71b4c9..3e4e6ae 100644 | ||
70 | --- a/include/linux/netfilter.h | ||
71 | +++ b/include/linux/netfilter.h | ||
72 | @@ -4,8 +4,6 @@ | ||
73 | #include <linux/types.h> | ||
74 | |||
75 | #include <linux/sysctl.h> | ||
76 | -#include <linux/in.h> | ||
77 | -#include <linux/in6.h> | ||
78 | |||
79 | /* Responses from hook functions. */ | ||
80 | #define NF_DROP 0 | ||
81 | diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h | ||
82 | index 456fb86..38542b4 100644 | ||
83 | --- a/include/linux/netfilter_ipv4/ip_tables.h | ||
84 | +++ b/include/linux/netfilter_ipv4/ip_tables.h | ||
85 | @@ -17,7 +17,6 @@ | ||
86 | |||
87 | #include <linux/types.h> | ||
88 | |||
89 | -#include <linux/if.h> | ||
90 | #include <linux/netfilter_ipv4.h> | ||
91 | |||
92 | #include <linux/netfilter/x_tables.h> | ||
93 | diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h | ||
94 | index d2dd1fd..8c72966 100644 | ||
95 | --- a/include/linux/xfrm.h | ||
96 | +++ b/include/linux/xfrm.h | ||
97 | @@ -1,7 +1,6 @@ | ||
98 | #ifndef _LINUX_XFRM_H | ||
99 | #define _LINUX_XFRM_H | ||
100 | |||
101 | -#include <linux/in6.h> | ||
102 | #include <linux/types.h> | ||
103 | |||
104 | /* All of the structures in this file may not change size as they are | ||
105 | diff --git a/include/utils.h b/include/utils.h | ||
106 | index 1b4f939..d10840b 100644 | ||
107 | --- a/include/utils.h | ||
108 | +++ b/include/utils.h | ||
109 | @@ -1,6 +1,7 @@ | ||
110 | #ifndef __UTILS_H__ | ||
111 | #define __UTILS_H__ 1 | ||
112 | |||
113 | +#include <sys/param.h> /* MAXPATHLEN */ | ||
114 | #include <sys/types.h> | ||
115 | #include <asm/types.h> | ||
116 | #include <resolv.h> | ||
117 | diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c | ||
118 | index b1c0ae6..8fa4eb2 100644 | ||
119 | --- a/ip/ip6tunnel.c | ||
120 | +++ b/ip/ip6tunnel.c | ||
121 | @@ -28,7 +28,6 @@ | ||
122 | #include <arpa/inet.h> | ||
123 | #include <sys/ioctl.h> | ||
124 | #include <linux/ip.h> | ||
125 | -#include <linux/if.h> | ||
126 | #include <linux/if_arp.h> | ||
127 | #include <linux/if_tunnel.h> | ||
128 | #include <linux/ip6_tunnel.h> | ||
129 | -- | ||
130 | 2.7.4 | ||
131 | |||