summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>2017-01-10 09:59:06 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-16 18:05:13 +0000
commit0c943538e42e78290cef4b8cbe434ed93cf4b0a9 (patch)
tree0a922331f65626b33fd9698253b677b7e07089b7
parente652fa4420eb7a53e52ad80a21c4a355975b5907 (diff)
downloadpoky-0c943538e42e78290cef4b8cbe434ed93cf4b0a9.tar.gz
iproute2 4.7->4.9
Upgrade iproute2 from 4.7 to 4.9 (From OE-Core rev: c6e7db1446a4c94caf3df0b8a9758888d1b8b7f9) Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch85
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch131
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_4.9.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_4.7.0.bb)7
3 files changed, 135 insertions, 88 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 @@
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.6 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>
18----
19diff -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>
30diff -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"
41diff -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
53diff -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>
64diff -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
75diff -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>
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
new file mode 100644
index 0000000000..737a90c6e2
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch
@@ -0,0 +1,131 @@
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.7.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.9.0.bb
index 426f989160..808e5502cd 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_4.7.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_4.9.0.bb
@@ -3,10 +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.3.0-musl.patch \ 6 file://iproute2-4.9.0-musl.patch \
7 " 7 "
8SRC_URI[md5sum] = "d4b205830cdc2702f8a0cbd6232129cd" 8
9SRC_URI[sha256sum] = "8f60dbcfb33a79daae0638f53bdcaa4310c0aa59ae39af8a234020dc69bb7b92" 9SRC_URI[md5sum] = "44a8371a4b2c40e48e4c9f98cbd41391"
10SRC_URI[sha256sum] = "c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4"
10 11
11# CFLAGS are computed in Makefile and reference CCOPTS 12# CFLAGS are computed in Makefile and reference CCOPTS
12# 13#
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 15:25:21 +0000