summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/iproute2
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-11-03 09:52:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-07 14:05:40 (GMT)
commit163f7bda55ff76da27ca28110bd965704c628303 (patch)
tree02e9133cb2ca164f716496b5212743d456c607c6 /meta/recipes-connectivity/iproute2
parent4a279e2410b923ff7d3c7692206ee51e3098ed23 (diff)
downloadpoky-163f7bda55ff76da27ca28110bd965704c628303.tar.gz
iproute2: update to 3.0.0 to fix build with updated iptables
(From OE-Core rev: addcb5106ca0b1849299d6ad4e734135da29b0ab) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/iproute2')
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch (renamed from meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch)57
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2.inc7
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb9
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb8
4 files changed, 51 insertions, 30 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch
index e26e8ef..92c12be 100644
--- a/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch
@@ -1,31 +1,38 @@
1From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Thu, 3 Nov 2011 10:46:16 +0100
4Subject: [PATCH] make configure cross compile safe
5
6According to Kevin Tian:
1Upstream-Status: Pending 7Upstream-Status: Pending
2 8
3# borrow from OE, to handle cross compile mess 9Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
4# 10---
5# ktian1, 06/28/2010 11 configure | 13 +++++++------
6Index: iproute2-2.6.34/configure 12 1 files changed, 7 insertions(+), 6 deletions(-)
7=================================================================== 13
8--- iproute2-2.6.34.orig/configure 14diff --git a/configure b/configure
9+++ iproute2-2.6.34/configure 15index f5c3d40..bcc1948 100755
10@@ -4,7 +4,7 @@ 16--- a/configure
17+++ b/configure
18@@ -2,6 +2,7 @@
19 # This is not an autconf generated configure
20 #
11 INCLUDE=${1:-"$PWD/include"} 21 INCLUDE=${1:-"$PWD/include"}
12
13 TABLES=
14-
15+SYSROOT=$1 22+SYSROOT=$1
23
16 check_atm() 24 check_atm()
17 { 25 {
18 cat >/tmp/atmtest.c <<EOF 26@@ -13,7 +14,7 @@ int main(int argc, char **argv) {
19@@ -15,7 +15,7 @@ int main(int argc, char **argv) {
20 return 0; 27 return 0;
21 } 28 }
22 EOF 29 EOF
23-gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 30-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 31+$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
25 if [ $? -eq 0 ] 32 if [ $? -eq 0 ]
26 then 33 then
27 echo "TC_CONFIG_ATM:=y" >>Config 34 echo "TC_CONFIG_ATM:=y" >>Config
28@@ -49,7 +49,7 @@ int main(int argc, char **argv) 35@@ -47,7 +48,7 @@ int main(int argc, char **argv)
29 36
30 EOF 37 EOF
31 38
@@ -34,7 +41,7 @@ Index: iproute2-2.6.34/configure
34 then 41 then
35 echo "TC_CONFIG_XT:=y" >>Config 42 echo "TC_CONFIG_XT:=y" >>Config
36 echo "using xtables" 43 echo "using xtables"
37@@ -86,7 +86,7 @@ int main(int argc, char **argv) { 44@@ -84,7 +85,7 @@ int main(int argc, char **argv) {
38 } 45 }
39 46
40 EOF 47 EOF
@@ -43,7 +50,7 @@ Index: iproute2-2.6.34/configure
43 50
44 if [ $? -eq 0 ] 51 if [ $? -eq 0 ]
45 then 52 then
46@@ -126,7 +126,7 @@ int main(int argc, char **argv) { 53@@ -124,7 +125,7 @@ int main(int argc, char **argv) {
47 } 54 }
48 55
49 EOF 56 EOF
@@ -52,12 +59,24 @@ Index: iproute2-2.6.34/configure
52 59
53 if [ $? -eq 0 ] 60 if [ $? -eq 0 ]
54 then 61 then
55@@ -150,7 +150,7 @@ check_ipt() 62@@ -145,7 +146,7 @@ check_ipt()
56 check_ipt_lib_dir() 63 check_ipt_lib_dir()
57 { 64 {
58 IPT_LIB_DIR="" 65 IPT_LIB_DIR=""
59- for dir in /lib /usr/lib /usr/local/lib 66- for dir in /lib /usr/lib /usr/local/lib
60+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib 67+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib
61 do 68 do
62 for file in $dir/$TABLES/lib*t_*so ; do 69 for file in $dir/{xtables,iptables}/lib*t_*so ; do
63 if [ -f $file ]; then 70 if [ -f $file ]; then
71@@ -168,7 +169,7 @@ int main(int argc, char **argv)
72 return 0;
73 }
74 EOF
75-gcc -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1
76+$CC -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1
77 if [ $? -eq 0 ]
78 then
79 echo "IP_CONFIG_SETNS:=y" >>Config
80--
811.7.2.5
82
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
index 0f27a01..6fc30a0 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
@@ -23,8 +23,11 @@ do_install () {
23 rm ${D}/share -rf || true 23 rm ${D}/share -rf || true
24} 24}
25 25
26FILES_${PN} += "/usr/lib/tc/*" 26# There are only .so files in iproute2
27FILES_${PN}-dbg += "/usr/lib/tc/.debug" 27INSANE_SKIP_${PN} = "dev-so"
28
29FILES_${PN} += "${base_libdir}/tc/*"
30FILES_${PN}-dbg += "${base_libdir}/tc/.debug"
28 31
29ALTERNATIVE_NAME = "ip" 32ALTERNATIVE_NAME = "ip"
30ALTERNATIVE_PATH = "${base_sbindir}/ip.iproute2" 33ALTERNATIVE_PATH = "${base_sbindir}/ip.iproute2"
diff --git a/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb b/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb
deleted file mode 100644
index 7abc41f..0000000
--- a/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require iproute2.inc
2
3PR = "r0"
4
5SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${BPN}-${PV}.tar.bz2 \
6 file://configure-cross.patch"
7
8SRC_URI[md5sum] = "a243bfea837e71824b7ca26c3bb45fa8"
9SRC_URI[sha256sum] = "47629a4f547f21d94d8e823a87dd8e13042cadecefea2e2dc433e4134fa9aec4"
diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb
new file mode 100644
index 0000000..8d1db85
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb
@@ -0,0 +1,8 @@
1require iproute2.inc
2
3#v3.0.0 tag
4SRCREV = "ce691fb5ce78b2c75243c60a757a3990ae09681c"
5SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git \
6 file://configure-cross.patch"
7S = "${WORKDIR}/git"
8