From cd8694d7363f3be2b2c422dad8d2b7deed9774fd Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 8 Jun 2011 14:20:25 +0100 Subject: iproute2: update to 2.6.38 Fixes "ip route get" not producing any output (a regression in 2.6.35). See http://marc.info/?l=linux-netdev&m=129442470405398&w=2 and http://marc.info/?l=linux-netdev&m=130038222321440&w=2 for a list of other changes since 2.6.35. Fixes [YOCTO #1006] (reopened) (From OE-Core rev: 25ed1f931c1dd337911b1f059c71b37b5586fd3f) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- .../iproute2/iproute2-2.6.35/configure-cross.patch | 63 ---------------------- .../iproute2/iproute2-2.6.38/configure-cross.patch | 63 ++++++++++++++++++++++ .../iproute2/iproute2_2.6.35.bb | 9 ---- .../iproute2/iproute2_2.6.38.bb | 9 ++++ 4 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-connectivity/iproute2/iproute2-2.6.35/configure-cross.patch create mode 100644 meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_2.6.35.bb create mode 100644 meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb (limited to 'meta/recipes-connectivity/iproute2') 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 deleted file mode 100644 index e26e8effd6..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2-2.6.35/configure-cross.patch +++ /dev/null @@ -1,63 +0,0 @@ -Upstream-Status: Pending - -# 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.38/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch new file mode 100644 index 0000000000..e26e8effd6 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch @@ -0,0 +1,63 @@ +Upstream-Status: Pending + +# 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.bb b/meta/recipes-connectivity/iproute2/iproute2_2.6.35.bb deleted file mode 100644 index 93ae06cfed..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2_2.6.35.bb +++ /dev/null @@ -1,9 +0,0 @@ -require iproute2.inc - -PR = "r0" - -SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \ - file://configure-cross.patch" - -SRC_URI[md5sum] = "b0f281b3124bf04669e18f5fe16d4934" -SRC_URI[sha256sum] = "8ab2f47e129925fb8acb09421008d07aeafa01b2ddd1fcba4a056de079f090a3" diff --git a/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb b/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb new file mode 100644 index 0000000000..e82275060b --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2_2.6.38.bb @@ -0,0 +1,9 @@ +require iproute2.inc + +PR = "r0" + +SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \ + file://configure-cross.patch" + +SRC_URI[md5sum] = "a243bfea837e71824b7ca26c3bb45fa8" +SRC_URI[sha256sum] = "47629a4f547f21d94d8e823a87dd8e13042cadecefea2e2dc433e4134fa9aec4" -- cgit v1.2.3-54-g00ecf