summaryrefslogtreecommitdiff
path: root/meta/recipes-connectivity/iproute2
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-01-22 16:01:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-24 11:23:57 +0000
commitf2a7b225b5a243e0a364be678a71bdc3b0fa99e0 (patch)
tree6a82ab2a9ef018a9a5d65d68c29ecf88a74ea7aa /meta/recipes-connectivity/iproute2
parent8d3188a4a69214f23d8b7f8d972bdd35f574196b (diff)
downloadopenembedded-core-f2a7b225b5a243e0a364be678a71bdc3b0fa99e0.tar.gz
openembedded-core-f2a7b225b5a243e0a364be678a71bdc3b0fa99e0.tar.bz2
openembedded-core-f2a7b225b5a243e0a364be678a71bdc3b0fa99e0.zip
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. Signed-off-by: Shane Wang <shane.wang@intel.com>
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 92c12be83e..bed7b84661 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:
Upstream-Status: Pending
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- configure | 13 +++++++------
- 1 files changed, 7 insertions(+), 6 deletions(-)
+Signed-off-by: Shane Wang <shane.wang@intel.com>
-diff --git a/configure b/configure
-index f5c3d40..bcc1948 100755
---- a/configure
-+++ b/configure
+diff -r e4e1b14b9c4a configure
+--- a/configure Sun Jan 22 15:26:47 2012 +0800
++++ b/configure Sun Jan 22 15:29:38 2012 +0800
@@ -2,6 +2,7 @@
# This is not an autconf generated configure
#
@@ -23,7 +20,7 @@ index f5c3d40..bcc1948 100755
check_atm()
{
-@@ -13,7 +14,7 @@ int main(int argc, char **argv) {
+@@ -13,7 +14,7 @@
return 0;
}
EOF
@@ -32,16 +29,16 @@ index f5c3d40..bcc1948 100755
if [ $? -eq 0 ]
then
echo "TC_CONFIG_ATM:=y" >>Config
-@@ -47,7 +48,7 @@ int main(int argc, char **argv)
+@@ -47,7 +48,7 @@
EOF
--if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1
-+if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1
+-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
++if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
then
echo "TC_CONFIG_XT:=y" >>Config
echo "using xtables"
-@@ -84,7 +85,7 @@ int main(int argc, char **argv) {
+@@ -84,7 +85,7 @@
}
EOF
@@ -50,7 +47,7 @@ index f5c3d40..bcc1948 100755
if [ $? -eq 0 ]
then
-@@ -124,7 +125,7 @@ int main(int argc, char **argv) {
+@@ -124,7 +125,7 @@
}
EOF
@@ -59,7 +56,7 @@ index f5c3d40..bcc1948 100755
if [ $? -eq 0 ]
then
-@@ -145,7 +146,7 @@ check_ipt()
+@@ -145,7 +146,7 @@
check_ipt_lib_dir()
{
IPT_LIB_DIR=""
@@ -68,7 +65,7 @@ index f5c3d40..bcc1948 100755
do
for file in $dir/{xtables,iptables}/lib*t_*so ; do
if [ -f $file ]; then
-@@ -168,7 +169,7 @@ int main(int argc, char **argv)
+@@ -168,7 +169,7 @@
return 0;
}
EOF
@@ -77,6 +74,3 @@ index f5c3d40..bcc1948 100755
if [ $? -eq 0 ]
then
echo "IP_CONFIG_SETNS:=y" >>Config
---
-1.7.2.5
-
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 0b47046242..0000000000
--- a/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require iproute2.inc
-
-#v3.1.0 tag
-SRCREV = "9cbe6bc337a35b91882f92599eefeb161f3e776e"
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git \
- file://configure-cross.patch"
-S = "${WORKDIR}/git"
-
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 0000000000..4391fb6fcf
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb
@@ -0,0 +1,9 @@
+require iproute2.inc
+
+#v3.2.0 tag is "447c118f138171b260ad045ad6e1b17f9ef462e2"
+#but it was not fully tested and had build error, and the next commit fixed it.
+SRCREV = "13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git \
+ file://configure-cross.patch"
+S = "${WORKDIR}/git"
+