diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 14:36:22 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 15:32:53 +0200 |
commit | f4cf9fe05bb3f32fabea4e54dd92d368967a80da (patch) | |
tree | 487180fa9866985ea7b28e625651765d86f515c3 /meta/recipes-connectivity/iproute2/iproute2 | |
download | poky-f4cf9fe05bb3f32fabea4e54dd92d368967a80da.tar.gz |
initial commit for Enea Linux 4.0
Migrated from the internal git server on the daisy-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'meta/recipes-connectivity/iproute2/iproute2')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/0001-iproute2-de-bash-scripts.patch | 64 | ||||
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch | 32 |
2 files changed, 96 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 @@ | |||
1 | Subject: [PATCH] iproute2: de-bash scripts | ||
2 | |||
3 | de-bash these two scripts to make iproute2 not depend on bash. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
8 | |||
9 | --- | ||
10 | ip/ifcfg | 15 ++++++++------- | ||
11 | ip/rtpr | 2 +- | ||
12 | 2 files changed, 9 insertions(+), 8 deletions(-) | ||
13 | |||
14 | diff --git a/ip/ifcfg b/ip/ifcfg | ||
15 | index 083d9df..60bcf1f 100644 | ||
16 | --- a/ip/ifcfg | ||
17 | +++ b/ip/ifcfg | ||
18 | @@ -1,12 +1,13 @@ | ||
19 | -#! /bin/bash | ||
20 | +#! /bin/sh | ||
21 | |||
22 | CheckForwarding () { | ||
23 | - local sbase fwd | ||
24 | + local sbase fwd forwarding | ||
25 | sbase=/proc/sys/net/ipv4/conf | ||
26 | fwd=0 | ||
27 | if [ -d $sbase ]; then | ||
28 | for dir in $sbase/*/forwarding; do | ||
29 | - fwd=$[$fwd + `cat $dir`] | ||
30 | + forwarding=`cat $dir` | ||
31 | + fwd=$(($fwd+$forwarding)) | ||
32 | done | ||
33 | else | ||
34 | fwd=2 | ||
35 | @@ -127,12 +128,12 @@ fi | ||
36 | arping -q -A -c 1 -I $dev $ipaddr | ||
37 | noarp=$? | ||
38 | ( sleep 2 ; | ||
39 | - arping -q -U -c 1 -I $dev $ipaddr ) >& /dev/null </dev/null & | ||
40 | + arping -q -U -c 1 -I $dev $ipaddr ) > /dev/null 2>&1 </dev/null & | ||
41 | |||
42 | -ip route add unreachable 224.0.0.0/24 >& /dev/null | ||
43 | -ip route add unreachable 255.255.255.255 >& /dev/null | ||
44 | +ip route add unreachable 224.0.0.0/24 > /dev/null 2>&1 | ||
45 | +ip route add unreachable 255.255.255.255 > /dev/null 2>&1 | ||
46 | if [ `ip link ls $dev | grep -c MULTICAST` -ge 1 ]; then | ||
47 | - ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null | ||
48 | + ip route add 224.0.0.0/4 dev $dev scope global > /dev/null 2>&1 | ||
49 | fi | ||
50 | |||
51 | if [ $fwd -eq 0 ]; then | ||
52 | diff --git a/ip/rtpr b/ip/rtpr | ||
53 | index c3629fd..674198d 100644 | ||
54 | --- a/ip/rtpr | ||
55 | +++ b/ip/rtpr | ||
56 | @@ -1,4 +1,4 @@ | ||
57 | -#! /bin/bash | ||
58 | +#! /bin/sh | ||
59 | |||
60 | exec tr "[\\\\]" "[ | ||
61 | ]" | ||
62 | -- | ||
63 | 1.7.9.5 | ||
64 | |||
diff --git a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch new file mode 100644 index 0000000000..866609ca99 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Thu, 3 Nov 2011 10:46:16 +0100 | ||
4 | Subject: [PATCH] make configure cross compile safe | ||
5 | |||
6 | According to Kevin Tian: | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
10 | Signed-off-by: Shane Wang <shane.wang@intel.com> | ||
11 | |||
12 | Index: iproute2-3.7.0/configure | ||
13 | =================================================================== | ||
14 | --- iproute2-3.7.0.orig/configure | ||
15 | +++ iproute2-3.7.0/configure | ||
16 | @@ -2,6 +2,7 @@ | ||
17 | # This is not an autconf generated configure | ||
18 | # | ||
19 | INCLUDE=${1:-"$PWD/include"} | ||
20 | +SYSROOT=$1 | ||
21 | |||
22 | # Make a temp directory in build tree. | ||
23 | TMPDIR=$(mktemp -d config.XXXXXX) | ||
24 | @@ -158,7 +159,7 @@ check_ipt_lib_dir() | ||
25 | return | ||
26 | fi | ||
27 | |||
28 | - for dir in /lib /usr/lib /usr/local/lib | ||
29 | + for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib | ||
30 | do | ||
31 | for file in $dir/{xtables,iptables}/lib*t_*so ; do | ||
32 | if [ -f $file ]; then | ||