summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2016-05-04 11:20:24 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-11 10:33:39 +0100
commit8c1932e05ed44d975beeb517e469f9a8d15ecfc1 (patch)
tree7fdef637af870de980256c4bbf6c64dc1de1d2a9 /meta/recipes-connectivity
parentcc5e1294922da1969d9f108d45a19f02162af71e (diff)
downloadpoky-8c1932e05ed44d975beeb517e469f9a8d15ecfc1.tar.gz
iproute2: upgrade to version 4.5.0
4.4.0 -> 4.5.0 Refreshed iproute2 musl build fix patch for 4.5.0 Remove backported patch: iproute2-fix-building-with-musl.patch (From OE-Core rev: 9d3d76a43d27c95aac8d7a840c9c38c686b166ec) 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/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch97
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/iproute2-fix-building-with-musl.patch24
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_4.5.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_4.4.0.bb)5
3 files changed, 39 insertions, 87 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
index 1b415a5119..bbe0242a23 100644
--- a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch
@@ -1,64 +1,35 @@
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 1Subject: [PATCH] Avoid in6_addr redefinition
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8 2
9Due to both <netinet/in.h> and <linux/in6.h> being included, the 3Due 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 4in6_addr is being redefined: once from the C library headers and once
11from the kernel headers. This causes some build failures with for 5from the kernel headers. This causes some build failures with for
12example the musl C library: 6example 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 7
26In order to fix this, use just the C library header <netinet/in.h>. 8In order to fix this, use just the C library header <netinet/in.h>.
27
28Original patch taken from 9Original patch taken from
29http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch. 10http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch.
30 11
31Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 12(Refreshed the patch for 4.5 release)
32---
33Upstream-Status: Pending
34 13
35 include/libiptc/ipt_kernel_headers.h | 2 -- 14Upstream-Status: Pending
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 15
41diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h 16Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
42index 7e87828..9566be5 100644 17Signed-off-by: Maxin B. John <maxin.john@intel.com>
43--- a/include/libiptc/ipt_kernel_headers.h 18---
44+++ b/include/libiptc/ipt_kernel_headers.h 19diff -Naur iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h
45@@ -15,12 +15,10 @@ 20--- iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h 2016-03-15 01:02:31.000000000 +0200
46 #else /* libc5 */ 21+++ iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h 2016-03-23 18:33:38.579062567 +0200
47 #include <sys/socket.h> 22@@ -6,7 +6,6 @@
48 #include <linux/ip.h> 23 #include <limits.h>
49-#include <linux/in.h> 24
50 #include <linux/if.h> 25 #include <netinet/ip.h>
51 #include <linux/icmp.h> 26-#include <netinet/in.h>
52 #include <linux/tcp.h> 27 #include <netinet/ip_icmp.h>
53 #include <linux/udp.h> 28 #include <netinet/tcp.h>
54 #include <linux/types.h> 29 #include <netinet/udp.h>
55-#include <linux/in6.h> 30diff -Naur iproute2-4.5.0-orig/include/linux/if_bridge.h iproute2-4.5.0/include/linux/if_bridge.h
56 #endif 31--- iproute2-4.5.0-orig/include/linux/if_bridge.h 2016-03-15 01:02:31.000000000 +0200
57 #endif 32+++ iproute2-4.5.0/include/linux/if_bridge.h 2016-03-23 18:33:58.569812648 +0200
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 @@ 33@@ -15,7 +15,6 @@
63 34
64 #include <linux/types.h> 35 #include <linux/types.h>
@@ -67,10 +38,9 @@ index ee197a3..f823aa4 100644
67 38
68 #define SYSFS_BRIDGE_ATTR "bridge" 39 #define SYSFS_BRIDGE_ATTR "bridge"
69 #define SYSFS_BRIDGE_FDB "brforward" 40 #define SYSFS_BRIDGE_FDB "brforward"
70diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h 41diff -Naur iproute2-4.5.0-orig/include/linux/netfilter.h iproute2-4.5.0/include/linux/netfilter.h
71index b71b4c9..3e4e6ae 100644 42--- iproute2-4.5.0-orig/include/linux/netfilter.h 2016-03-15 01:02:31.000000000 +0200
72--- a/include/linux/netfilter.h 43+++ iproute2-4.5.0/include/linux/netfilter.h 2016-03-23 18:34:38.138317974 +0200
73+++ b/include/linux/netfilter.h
74@@ -4,8 +4,6 @@ 44@@ -4,8 +4,6 @@
75 #include <linux/types.h> 45 #include <linux/types.h>
76 46
@@ -80,10 +50,9 @@ index b71b4c9..3e4e6ae 100644
80 50
81 /* Responses from hook functions. */ 51 /* Responses from hook functions. */
82 #define NF_DROP 0 52 #define NF_DROP 0
83diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h 53diff -Naur iproute2-4.5.0-orig/include/linux/xfrm.h iproute2-4.5.0/include/linux/xfrm.h
84index b8f5451..a9761a5 100644 54--- iproute2-4.5.0-orig/include/linux/xfrm.h 2016-03-15 01:02:31.000000000 +0200
85--- a/include/linux/xfrm.h 55+++ iproute2-4.5.0/include/linux/xfrm.h 2016-03-23 18:34:57.539075431 +0200
86+++ b/include/linux/xfrm.h
87@@ -1,7 +1,6 @@ 56@@ -1,7 +1,6 @@
88 #ifndef _LINUX_XFRM_H 57 #ifndef _LINUX_XFRM_H
89 #define _LINUX_XFRM_H 58 #define _LINUX_XFRM_H
@@ -92,6 +61,14 @@ index b8f5451..a9761a5 100644
92 #include <linux/types.h> 61 #include <linux/types.h>
93 62
94 /* All of the structures in this file may not change size as they are 63 /* All of the structures in this file may not change size as they are
95-- 64diff -Naur iproute2-4.5.0-orig/include/utils.h iproute2-4.5.0/include/utils.h
962.6.3 65--- iproute2-4.5.0-orig/include/utils.h 2016-03-15 01:02:31.000000000 +0200
97 66+++ iproute2-4.5.0/include/utils.h 2016-03-23 18:35:50.066418749 +0200
67@@ -1,6 +1,7 @@
68 #ifndef __UTILS_H__
69 #define __UTILS_H__ 1
70
71+#include <sys/param.h> /* MAXPATHLEN */
72 #include <sys/types.h>
73 #include <asm/types.h>
74 #include <resolv.h>
diff --git a/meta/recipes-connectivity/iproute2/iproute2/iproute2-fix-building-with-musl.patch b/meta/recipes-connectivity/iproute2/iproute2/iproute2-fix-building-with-musl.patch
deleted file mode 100644
index c83a243b71..0000000000
--- a/meta/recipes-connectivity/iproute2/iproute2/iproute2-fix-building-with-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1iproute2: fix building with musl
2
3We need limits.h for PATH_MAX, fixes:
4
5rt_names.c:364:13: error: ‘PATH_MAX’ undeclared (first use in this
6function)
7
8Upstream-Status: Backport
9
10Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
11Signed-off-by: Maxin B. John <maxin.john@intel.com>
12---
13diff --git a/lib/rt_names.c b/lib/rt_names.c
14index f6d17c0..b665d3e 100644
15--- a/lib/rt_names.c
16+++ b/lib/rt_names.c
17@@ -18,6 +18,7 @@
18 #include <sys/time.h>
19 #include <sys/socket.h>
20 #include <dirent.h>
21+#include <limits.h>
22
23 #include <asm/types.h>
24 #include <linux/rtnetlink.h>
diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.4.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.5.0.bb
index 7979e8bebd..c047446dca 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_4.4.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_4.5.0.bb
@@ -4,10 +4,9 @@ SRC_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 file://iproute2-4.3.0-musl.patch \
7 file://iproute2-fix-building-with-musl.patch \
8 " 7 "
9SRC_URI[md5sum] = "d762653ec3e1ab0d4a9689e169ca184f" 8SRC_URI[md5sum] = "b9ee1cbba7e20e04dfdd4b3055181955"
10SRC_URI[sha256sum] = "bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514" 9SRC_URI[sha256sum] = "3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a"
11 10
12# CFLAGS are computed in Makefile and reference CCOPTS 11# CFLAGS are computed in Makefile and reference CCOPTS
13# 12#