From patchwork Wed Dec 8 14:18:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: iproute2: upgrade to 2.6.35.1 Date: Wed, 08 Dec 2010 14:18:54 -0000 From: Michael Smith X-Patchwork-Id: 31 Message-Id: <1291817934-20226-1-git-send-email-msmith@cbnco.com> To: openembedded-devel@lists.openembedded.org Upgrade 2.6.35 to 2.6.35.1. The new version fixes "ip route get" and "ip addr flush". Signed-off-by: Michael Smith Acked-by: Stefan Schmidt --- .../iproute2-2.6.35.1/configure-cross.patch | 58 ++++++++++++++++++++ .../iproute2/iproute2-2.6.35/configure-cross.patch | 58 -------------------- recipes/iproute2/iproute2_2.6.35.1.bb | 19 +++++++ recipes/iproute2/iproute2_2.6.35.bb | 19 ------- 4 files changed, 77 insertions(+), 77 deletions(-) create mode 100644 recipes/iproute2/iproute2-2.6.35.1/configure-cross.patch delete mode 100644 recipes/iproute2/iproute2-2.6.35/configure-cross.patch create mode 100644 recipes/iproute2/iproute2_2.6.35.1.bb delete mode 100644 recipes/iproute2/iproute2_2.6.35.bb \ No newline at end of file diff --git a/recipes/iproute2/iproute2-2.6.35.1/configure-cross.patch b/recipes/iproute2/iproute2-2.6.35.1/configure-cross.patch new file mode 100644 index 0000000..631d6bf --- /dev/null +++ b/recipes/iproute2/iproute2-2.6.35.1/configure-cross.patch @@ -0,0 +1,58 @@ +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/recipes/iproute2/iproute2-2.6.35/configure-cross.patch b/recipes/iproute2/iproute2-2.6.35/configure-cross.patch deleted file mode 100644 index 631d6bf..0000000 --- a/recipes/iproute2/iproute2-2.6.35/configure-cross.patch +++ /dev/null @@ -1,58 +0,0 @@ -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/recipes/iproute2/iproute2_2.6.35.1.bb b/recipes/iproute2/iproute2_2.6.35.1.bb new file mode 100644 index 0000000..7b4c2d6 --- /dev/null +++ b/recipes/iproute2/iproute2_2.6.35.1.bb @@ -0,0 +1,19 @@ +require iproute2.inc + +PR = "${INC_PR}.0" + +# There is no tarball for v2.6.35.1, but there is a tag. +SRCREV = "v${PV}" + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git;protocol=git \ + file://configure-cross.patch \ + " + +S = "${WORKDIR}/git" + +do_configure () { + ./configure ${STAGING_DIR_TARGET} +} + +FILES_${PN} += "${base_libdir}/tc/*.so" +FILES_${PN}-dbg += "${base_libdir}/tc/.debug" diff --git a/recipes/iproute2/iproute2_2.6.35.bb b/recipes/iproute2/iproute2_2.6.35.bb deleted file mode 100644 index eaa511f..0000000 --- a/recipes/iproute2/iproute2_2.6.35.bb +++ /dev/null @@ -1,19 +0,0 @@ -require iproute2.inc - -PR = "${INC_PR}.0" - -SRC_URI = "http://devresources.linuxfoundation.org/dev/iproute2/download/${P}.tar.bz2 \ - file://configure-cross.patch \ - " - -SRC_URI[md5sum] = "b0f281b3124bf04669e18f5fe16d4934" -SRC_URI[sha256sum] = "8ab2f47e129925fb8acb09421008d07aeafa01b2ddd1fcba4a056de079f090a3" - -S = "${WORKDIR}/iproute2-${PV}" - -do_configure () { - ./configure ${STAGING_DIR_TARGET} -} - -FILES_${PN} += "${base_libdir}/tc/*.so" -FILES_${PN}-dbg += "${base_libdir}/tc/.debug"