From d6a55ca79c3a5637a7fa5f3309987aa41bc41b61 Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Sun, 22 Jan 2012 16:01:11 +0800 Subject: 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 Signed-off-by: Richard Purdie --- .../iproute2/iproute2-3.1.0/configure-cross.patch | 82 ---------------------- .../iproute2/iproute2-3.2.0/configure-cross.patch | 76 ++++++++++++++++++++ .../iproute2/iproute2_3.1.0.bb | 8 --- .../iproute2/iproute2_3.2.0.bb | 9 +++ 4 files changed, 85 insertions(+), 90 deletions(-) delete mode 100644 meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch create mode 100644 meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb create mode 100644 meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb (limited to 'meta/recipes-connectivity/iproute2') diff --git a/meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch deleted file mode 100644 index 92c12be83e..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Thu, 3 Nov 2011 10:46:16 +0100 -Subject: [PATCH] make configure cross compile safe - -According to Kevin Tian: -Upstream-Status: Pending - -Signed-off-by: Koen Kooi ---- - configure | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/configure b/configure -index f5c3d40..bcc1948 100755 ---- a/configure -+++ b/configure -@@ -2,6 +2,7 @@ - # This is not an autconf generated configure - # - INCLUDE=${1:-"$PWD/include"} -+SYSROOT=$1 - - check_atm() - { -@@ -13,7 +14,7 @@ int main(int argc, char **argv) { - return 0; - } - EOF --gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 -+$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 - if [ $? -eq 0 ] - then - echo "TC_CONFIG_ATM:=y" >>Config -@@ -47,7 +48,7 @@ int main(int argc, char **argv) - - 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 - then - echo "TC_CONFIG_XT:=y" >>Config - echo "using xtables" -@@ -84,7 +85,7 @@ int main(int argc, char **argv) { - } - - EOF --gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 -+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 - - if [ $? -eq 0 ] - then -@@ -124,7 +125,7 @@ int main(int argc, char **argv) { - } - - EOF --gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 -+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 - - if [ $? -eq 0 ] - then -@@ -145,7 +146,7 @@ check_ipt() - check_ipt_lib_dir() - { - IPT_LIB_DIR="" -- for dir in /lib /usr/lib /usr/local/lib -+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib - 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) - return 0; - } - EOF --gcc -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1 -+$CC -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1 - if [ $? -eq 0 ] - then - echo "IP_CONFIG_SETNS:=y" >>Config --- -1.7.2.5 - 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 new file mode 100644 index 0000000000..bed7b84661 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch @@ -0,0 +1,76 @@ +From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Thu, 3 Nov 2011 10:46:16 +0100 +Subject: [PATCH] make configure cross compile safe + +According to Kevin Tian: +Upstream-Status: Pending + +Signed-off-by: Koen Kooi +Signed-off-by: Shane Wang + +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 + # + INCLUDE=${1:-"$PWD/include"} ++SYSROOT=$1 + + check_atm() + { +@@ -13,7 +14,7 @@ + return 0; + } + EOF +-gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 ++$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 + if [ $? -eq 0 ] + then + echo "TC_CONFIG_ATM:=y" >>Config +@@ -47,7 +48,7 @@ + + EOF + +-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 @@ + } + + EOF +-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 ++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 + + if [ $? -eq 0 ] + then +@@ -124,7 +125,7 @@ + } + + EOF +-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 ++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 + + if [ $? -eq 0 ] + then +@@ -145,7 +146,7 @@ + check_ipt_lib_dir() + { + IPT_LIB_DIR="" +- for dir in /lib /usr/lib /usr/local/lib ++ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib + do + for file in $dir/{xtables,iptables}/lib*t_*so ; do + if [ -f $file ]; then +@@ -168,7 +169,7 @@ + return 0; + } + EOF +-gcc -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1 ++$CC -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1 + if [ $? -eq 0 ] + then + echo "IP_CONFIG_SETNS:=y" >>Config 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" + -- cgit v1.2.3-54-g00ecf