summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-01-07 03:00:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:29 +0000
commita3f9721399ea16756fdc38708a0a0cc748e37853 (patch)
treec3afd7646db64459dd79e2c51db9239a470e9e45 /meta/recipes-connectivity
parent22333f01d8b5342cd2a1fbda7d58e414e9a34f2b (diff)
downloadpoky-a3f9721399ea16756fdc38708a0a0cc748e37853.tar.gz
iproute2: Fix build with musl
(From OE-Core rev: e24ca9a02c0c66796c9815752679594e78821127) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch97
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_4.3.0.bb1
2 files changed, 98 insertions, 0 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
new file mode 100644
index 0000000000..1b415a5119
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch
@@ -0,0 +1,97 @@
1From 48596709d8ab59727b79a5c6db33ebb251c36543 Mon Sep 17 00:00:00 2001
2From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
3Date: Thu, 19 Nov 2015 17:44:25 +0100
4Subject: [PATCH] Avoid in6_addr redefinition
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Due to both <netinet/in.h> and <linux/in6.h> being included, the
10in6_addr is being redefined: once from the C library headers and once
11from the kernel headers. This causes some build failures with for
12example the musl C library:
13
14In file included from ../include/linux/xfrm.h:4:0,
15 from xfrm.h:29,
16 from ipxfrm.c:39:
17../include/linux/in6.h:32:8: error: redefinition of ‘struct in6_addr’
18 struct in6_addr {
19 ^
20In file included from .../output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netdb.h:9:0,
21 from ipxfrm.c:34:
22.../output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:24:8: note: originally defined here
23 struct in6_addr
24 ^
25
26In order to fix this, use just the C library header <netinet/in.h>.
27
28Original patch taken from
29http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch.
30
31Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
32---
33Upstream-Status: Pending
34
35 include/libiptc/ipt_kernel_headers.h | 2 --
36 include/linux/if_bridge.h | 1 -
37 include/linux/netfilter.h | 2 --
38 include/linux/xfrm.h | 1 -
39 4 files changed, 6 deletions(-)
40
41diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h
42index 7e87828..9566be5 100644
43--- a/include/libiptc/ipt_kernel_headers.h
44+++ b/include/libiptc/ipt_kernel_headers.h
45@@ -15,12 +15,10 @@
46 #else /* libc5 */
47 #include <sys/socket.h>
48 #include <linux/ip.h>
49-#include <linux/in.h>
50 #include <linux/if.h>
51 #include <linux/icmp.h>
52 #include <linux/tcp.h>
53 #include <linux/udp.h>
54 #include <linux/types.h>
55-#include <linux/in6.h>
56 #endif
57 #endif
58diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
59index ee197a3..f823aa4 100644
60--- a/include/linux/if_bridge.h
61+++ b/include/linux/if_bridge.h
62@@ -15,7 +15,6 @@
63
64 #include <linux/types.h>
65 #include <linux/if_ether.h>
66-#include <linux/in6.h>
67
68 #define SYSFS_BRIDGE_ATTR "bridge"
69 #define SYSFS_BRIDGE_FDB "brforward"
70diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
71index b71b4c9..3e4e6ae 100644
72--- a/include/linux/netfilter.h
73+++ b/include/linux/netfilter.h
74@@ -4,8 +4,6 @@
75 #include <linux/types.h>
76
77 #include <linux/sysctl.h>
78-#include <linux/in.h>
79-#include <linux/in6.h>
80
81 /* Responses from hook functions. */
82 #define NF_DROP 0
83diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
84index b8f5451..a9761a5 100644
85--- a/include/linux/xfrm.h
86+++ b/include/linux/xfrm.h
87@@ -1,7 +1,6 @@
88 #ifndef _LINUX_XFRM_H
89 #define _LINUX_XFRM_H
90
91-#include <linux/in6.h>
92 #include <linux/types.h>
93
94 /* All of the structures in this file may not change size as they are
95--
962.6.3
97
diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.3.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.3.0.bb
index 0b3d896047..60f0a8d19c 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_4.3.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_4.3.0.bb
@@ -3,6 +3,7 @@ require iproute2.inc
3SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ 3SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
4 file://configure-cross.patch \ 4 file://configure-cross.patch \
5 file://0001-iproute2-de-bash-scripts.patch \ 5 file://0001-iproute2-de-bash-scripts.patch \
6 file://iproute2-4.3.0-musl.patch \
6 " 7 "
7SRC_URI[md5sum] = "1a2bbb80cfc7ab3f3e987e18b3207c2f" 8SRC_URI[md5sum] = "1a2bbb80cfc7ab3f3e987e18b3207c2f"
8SRC_URI[sha256sum] = "f03b1188dd6c039512424de82ff7a8f3b446680bd4e908ff42a7b9b137422995" 9SRC_URI[sha256sum] = "f03b1188dd6c039512424de82ff7a8f3b446680bd4e908ff42a7b9b137422995"