1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

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>
This commit is contained in:
Changhyeok Bae
2018-03-27 00:50:29 +00:00
committed by Richard Purdie
parent 8341cf5a18
commit 72f7e1d933
2 changed files with 2 additions and 66 deletions
@@ -1,63 +0,0 @@
Subject: [PATCH] iproute2: de-bash scripts
de-bash these two scripts to make iproute2 not depend on bash.
Upstream-Status: Pending
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
ip/ifcfg | 15 ++++++++-------
ip/rtpr | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ip/ifcfg b/ip/ifcfg
index 30a2dc4..8677b2e 100644
--- a/ip/ifcfg
+++ b/ip/ifcfg
@@ -1,12 +1,13 @@
-#! /bin/bash
+#! /bin/sh
CheckForwarding () {
- local sbase fwd
+ local sbase fwd forwarding
sbase=/proc/sys/net/ipv4/conf
fwd=0
if [ -d $sbase ]; then
for dir in $sbase/*/forwarding; do
- fwd=$[$fwd + `cat $dir`]
+ forwarding=`cat $dir`
+ fwd=$(($fwd+$forwarding))
done
else
fwd=2
@@ -127,12 +128,12 @@ fi
arping -q -A -c 1 -I $dev $ipaddr
noarp=$?
( sleep 2 ;
- arping -q -U -c 1 -I $dev $ipaddr ) >& /dev/null </dev/null &
+ arping -q -U -c 1 -I $dev $ipaddr ) > /dev/null 2>&1 </dev/null &
-ip route add unreachable 224.0.0.0/24 >& /dev/null
-ip route add unreachable 255.255.255.255 >& /dev/null
+ip route add unreachable 224.0.0.0/24 > /dev/null 2>&1
+ip route add unreachable 255.255.255.255 > /dev/null 2>&1
if [ "`ip link ls $dev | grep -c MULTICAST`" -ge 1 ]; then
- ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null
+ ip route add 224.0.0.0/4 dev $dev scope global > /dev/null 2>&1
fi
if [ $fwd -eq 0 ]; then
diff --git a/ip/rtpr b/ip/rtpr
index c3629fd..674198d 100644
--- a/ip/rtpr
+++ b/ip/rtpr
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
exec tr "[\\\\]" "[
]"
--
2.7.4
@@ -2,13 +2,12 @@ require iproute2.inc
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
file://configure-cross.patch \
file://0001-iproute2-de-bash-scripts.patch \
file://0001-libc-compat.h-add-musl-workaround.patch \
file://0001-ip-Remove-unneed-header.patch \
"
SRC_URI[md5sum] = "1075423d7029e02a8f23ed4f42b7e372"
SRC_URI[sha256sum] = "d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067"
SRC_URI[md5sum] = "0681bf4664b2649ad4e12551a3a7a1f9"
SRC_URI[sha256sum] = "48d4616a99d7b609b7b795c0ae8ec57099fb0271ed89253e8772c02327798355"
# CFLAGS are computed in Makefile and reference CCOPTS
#