summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChanghyeok Bae <changhyeok.bae@gmail.com>2018-03-27 00:50:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:01 +0100
commit72f7e1d9337795233154b8bf8a5ae9d5f74e7d75 (patch)
treed2acd160ef2f90986044e6f1f2ff37f4422a7e05 /meta
parent8341cf5a18bbca473d8b704c8af1aadd8ec2f2d3 (diff)
downloadpoky-72f7e1d9337795233154b8bf8a5ae9d5f74e7d75.tar.gz
iproute2: update 4.14.1 -> 4.15.0
0001-iproute2-de-bash-scripts.patch is applied in upstream repo. (From OE-Core rev: 59b1eba253d488c2a67ba8a98e937e92271efcc1) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch63
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_4.15.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb)5
2 files changed, 2 insertions, 66 deletions
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
deleted file mode 100644
index c3d3fea9c2..0000000000
--- a/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1Subject: [PATCH] iproute2: de-bash scripts
2
3de-bash these two scripts to make iproute2 not depend on bash.
4
5Upstream-Status: Pending
6
7Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
8---
9 ip/ifcfg | 15 ++++++++-------
10 ip/rtpr | 2 +-
11 2 files changed, 9 insertions(+), 8 deletions(-)
12
13diff --git a/ip/ifcfg b/ip/ifcfg
14index 30a2dc4..8677b2e 100644
15--- a/ip/ifcfg
16+++ b/ip/ifcfg
17@@ -1,12 +1,13 @@
18-#! /bin/bash
19+#! /bin/sh
20
21 CheckForwarding () {
22- local sbase fwd
23+ local sbase fwd forwarding
24 sbase=/proc/sys/net/ipv4/conf
25 fwd=0
26 if [ -d $sbase ]; then
27 for dir in $sbase/*/forwarding; do
28- fwd=$[$fwd + `cat $dir`]
29+ forwarding=`cat $dir`
30+ fwd=$(($fwd+$forwarding))
31 done
32 else
33 fwd=2
34@@ -127,12 +128,12 @@ fi
35 arping -q -A -c 1 -I $dev $ipaddr
36 noarp=$?
37 ( sleep 2 ;
38- arping -q -U -c 1 -I $dev $ipaddr ) >& /dev/null </dev/null &
39+ arping -q -U -c 1 -I $dev $ipaddr ) > /dev/null 2>&1 </dev/null &
40
41-ip route add unreachable 224.0.0.0/24 >& /dev/null
42-ip route add unreachable 255.255.255.255 >& /dev/null
43+ip route add unreachable 224.0.0.0/24 > /dev/null 2>&1
44+ip route add unreachable 255.255.255.255 > /dev/null 2>&1
45 if [ "`ip link ls $dev | grep -c MULTICAST`" -ge 1 ]; then
46- ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null
47+ ip route add 224.0.0.0/4 dev $dev scope global > /dev/null 2>&1
48 fi
49
50 if [ $fwd -eq 0 ]; then
51diff --git a/ip/rtpr b/ip/rtpr
52index c3629fd..674198d 100644
53--- a/ip/rtpr
54+++ b/ip/rtpr
55@@ -1,4 +1,4 @@
56-#! /bin/bash
57+#! /bin/sh
58
59 exec tr "[\\\\]" "[
60 ]"
61--
622.7.4
63
diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb b/meta/recipes-connectivity/iproute2/iproute2_4.15.0.bb
index 81e2e4a164..7942bbf82d 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_4.14.1.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_4.15.0.bb
@@ -2,13 +2,12 @@ require iproute2.inc
2 2
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 \
6 file://0001-libc-compat.h-add-musl-workaround.patch \ 5 file://0001-libc-compat.h-add-musl-workaround.patch \
7 file://0001-ip-Remove-unneed-header.patch \ 6 file://0001-ip-Remove-unneed-header.patch \
8 " 7 "
9 8
10SRC_URI[md5sum] = "1075423d7029e02a8f23ed4f42b7e372" 9SRC_URI[md5sum] = "0681bf4664b2649ad4e12551a3a7a1f9"
11SRC_URI[sha256sum] = "d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067" 10SRC_URI[sha256sum] = "48d4616a99d7b609b7b795c0ae8ec57099fb0271ed89253e8772c02327798355"
12 11
13# CFLAGS are computed in Makefile and reference CCOPTS 12# CFLAGS are computed in Makefile and reference CCOPTS
14# 13#