diff options
| author | Chen Qi <qi.chen@windriver.com> | 2013-11-01 16:21:06 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2013-11-04 10:01:17 -0800 |
| commit | 1132c4210eddd59b22b2640935ab0bb8f48c0124 (patch) | |
| tree | bab4ae8ff96e8cd2ab1c7cd8316bf96258d718af /meta/recipes-connectivity/iproute2 | |
| parent | 8308e22a44a2dea7d1bbfb429b9df9c63714a649 (diff) | |
| download | openembedded-core-1132c4210eddd59b22b2640935ab0bb8f48c0124.tar.gz openembedded-core-1132c4210eddd59b22b2640935ab0bb8f48c0124.tar.bz2 openembedded-core-1132c4210eddd59b22b2640935ab0bb8f48c0124.zip | |
iproute2: de-bash its scripts to remove the bash dependency
If we build a minimal image with iproute2 installed, the following
error will appear during rootfs.
error: Can't install iproute2-3.10.0-r0.0@i586: no package provides /bin/bash
The problem is that iproute2 has an implicit dependency on 'bash'.
This dependency is from per-file dependency checking.
Patch two scripts, ifcfg and rtpr, from iproute2 to remove the bash
specific syntax.
[YOCTO #5415]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity/iproute2')
| -rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch | 64 | ||||
| -rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_3.11.0.bb | 1 |
2 files changed, 65 insertions, 0 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 new file mode 100644 index 0000000000..39c7d40319 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch @@ -0,0 +1,64 @@ +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 083d9df..60bcf1f 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 "[\\\\]" "[ + ]" +-- +1.7.9.5 + diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.11.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.11.0.bb index 98f5a802e8..469b2b026d 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_3.11.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_3.11.0.bb @@ -2,6 +2,7 @@ require iproute2.inc SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \ file://configure-cross.patch \ + file://0001-iproute2-de-bash-scripts.patch \ " SRC_URI[md5sum] = "d7ffb27bc9f0d80577b1f3fb9d1a7689" |