[oe-commits] Marc Olzheim : iproute2: Remove unneeded bash dependency

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 658cf78bc2615df4d3a8ef5b2f5c9974d4aab292
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=658cf78bc2615df4d3a8ef5b2f5c9974d4aab292

Author: Marc Olzheim <marc at iphion.nl>
Date:   Fri Jan 22 00:22:35 2010 -0800

iproute2: Remove unneeded bash dependency

* Even though the recipes did not list it in REDEPENDS, two scripts in
  this package depended on bash. Since this was unneeded, I removed that
  dependency. (Upstream notified)

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/iproute2/files/remove-bashisms.patch |   59 ++++++++++++++++++++++++++
 recipes/iproute2/iproute2_2.6.20.bb          |    3 +-
 recipes/iproute2/iproute2_2.6.22.bb          |    3 +-
 recipes/iproute2/iproute2_2.6.29.bb          |    3 +-
 4 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/recipes/iproute2/files/remove-bashisms.patch b/recipes/iproute2/files/remove-bashisms.patch
new file mode 100644
index 0000000..f90149a
--- /dev/null
+++ b/recipes/iproute2/files/remove-bashisms.patch
@@ -0,0 +1,59 @@
+From ddf7948f9a088f26e7ed9ba01479029cd4e6f060 Mon Sep 17 00:00:00 2001
+From: Marc Olzheim <marc at iphion.nl>
+Date: Wed, 18 Nov 2009 10:43:53 +0100
+Subject: [PATCH] Get rid of bashisms.
+
+---
+ ip/ifcfg |   12 ++++++------
+ ip/rtpr  |    2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/ip/ifcfg b/ip/ifcfg
+index 083d9df..cd78d61 100644
+--- a/ip/ifcfg
++++ b/ip/ifcfg
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#! /bin/sh
+ 
+ CheckForwarding () {
+   local sbase fwd
+@@ -6,7 +6,7 @@ CheckForwarding () {
+   fwd=0
+   if [ -d $sbase ]; then
+     for dir in $sbase/*/forwarding; do
+-      fwd=$[$fwd + `cat $dir`]
++      fwd=$(($fwd + `cat $dir`))
+     done
+   else
+     fwd=2
+@@ -127,12 +127,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 "[\\\\]" "[
+ ]"
+-- 
+1.6.3.3
+
diff --git a/recipes/iproute2/iproute2_2.6.20.bb b/recipes/iproute2/iproute2_2.6.20.bb
index dd1a504..ec659a8 100644
--- a/recipes/iproute2/iproute2_2.6.20.bb
+++ b/recipes/iproute2/iproute2_2.6.20.bb
@@ -1,11 +1,12 @@
 require iproute2.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 DATE = "070313"
 
 SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
                    file://ip6tunnel.patch;patch=1 \
                    file://man-pages-fix.patch;patch=1 \
+                   file://remove-bashisms.patch;patch=1 \
                    file://no-strip.patch;patch=1"
 
 S = "${WORKDIR}/iproute-${PV}-${DATE}"
diff --git a/recipes/iproute2/iproute2_2.6.22.bb b/recipes/iproute2/iproute2_2.6.22.bb
index 55e3a75..06fcfe9 100644
--- a/recipes/iproute2/iproute2_2.6.22.bb
+++ b/recipes/iproute2/iproute2_2.6.22.bb
@@ -1,10 +1,11 @@
 require iproute2.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 DATE = "070710"
 
 SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
                    file://ip6tunnel.patch;patch=1 \
+                   file://remove-bashisms.patch;patch=1 \
                    file://no-strip.patch;patch=1"
 
 S = "${WORKDIR}"
diff --git a/recipes/iproute2/iproute2_2.6.29.bb b/recipes/iproute2/iproute2_2.6.29.bb
index d38dde8..d72738d 100644
--- a/recipes/iproute2/iproute2_2.6.29.bb
+++ b/recipes/iproute2/iproute2_2.6.29.bb
@@ -1,11 +1,12 @@
 require iproute2.inc
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \
 	   file://new-flex-fix.patch;patch=1 \
 	   file://compilation-fix.patch;patch=1 \
 	   file://use-cross-compiler.patch;patch=1 \
+	   file://remove-bashisms.patch;patch=1 \
 	  "
 
 S = "${WORKDIR}/iproute2-${PV}"