summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2017-02-24 18:07:07 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 23:27:10 +0000
commitcfe0def06d981f076ea3bead4a07bfcaee15580e (patch)
tree1712a73625f8abe277df78ee3c8e61c8666bb8b7 /meta
parent162dac32bedc464d2263d777464b80fc93376688 (diff)
downloadpoky-cfe0def06d981f076ea3bead4a07bfcaee15580e.tar.gz
iproute2: upgrade to 4.10.0
4.9.0 -> 4.10.0 added the following patch to fix build with musl libc 1) 0001-libc-compat.h-add-musl-workaround.patch (From OE-Core rev: 306c79e303bd09a2e35a037635e5943d8711ef3d) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch41
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch131
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_4.10.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_4.9.0.bb)6
3 files changed, 44 insertions, 134 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
new file mode 100644
index 0000000000..3d324c96da
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-libc-compat.h-add-musl-workaround.patch
@@ -0,0 +1,41 @@
1From b7d96340c55afb7023ded0041107c63dbd886196 Mon Sep 17 00:00:00 2001
2From: Baruch Siach <baruch@tkos.co.il>
3Date: Thu, 22 Dec 2016 15:26:30 +0200
4Subject: [PATCH] libc-compat.h: add musl workaround
5
6The libc-compat.h kernel header uses glibc specific macros (__GLIBC__ and
7__USE_MISC) to solve conflicts with libc provided headers. This patch makes
8libc-compat.h work for musl libc as well.
9
10Upstream-Status: Pending
11
12Taken From:
13https://git.buildroot.net/buildroot/tree/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch
14
15Signed-off-by: Baruch Siach <baruch@tkos.co.il>
16Signed-off-by: Maxin B. John <maxin.john@intel.com>
17---
18 include/linux/libc-compat.h | 4 +++-
19 1 file changed, 3 insertions(+), 1 deletion(-)
20
21diff --git a/include/linux/libc-compat.h b/include/linux/libc-compat.h
22index f38571d..30f0b67 100644
23--- a/include/linux/libc-compat.h
24+++ b/include/linux/libc-compat.h
25@@ -49,10 +49,12 @@
26 #define _LIBC_COMPAT_H
27
28 /* We have included glibc headers... */
29-#if defined(__GLIBC__)
30+#if 1
31+#define __USE_MISC
32
33 /* Coordinate with glibc net/if.h header. */
34 #if defined(_NET_IF_H) && defined(__USE_MISC)
35+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
36
37 /* GLIBC headers included first so don't define anything
38 * that would already be defined. */
39--
402.4.0
41
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 @@
1Subject: [PATCH] Avoid in6_addr redefinition
2
3Due to both <netinet/in.h> and <linux/in6.h> being included, the
4in6_addr is being redefined: once from the C library headers and once
5from the kernel headers. This causes some build failures with for
6example the musl C library.
7
8In order to fix this, use just the C library header <netinet/in.h>.
9Original patch taken from
10http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch.
11
12(Refreshed the patch for 4.9 release)
13
14Upstream-Status: Pending
15
16Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
17Signed-off-by: Maxin B. John <maxin.john@intel.com>
18Signed-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
30diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h
31index 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>
42diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
43index 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"
54diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
55index 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
68diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
69index 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
81diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
82index 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>
93diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
94index 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
105diff --git a/include/utils.h b/include/utils.h
106index 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>
117diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c
118index 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--
1302.7.4
131
diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.9.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.10.0.bb
index 808e5502cd..a050e8737e 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_4.9.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_4.10.0.bb
@@ -3,11 +3,11 @@ 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.9.0-musl.patch \ 6 file://0001-libc-compat.h-add-musl-workaround.patch \
7 " 7 "
8 8
9SRC_URI[md5sum] = "44a8371a4b2c40e48e4c9f98cbd41391" 9SRC_URI[md5sum] = "b94a2b0edefaeac124dc8f5d006931b9"
10SRC_URI[sha256sum] = "c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4" 10SRC_URI[sha256sum] = "22b1e1c1fc704ad35837e5a66103739727b8b48ac90b48c13f79b7367ff0a9a8"
11 11
12# CFLAGS are computed in Makefile and reference CCOPTS 12# CFLAGS are computed in Makefile and reference CCOPTS
13# 13#