From 197a1ef8f0d9655e82cc24a524cd1143d80eb539 Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Wed, 20 Jun 2018 15:30:24 +0300 Subject: iproute2: fix/sync with 4.17 from oe-core Change-Id: Ia3f88004fa17d071b060bbad2f95acc0c4e44d0e Signed-off-by: Anders Roxell Signed-off-by: Fathi Boudra --- core/recipes-connectivity/iproute2/iproute2.inc | 2 +- .../iproute2/0001-iproute2-de-bash-scripts.patch | 63 ---------------------- .../0001-make-configure-cross-compile-safe.patch | 38 ------------- .../iproute2/0002-iproute2-de-bash-scripts.patch | 55 ------------------- .../iproute2/iproute2_4.14.1.bb | 15 ------ .../iproute2/iproute2_4.17.0.bb | 5 +- 6 files changed, 4 insertions(+), 174 deletions(-) delete mode 100644 core/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch delete mode 100644 core/recipes-connectivity/iproute2/iproute2/0001-make-configure-cross-compile-safe.patch delete mode 100644 core/recipes-connectivity/iproute2/iproute2/0002-iproute2-de-bash-scripts.patch delete mode 100644 core/recipes-connectivity/iproute2/iproute2_4.14.1.bb diff --git a/core/recipes-connectivity/iproute2/iproute2.inc b/core/recipes-connectivity/iproute2/iproute2.inc index 4fbfec6..b283589 100644 --- a/core/recipes-connectivity/iproute2/iproute2.inc +++ b/core/recipes-connectivity/iproute2/iproute2.inc @@ -9,7 +9,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://ip/ip.c;beginline=3;endline=8;md5=689d691d0410a4b64d3899f8d6e31817" -DEPENDS = "flex-native bison-native iptables elfutils" +DEPENDS = "flex-native bison-native iptables elfutils libcap" inherit update-alternatives bash-completion pkgconfig diff --git a/core/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch b/core/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch deleted file mode 100644 index c3d3fea..0000000 --- a/core/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch +++ /dev/null @@ -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 ---- - 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 2>&1 & /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 - diff --git a/core/recipes-connectivity/iproute2/iproute2/0001-make-configure-cross-compile-safe.patch b/core/recipes-connectivity/iproute2/iproute2/0001-make-configure-cross-compile-safe.patch deleted file mode 100644 index 95f9d30..0000000 --- a/core/recipes-connectivity/iproute2/iproute2/0001-make-configure-cross-compile-safe.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fc00c43f31ca66c7ef081e86efd7cd54ec6a60d5 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Thu, 3 Nov 2011 10:46:16 +0100 -Subject: [PATCH 1/4] make configure cross compile safe - -According to Kevin Tian: -Upstream-Status: Pending - -Signed-off-by: Koen Kooi -Signed-off-by: Shane Wang ---- - configure | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure b/configure -index 5ef5cd4cf9cd..9a092e749ff3 100755 ---- a/configure -+++ b/configure -@@ -3,6 +3,7 @@ - # This is not an autoconf generated configure - # - INCLUDE=${1:-"$PWD/include"} -+SYSROOT=$1 - - # Output file which is input to Makefile - CONFIG=config.mk -@@ -184,7 +185,7 @@ check_ipt_lib_dir() - return - fi - -- for dir in /lib /usr/lib /usr/local/lib -+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib - do - for file in $dir/{xtables,iptables}/lib*t_*so ; do - if [ -f $file ]; then --- -2.17.0 - diff --git a/core/recipes-connectivity/iproute2/iproute2/0002-iproute2-de-bash-scripts.patch b/core/recipes-connectivity/iproute2/iproute2/0002-iproute2-de-bash-scripts.patch deleted file mode 100644 index 8595c9d..0000000 --- a/core/recipes-connectivity/iproute2/iproute2/0002-iproute2-de-bash-scripts.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b8f10fcfe7490369d65e0fd19f281216b9a0c554 Mon Sep 17 00:00:00 2001 -From: Chen Qi -Date: Fri, 1 Jun 2018 13:58:54 +0200 -Subject: [PATCH 2/4] iproute2: de-bash scripts - -de-bash these two scripts to make iproute2 not depend on bash. - -Upstream-Status: Pending - -Signed-off-by: Chen Qi -Signed-off-by: Anders Roxell ---- - ip/ifcfg | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/ip/ifcfg b/ip/ifcfg -index 5b34decd4480..e1cf2f644774 100755 ---- a/ip/ifcfg -+++ b/ip/ifcfg -@@ -2,12 +2,13 @@ - # SPDX-License-Identifier: GPL-2.0 - - 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 -@@ -128,12 +129,12 @@ fi - arping -q -A -c 1 -I $dev $ipaddr - noarp=$? - ( sleep 2 ; -- arping -q -U -c 1 -I $dev $ipaddr ) >/dev/null 2>&1 /dev/null 2>&1 /dev/null 2>&1 --ip route add unreachable 255.255.255.255 >/dev/null 2>&1 -+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 2>&1 -+ ip route add 224.0.0.0/4 dev $dev scope global > /dev/null 2>&1 - fi - - if [ $fwd -eq 0 ]; then --- -2.17.0 - diff --git a/core/recipes-connectivity/iproute2/iproute2_4.14.1.bb b/core/recipes-connectivity/iproute2/iproute2_4.14.1.bb deleted file mode 100644 index 81e2e4a..0000000 --- a/core/recipes-connectivity/iproute2/iproute2_4.14.1.bb +++ /dev/null @@ -1,15 +0,0 @@ -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" - -# CFLAGS are computed in Makefile and reference CCOPTS -# -EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS}'" diff --git a/core/recipes-connectivity/iproute2/iproute2_4.17.0.bb b/core/recipes-connectivity/iproute2/iproute2_4.17.0.bb index 6d77106..12812b0 100644 --- a/core/recipes-connectivity/iproute2/iproute2_4.17.0.bb +++ b/core/recipes-connectivity/iproute2/iproute2_4.17.0.bb @@ -1,8 +1,9 @@ require iproute2.inc SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ - file://0001-make-configure-cross-compile-safe.patch \ - file://0002-iproute2-de-bash-scripts.patch \ + file://configure-cross.patch \ + file://0001-libc-compat.h-add-musl-workaround.patch \ + file://0001-ip-Remove-unneed-header.patch \ " SRC_URI[md5sum] = "6f3a87fe2d97c28214fc2faab2c257d6" -- cgit v1.2.3