diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2012-07-17 11:28:54 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-19 17:18:10 +0100 |
commit | 093410f99a1f24671f152f5a13d759fa3709e802 (patch) | |
tree | c4f7629ac3668861760051ebf3f595e5d237ad2f /meta | |
parent | 807ff46bc9d94106a11a58621994cc15e80f6d14 (diff) | |
download | poky-093410f99a1f24671f152f5a13d759fa3709e802.tar.gz |
iproute2: upgrade to 3.4.0
(From OE-Core rev: b17087c84460f5bddb213cec13e83814f64d1f61)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
5 files changed, 91 insertions, 92 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch deleted file mode 100644 index bed7b84661..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
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 | diff -r e4e1b14b9c4a configure | ||
13 | --- a/configure Sun Jan 22 15:26:47 2012 +0800 | ||
14 | +++ b/configure Sun Jan 22 15:29:38 2012 +0800 | ||
15 | @@ -2,6 +2,7 @@ | ||
16 | # This is not an autconf generated configure | ||
17 | # | ||
18 | INCLUDE=${1:-"$PWD/include"} | ||
19 | +SYSROOT=$1 | ||
20 | |||
21 | check_atm() | ||
22 | { | ||
23 | @@ -13,7 +14,7 @@ | ||
24 | return 0; | ||
25 | } | ||
26 | EOF | ||
27 | -gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 | ||
28 | +$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 | ||
29 | if [ $? -eq 0 ] | ||
30 | then | ||
31 | echo "TC_CONFIG_ATM:=y" >>Config | ||
32 | @@ -47,7 +48,7 @@ | ||
33 | |||
34 | EOF | ||
35 | |||
36 | -if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1 | ||
37 | +if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1 | ||
38 | then | ||
39 | echo "TC_CONFIG_XT:=y" >>Config | ||
40 | echo "using xtables" | ||
41 | @@ -84,7 +85,7 @@ | ||
42 | } | ||
43 | |||
44 | EOF | ||
45 | -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
46 | +$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
47 | |||
48 | if [ $? -eq 0 ] | ||
49 | then | ||
50 | @@ -124,7 +125,7 @@ | ||
51 | } | ||
52 | |||
53 | EOF | ||
54 | -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
55 | +$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
56 | |||
57 | if [ $? -eq 0 ] | ||
58 | then | ||
59 | @@ -145,7 +146,7 @@ | ||
60 | check_ipt_lib_dir() | ||
61 | { | ||
62 | IPT_LIB_DIR="" | ||
63 | - for dir in /lib /usr/lib /usr/local/lib | ||
64 | + for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib | ||
65 | do | ||
66 | for file in $dir/{xtables,iptables}/lib*t_*so ; do | ||
67 | if [ -f $file ]; then | ||
68 | @@ -168,7 +169,7 @@ | ||
69 | return 0; | ||
70 | } | ||
71 | EOF | ||
72 | -gcc -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1 | ||
73 | +$CC -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1 | ||
74 | if [ $? -eq 0 ] | ||
75 | then | ||
76 | echo "IP_CONFIG_SETNS:=y" >>Config | ||
diff --git a/meta/recipes-connectivity/iproute2/iproute2-3.4.0/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.4.0/configure-cross.patch new file mode 100644 index 0000000000..42f591a885 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2-3.4.0/configure-cross.patch | |||
@@ -0,0 +1,77 @@ | |||
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.4.0/configure | ||
13 | =================================================================== | ||
14 | --- iproute2-3.4.0.orig/configure | ||
15 | +++ iproute2-3.4.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 | @@ -17,7 +18,7 @@ int main(int argc, char **argv) { | ||
25 | return 0; | ||
26 | } | ||
27 | EOF | ||
28 | -gcc -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 | ||
29 | +$CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 | ||
30 | if [ $? -eq 0 ] | ||
31 | then | ||
32 | echo "TC_CONFIG_ATM:=y" >>Config | ||
33 | @@ -51,7 +52,7 @@ int main(int argc, char **argv) | ||
34 | |||
35 | EOF | ||
36 | |||
37 | -if gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1 | ||
38 | +if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1 | ||
39 | then | ||
40 | echo "TC_CONFIG_XT:=y" >>Config | ||
41 | echo "using xtables" | ||
42 | @@ -88,7 +89,7 @@ int main(int argc, char **argv) { | ||
43 | } | ||
44 | |||
45 | EOF | ||
46 | -gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
47 | +$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
48 | |||
49 | if [ $? -eq 0 ] | ||
50 | then | ||
51 | @@ -128,7 +129,7 @@ int main(int argc, char **argv) { | ||
52 | } | ||
53 | |||
54 | EOF | ||
55 | -gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
56 | +$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
57 | |||
58 | if [ $? -eq 0 ] | ||
59 | then | ||
60 | @@ -149,7 +150,7 @@ check_ipt() | ||
61 | check_ipt_lib_dir() | ||
62 | { | ||
63 | IPT_LIB_DIR="" | ||
64 | - for dir in /lib /usr/lib /usr/local/lib | ||
65 | + for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib | ||
66 | do | ||
67 | for file in $dir/{xtables,iptables}/lib*t_*so ; do | ||
68 | if [ -f $file ]; then | ||
69 | @@ -172,7 +173,7 @@ int main(int argc, char **argv) | ||
70 | return 0; | ||
71 | } | ||
72 | EOF | ||
73 | -gcc -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1 | ||
74 | +$CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1 | ||
75 | if [ $? -eq 0 ] | ||
76 | then | ||
77 | echo "IP_CONFIG_SETNS:=y" >>Config | ||
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index 86847efe10..7caf7d0eef 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc | |||
@@ -26,12 +26,12 @@ do_install () { | |||
26 | # There are only .so files in iproute2 | 26 | # There are only .so files in iproute2 |
27 | INSANE_SKIP_${PN} = "dev-so" | 27 | INSANE_SKIP_${PN} = "dev-so" |
28 | 28 | ||
29 | FILES_${PN} += "${base_libdir}/tc" | 29 | FILES_${PN} += "${libdir}/tc" |
30 | FILES_${PN}-dbg += "${base_libdir}/tc/.debug" | 30 | FILES_${PN}-dbg += "${libdir}/tc/.debug" |
31 | 31 | ||
32 | ALTERNATIVE_NAME = "ip" | 32 | ALTERNATIVE_${PN} = "ip" |
33 | ALTERNATIVE_PATH = "${base_sbindir}/ip.iproute2" | 33 | ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" |
34 | ALTERNATIVE_LINK = "${base_bindir}/ip" | 34 | ALTERNATIVE_LINK_NAME[ip] = "${base_bindir}/ip" |
35 | ALTERNATIVE_PRIORITY = "100" | 35 | ALTERNATIVE_PRIORITY = "100" |
36 | 36 | ||
37 | PARALLEL_MAKE = "" | 37 | PARALLEL_MAKE = "" |
diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb deleted file mode 100644 index 5af12af5b1..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | require iproute2.inc | ||
2 | |||
3 | PR = "r1" | ||
4 | |||
5 | #v3.2.0 tag is "447c118f138171b260ad045ad6e1b17f9ef462e2" | ||
6 | #but it was not fully tested and had build error, and the next commit fixed it. | ||
7 | SRCREV = "13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0" | ||
8 | SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git \ | ||
9 | file://configure-cross.patch" | ||
10 | S = "${WORKDIR}/git" | ||
11 | |||
diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.4.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.4.0.bb new file mode 100644 index 0000000000..cf1d521bf4 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2_3.4.0.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | require iproute2.inc | ||
2 | |||
3 | PR = "r0" | ||
4 | |||
5 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \ | ||
6 | file://configure-cross.patch" | ||
7 | |||
8 | SRC_URI[md5sum] = "879d3fac4e90809598b2864ec4a0cbf8" | ||
9 | SRC_URI[sha256sum] = "38e846e412b2fa235a447b50c20ad1e9770d1b3ed4d3ab18ca0b18c6e8b79ba4" | ||