diff options
author | Kevin Tian <kevin.tian@intel.com> | 2010-06-25 17:48:52 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-06-29 17:13:38 +0100 |
commit | b180d7f488f44d3dfb3f9a19604e9592c29b426e (patch) | |
tree | dc198fec816ec648c27298f9c7869b592727a221 /meta/packages/iproute2/iproute2-2.6.34 | |
parent | 7510eb1061d0795b515bd20eba1cbd39a9b644a2 (diff) | |
download | poky-b180d7f488f44d3dfb3f9a19604e9592c29b426e.tar.gz |
iproute: upgrade to 2.6.34
(borrow from OE 2.6.34 recipe)
[Patches-poky]
REMOVE _iproute2-2.6.15_no_strip.diff_: not required now
REMOVE _new-flex-fix.patch_: not required now
[Patches-OE]
TAKE _configure-cross.patch_: don't invoke gcc directly
[Recipes]
- Add metadata
- fix SRC_URI for new version
- no {S} now
- use alternative to enable 'ip' instead of using busybox
- move shared documents to right destination
- not take from OE:
* no need for specific do_configure
Signed-off-by Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/iproute2/iproute2-2.6.34')
-rw-r--r-- | meta/packages/iproute2/iproute2-2.6.34/configure-cross.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/meta/packages/iproute2/iproute2-2.6.34/configure-cross.patch b/meta/packages/iproute2/iproute2-2.6.34/configure-cross.patch new file mode 100644 index 0000000000..67dc6f5a30 --- /dev/null +++ b/meta/packages/iproute2/iproute2-2.6.34/configure-cross.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | # borrow from OE, to handle cross compile mess | ||
2 | # | ||
3 | # ktian1, 06/28/2010 | ||
4 | Index: iproute2-2.6.34/configure | ||
5 | =================================================================== | ||
6 | --- iproute2-2.6.34.orig/configure | ||
7 | +++ iproute2-2.6.34/configure | ||
8 | @@ -4,7 +4,7 @@ | ||
9 | INCLUDE=${1:-"$PWD/include"} | ||
10 | |||
11 | TABLES= | ||
12 | - | ||
13 | +SYSROOT=$1 | ||
14 | check_atm() | ||
15 | { | ||
16 | cat >/tmp/atmtest.c <<EOF | ||
17 | @@ -15,7 +15,7 @@ int main(int argc, char **argv) { | ||
18 | return 0; | ||
19 | } | ||
20 | EOF | ||
21 | -gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 | ||
22 | +$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 | ||
23 | if [ $? -eq 0 ] | ||
24 | then | ||
25 | echo "TC_CONFIG_ATM:=y" >>Config | ||
26 | @@ -49,7 +49,7 @@ int main(int argc, char **argv) | ||
27 | |||
28 | EOF | ||
29 | |||
30 | -if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 | ||
31 | +if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 | ||
32 | then | ||
33 | echo "TC_CONFIG_XT:=y" >>Config | ||
34 | echo "using xtables" | ||
35 | @@ -86,7 +86,7 @@ int main(int argc, char **argv) { | ||
36 | } | ||
37 | |||
38 | EOF | ||
39 | -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
40 | +$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
41 | |||
42 | if [ $? -eq 0 ] | ||
43 | then | ||
44 | @@ -126,7 +126,7 @@ int main(int argc, char **argv) { | ||
45 | } | ||
46 | |||
47 | EOF | ||
48 | -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
49 | +$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
50 | |||
51 | if [ $? -eq 0 ] | ||
52 | then | ||
53 | @@ -150,7 +150,7 @@ check_ipt() | ||
54 | check_ipt_lib_dir() | ||
55 | { | ||
56 | IPT_LIB_DIR="" | ||
57 | - for dir in /lib /usr/lib /usr/local/lib | ||
58 | + for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib | ||
59 | do | ||
60 | for file in $dir/$TABLES/lib*t_*so ; do | ||
61 | if [ -f $file ]; then | ||