summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/iproute2
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-01-22 08:01:11 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-24 11:54:24 (GMT)
commitd6a55ca79c3a5637a7fa5f3309987aa41bc41b61 (patch)
tree965d57e9e4961b91b9bc65ab0e103a91a638b1b7 /meta/recipes-connectivity/iproute2
parente96ec29709716ee6a01f61848d9ff2a825fcbb52 (diff)
downloadpoky-d6a55ca79c3a5637a7fa5f3309987aa41bc41b61.tar.gz
iproute2: upgrade to 3.2.0
This patch is to upgrade iproute2 to tag 3.2.0. And the tag is not fully testd by the upstream and has build error. We use the next commit of tag 3.2.0 which fixs the error. (From OE-Core rev: f2a7b225b5a243e0a364be678a71bdc3b0fa99e0) Signed-off-by: Shane Wang <shane.wang@intel.com> 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.2.0/configure-cross.patch (renamed from meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch)30
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb8
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb9
3 files changed, 21 insertions, 26 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch
index 92c12be..bed7b84 100644
--- a/meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch
@@ -7,14 +7,11 @@ According to Kevin Tian:
7Upstream-Status: Pending 7Upstream-Status: Pending
8 8
9Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 9Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10--- 10Signed-off-by: Shane Wang <shane.wang@intel.com>
11 configure | 13 +++++++------
12 1 files changed, 7 insertions(+), 6 deletions(-)
13 11
14diff --git a/configure b/configure 12diff -r e4e1b14b9c4a configure
15index f5c3d40..bcc1948 100755 13--- a/configure Sun Jan 22 15:26:47 2012 +0800
16--- a/configure 14+++ b/configure Sun Jan 22 15:29:38 2012 +0800
17+++ b/configure
18@@ -2,6 +2,7 @@ 15@@ -2,6 +2,7 @@
19 # This is not an autconf generated configure 16 # This is not an autconf generated configure
20 # 17 #
@@ -23,7 +20,7 @@ index f5c3d40..bcc1948 100755
23 20
24 check_atm() 21 check_atm()
25 { 22 {
26@@ -13,7 +14,7 @@ int main(int argc, char **argv) { 23@@ -13,7 +14,7 @@
27 return 0; 24 return 0;
28 } 25 }
29 EOF 26 EOF
@@ -32,16 +29,16 @@ index f5c3d40..bcc1948 100755
32 if [ $? -eq 0 ] 29 if [ $? -eq 0 ]
33 then 30 then
34 echo "TC_CONFIG_ATM:=y" >>Config 31 echo "TC_CONFIG_ATM:=y" >>Config
35@@ -47,7 +48,7 @@ int main(int argc, char **argv) 32@@ -47,7 +48,7 @@
36 33
37 EOF 34 EOF
38 35
39-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 36-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
40+if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/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
41 then 38 then
42 echo "TC_CONFIG_XT:=y" >>Config 39 echo "TC_CONFIG_XT:=y" >>Config
43 echo "using xtables" 40 echo "using xtables"
44@@ -84,7 +85,7 @@ int main(int argc, char **argv) { 41@@ -84,7 +85,7 @@
45 } 42 }
46 43
47 EOF 44 EOF
@@ -50,7 +47,7 @@ index f5c3d40..bcc1948 100755
50 47
51 if [ $? -eq 0 ] 48 if [ $? -eq 0 ]
52 then 49 then
53@@ -124,7 +125,7 @@ int main(int argc, char **argv) { 50@@ -124,7 +125,7 @@
54 } 51 }
55 52
56 EOF 53 EOF
@@ -59,7 +56,7 @@ index f5c3d40..bcc1948 100755
59 56
60 if [ $? -eq 0 ] 57 if [ $? -eq 0 ]
61 then 58 then
62@@ -145,7 +146,7 @@ check_ipt() 59@@ -145,7 +146,7 @@
63 check_ipt_lib_dir() 60 check_ipt_lib_dir()
64 { 61 {
65 IPT_LIB_DIR="" 62 IPT_LIB_DIR=""
@@ -68,7 +65,7 @@ index f5c3d40..bcc1948 100755
68 do 65 do
69 for file in $dir/{xtables,iptables}/lib*t_*so ; do 66 for file in $dir/{xtables,iptables}/lib*t_*so ; do
70 if [ -f $file ]; then 67 if [ -f $file ]; then
71@@ -168,7 +169,7 @@ int main(int argc, char **argv) 68@@ -168,7 +169,7 @@
72 return 0; 69 return 0;
73 } 70 }
74 EOF 71 EOF
@@ -77,6 +74,3 @@ index f5c3d40..bcc1948 100755
77 if [ $? -eq 0 ] 74 if [ $? -eq 0 ]
78 then 75 then
79 echo "IP_CONFIG_SETNS:=y" >>Config 76 echo "IP_CONFIG_SETNS:=y" >>Config
80--
811.7.2.5
82
diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
deleted file mode 100644
index 0b47046..0000000
--- a/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require iproute2.inc
2
3#v3.1.0 tag
4SRCREV = "9cbe6bc337a35b91882f92599eefeb161f3e776e"
5SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git \
6 file://configure-cross.patch"
7S = "${WORKDIR}/git"
8
diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb
new file mode 100644
index 0000000..4391fb6
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb
@@ -0,0 +1,9 @@
1require iproute2.inc
2
3#v3.2.0 tag is "447c118f138171b260ad045ad6e1b17f9ef462e2"
4#but it was not fully tested and had build error, and the next commit fixed it.
5SRCREV = "13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0"
6SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git \
7 file://configure-cross.patch"
8S = "${WORKDIR}/git"
9