summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChanghyeok Bae <changhyeok.bae@gmail.com>2017-11-13 16:06:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-21 13:06:12 +0000
commiteac8b65515d3478e4350af7d09d2c365866f8d5b (patch)
tree253e924cbc72ef5c377be0cfa84be937d348ba26
parentcf8aafe17ddd13a24c265d83f9c0a979bb2170f4 (diff)
downloadpoky-eac8b65515d3478e4350af7d09d2c365866f8d5b.tar.gz
iproute2: upgrade to 4.13
- 0001-include-stdint.h-explicitly-for-UINT16_MAX.patch is already applied to upstream. - Rebase two patches. (From OE-Core rev: 9839de8861c5fb2067664542045c0728653bbcb4) Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-include-stdint.h-explicitly-for-UINT16_MAX.patch32
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch16
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch11
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_4.13.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_4.11.0.bb)5
4 files changed, 15 insertions, 49 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-include-stdint.h-explicitly-for-UINT16_MAX.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-include-stdint.h-explicitly-for-UINT16_MAX.patch
deleted file mode 100644
index eb0c0abbab..0000000000
--- a/meta/recipes-connectivity/iproute2/iproute2/0001-include-stdint.h-explicitly-for-UINT16_MAX.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 3c885d87befc706bb923933b9819de6fe2de897e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 20 May 2017 14:03:19 -0700
4Subject: [PATCH] include stdint.h explicitly for UINT16_MAX)
5
6Fixes
7| tc_core.c:190:29: error: 'UINT16_MAX' undeclared (first use in this function); did you mean '__INT16_MAX__'?
8| if ((sz >> s->size_log) > UINT16_MAX) {
9| ^~~~~~~~~~
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13Upstream-Status: Pending
14
15 tc/tc_core.c | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/tc/tc_core.c b/tc/tc_core.c
19index 7bbe0d7..821b741 100644
20--- a/tc/tc_core.c
21+++ b/tc/tc_core.c
22@@ -12,6 +12,7 @@
23
24 #include <stdio.h>
25 #include <stdlib.h>
26+#include <stdint.h>
27 #include <unistd.h>
28 #include <syslog.h>
29 #include <fcntl.h>
30--
312.13.0
32
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch
index a9f8db6945..a9027c5b58 100644
--- a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch
@@ -1,6 +1,6 @@
1From f58fc99c88a54135e55a6e0956ce8ae71078d1cc Mon Sep 17 00:00:00 2001 1From 02ed10fc5215c4a32e6740b0a0c2439659be6801 Mon Sep 17 00:00:00 2001
2From: Changhyeok Bae <changhyeok.bae@gmail.com> 2From: Changhyeok Bae <changhyeok.bae@gmail.com>
3Date: Mon, 12 Jun 2017 04:29:07 +0000 3Date: Mon, 13 Nov 2017 15:59:35 +0000
4Subject: [PATCH] ip: Remove unneed header 4Subject: [PATCH] ip: Remove unneed header
5 5
6Fix redefinition of struct ethhdr with a suitably patched musl libc 6Fix redefinition of struct ethhdr with a suitably patched musl libc
@@ -8,23 +8,23 @@ that suppresses the kernel if_ether.h.
8 8
9Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> 9Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
10 10
11Upstream-Status: Submitted [netdev@vger.kernel.org] 11Upstream-Status: Pending [netdev@vger.kernel.org]
12--- 12---
13 ip/iplink_bridge.c | 1 - 13 ip/iplink_bridge.c | 1 -
14 1 file changed, 1 deletion(-) 14 1 file changed, 1 deletion(-)
15 15
16diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c 16diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
17index 818b43c..f065b22 100644 17index cccdec1..f065b22 100644
18--- a/ip/iplink_bridge.c 18--- a/ip/iplink_bridge.c
19+++ b/ip/iplink_bridge.c 19+++ b/ip/iplink_bridge.c
20@@ -15,7 +15,6 @@ 20@@ -13,7 +13,6 @@
21 #include <stdlib.h>
22 #include <string.h>
21 #include <netinet/in.h> 23 #include <netinet/in.h>
24-#include <netinet/ether.h>
22 #include <linux/if_link.h> 25 #include <linux/if_link.h>
23 #include <linux/if_bridge.h> 26 #include <linux/if_bridge.h>
24-#include <netinet/ether.h>
25 #include <net/if.h> 27 #include <net/if.h>
26
27 #include "rt_names.h"
28-- 28--
292.7.4 292.7.4
30 30
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch
index 39c7d40319..c3d3fea9c2 100644
--- a/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch
@@ -5,14 +5,13 @@ de-bash these two scripts to make iproute2 not depend on bash.
5Upstream-Status: Pending 5Upstream-Status: Pending
6 6
7Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 7Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
8
9--- 8---
10 ip/ifcfg | 15 ++++++++------- 9 ip/ifcfg | 15 ++++++++-------
11 ip/rtpr | 2 +- 10 ip/rtpr | 2 +-
12 2 files changed, 9 insertions(+), 8 deletions(-) 11 2 files changed, 9 insertions(+), 8 deletions(-)
13 12
14diff --git a/ip/ifcfg b/ip/ifcfg 13diff --git a/ip/ifcfg b/ip/ifcfg
15index 083d9df..60bcf1f 100644 14index 30a2dc4..8677b2e 100644
16--- a/ip/ifcfg 15--- a/ip/ifcfg
17+++ b/ip/ifcfg 16+++ b/ip/ifcfg
18@@ -1,12 +1,13 @@ 17@@ -1,12 +1,13 @@
@@ -43,7 +42,7 @@ index 083d9df..60bcf1f 100644
43-ip route add unreachable 255.255.255.255 >& /dev/null 42-ip route add unreachable 255.255.255.255 >& /dev/null
44+ip route add unreachable 224.0.0.0/24 > /dev/null 2>&1 43+ip route add unreachable 224.0.0.0/24 > /dev/null 2>&1
45+ip route add unreachable 255.255.255.255 > /dev/null 2>&1 44+ip route add unreachable 255.255.255.255 > /dev/null 2>&1
46 if [ `ip link ls $dev | grep -c MULTICAST` -ge 1 ]; then 45 if [ "`ip link ls $dev | grep -c MULTICAST`" -ge 1 ]; then
47- ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null 46- ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null
48+ ip route add 224.0.0.0/4 dev $dev scope global > /dev/null 2>&1 47+ ip route add 224.0.0.0/4 dev $dev scope global > /dev/null 2>&1
49 fi 48 fi
@@ -60,5 +59,5 @@ index c3629fd..674198d 100644
60 exec tr "[\\\\]" "[ 59 exec tr "[\\\\]" "[
61 ]" 60 ]"
62-- 61--
631.7.9.5 622.7.4
64 63
diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.11.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.13.0.bb
index dbd0545436..32bf0d52f1 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_4.11.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_4.13.0.bb
@@ -4,12 +4,11 @@ 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://0001-libc-compat.h-add-musl-workaround.patch \ 6 file://0001-libc-compat.h-add-musl-workaround.patch \
7 file://0001-include-stdint.h-explicitly-for-UINT16_MAX.patch \
8 file://0001-ip-Remove-unneed-header.patch \ 7 file://0001-ip-Remove-unneed-header.patch \
9 " 8 "
10 9
11SRC_URI[md5sum] = "7a9498de88bcca95c305df6108ae197e" 10SRC_URI[md5sum] = "69dc9e3ece3296890278f0de478330c8"
12SRC_URI[sha256sum] = "72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026" 11SRC_URI[sha256sum] = "9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50"
13 12
14# CFLAGS are computed in Makefile and reference CCOPTS 13# CFLAGS are computed in Makefile and reference CCOPTS
15# 14#