From ec7811e8893f8be4e2dd02c06063ef429c8a62c6 Mon Sep 17 00:00:00 2001 From: Qing He Date: Wed, 10 Nov 2010 09:14:24 +0800 Subject: iproute2: upgrade to version 2.6.35 from 2.6.34 Signed-off-by: Qing He --- .../iproute2/iproute2-2.6.34/configure-cross.patch | 61 ---------------------- .../iproute2/iproute2-2.6.35/configure-cross.patch | 61 ++++++++++++++++++++++ .../iproute2/iproute2_2.6.34.bb | 6 --- .../iproute2/iproute2_2.6.35.bb | 6 +++ 4 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 meta/recipes-connectivity/iproute2/iproute2-2.6.34/configure-cross.patch create mode 100644 meta/recipes-connectivity/iproute2/iproute2-2.6.35/configure-cross.patch delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_2.6.34.bb create mode 100644 meta/recipes-connectivity/iproute2/iproute2_2.6.35.bb (limited to 'meta/recipes-connectivity/iproute2') diff --git a/meta/recipes-connectivity/iproute2/iproute2-2.6.34/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-2.6.34/configure-cross.patch deleted file mode 100644 index 67dc6f5a30..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2-2.6.34/configure-cross.patch +++ /dev/null @@ -1,61 +0,0 @@ -# borrow from OE, to handle cross compile mess -# -# ktian1, 06/28/2010 -Index: iproute2-2.6.34/configure -=================================================================== ---- iproute2-2.6.34.orig/configure -+++ iproute2-2.6.34/configure -@@ -4,7 +4,7 @@ - INCLUDE=${1:-"$PWD/include"} - - TABLES= -- -+SYSROOT=$1 - check_atm() - { - cat >/tmp/atmtest.c </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 -@@ -49,7 +49,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" -@@ -86,7 +86,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 -@@ -126,7 +126,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 -@@ -150,7 +150,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/$TABLES/lib*t_*so ; do - if [ -f $file ]; then diff --git a/meta/recipes-connectivity/iproute2/iproute2-2.6.35/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-2.6.35/configure-cross.patch new file mode 100644 index 0000000000..67dc6f5a30 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2-2.6.35/configure-cross.patch @@ -0,0 +1,61 @@ +# borrow from OE, to handle cross compile mess +# +# ktian1, 06/28/2010 +Index: iproute2-2.6.34/configure +=================================================================== +--- iproute2-2.6.34.orig/configure ++++ iproute2-2.6.34/configure +@@ -4,7 +4,7 @@ + INCLUDE=${1:-"$PWD/include"} + + TABLES= +- ++SYSROOT=$1 + check_atm() + { + cat >/tmp/atmtest.c </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 +@@ -49,7 +49,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" +@@ -86,7 +86,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 +@@ -126,7 +126,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 +@@ -150,7 +150,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/$TABLES/lib*t_*so ; do + if [ -f $file ]; then diff --git a/meta/recipes-connectivity/iproute2/iproute2_2.6.34.bb b/meta/recipes-connectivity/iproute2/iproute2_2.6.34.bb deleted file mode 100644 index bb2ff9e2e0..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2_2.6.34.bb +++ /dev/null @@ -1,6 +0,0 @@ -require iproute2.inc - -PR = "r1" - -SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \ - file://configure-cross.patch" diff --git a/meta/recipes-connectivity/iproute2/iproute2_2.6.35.bb b/meta/recipes-connectivity/iproute2/iproute2_2.6.35.bb new file mode 100644 index 0000000000..c5e0ef6e56 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2_2.6.35.bb @@ -0,0 +1,6 @@ +require iproute2.inc + +PR = "r0" + +SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \ + file://configure-cross.patch" -- cgit v1.2.3-54-g00ecf