diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-06-08 14:20:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-09 15:48:28 +0100 |
commit | cd8694d7363f3be2b2c422dad8d2b7deed9774fd (patch) | |
tree | b1a10dca9e3f05c3e2faced3c7d0b26c0f18790c /meta/recipes-connectivity/iproute2/iproute2-2.6.38 | |
parent | e8b3a1244440ea01a6671cc265ecc2244e1fd446 (diff) | |
download | poky-cd8694d7363f3be2b2c422dad8d2b7deed9774fd.tar.gz |
iproute2: update to 2.6.38
Fixes "ip route get" not producing any output (a regression in 2.6.35).
See http://marc.info/?l=linux-netdev&m=129442470405398&w=2 and
http://marc.info/?l=linux-netdev&m=130038222321440&w=2 for a list of
other changes since 2.6.35.
Fixes [YOCTO #1006] (reopened)
(From OE-Core rev: 25ed1f931c1dd337911b1f059c71b37b5586fd3f)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/iproute2/iproute2-2.6.38')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch new file mode 100644 index 0000000000..e26e8effd6 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch | |||
@@ -0,0 +1,63 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | # borrow from OE, to handle cross compile mess | ||
4 | # | ||
5 | # ktian1, 06/28/2010 | ||
6 | Index: iproute2-2.6.34/configure | ||
7 | =================================================================== | ||
8 | --- iproute2-2.6.34.orig/configure | ||
9 | +++ iproute2-2.6.34/configure | ||
10 | @@ -4,7 +4,7 @@ | ||
11 | INCLUDE=${1:-"$PWD/include"} | ||
12 | |||
13 | TABLES= | ||
14 | - | ||
15 | +SYSROOT=$1 | ||
16 | check_atm() | ||
17 | { | ||
18 | cat >/tmp/atmtest.c <<EOF | ||
19 | @@ -15,7 +15,7 @@ int main(int argc, char **argv) { | ||
20 | return 0; | ||
21 | } | ||
22 | EOF | ||
23 | -gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 | ||
24 | +$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 | ||
25 | if [ $? -eq 0 ] | ||
26 | then | ||
27 | echo "TC_CONFIG_ATM:=y" >>Config | ||
28 | @@ -49,7 +49,7 @@ int main(int argc, char **argv) | ||
29 | |||
30 | EOF | ||
31 | |||
32 | -if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 | ||
33 | +if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 | ||
34 | then | ||
35 | echo "TC_CONFIG_XT:=y" >>Config | ||
36 | echo "using xtables" | ||
37 | @@ -86,7 +86,7 @@ int main(int argc, char **argv) { | ||
38 | } | ||
39 | |||
40 | EOF | ||
41 | -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
42 | +$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
43 | |||
44 | if [ $? -eq 0 ] | ||
45 | then | ||
46 | @@ -126,7 +126,7 @@ int main(int argc, char **argv) { | ||
47 | } | ||
48 | |||
49 | EOF | ||
50 | -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
51 | +$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
52 | |||
53 | if [ $? -eq 0 ] | ||
54 | then | ||
55 | @@ -150,7 +150,7 @@ check_ipt() | ||
56 | check_ipt_lib_dir() | ||
57 | { | ||
58 | IPT_LIB_DIR="" | ||
59 | - for dir in /lib /usr/lib /usr/local/lib | ||
60 | + for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib | ||
61 | do | ||
62 | for file in $dir/$TABLES/lib*t_*so ; do | ||
63 | if [ -f $file ]; then | ||