From 802849dfffc309fbd0a0a5705fc7374d10874a6c Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Thu, 16 Aug 2012 15:55:17 +0300 Subject: iproute2: upgrade to 3.5.0 (From OE-Core rev: c7f4f9fe4574cfd20925191d29e7c23b1b41eb3b) Signed-off-by: Constantin Musca Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../iproute2/iproute2-3.4.0/configure-cross.patch | 77 ---------------------- .../iproute2/iproute2-3.5.0/configure-cross.patch | 77 ++++++++++++++++++++++ .../iproute2/iproute2_3.4.0.bb | 9 --- .../iproute2/iproute2_3.5.0.bb | 9 +++ 4 files changed, 86 insertions(+), 86 deletions(-) delete mode 100644 meta/recipes-connectivity/iproute2/iproute2-3.4.0/configure-cross.patch create mode 100644 meta/recipes-connectivity/iproute2/iproute2-3.5.0/configure-cross.patch delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_3.4.0.bb create mode 100644 meta/recipes-connectivity/iproute2/iproute2_3.5.0.bb (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/iproute2/iproute2-3.4.0/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.4.0/configure-cross.patch deleted file mode 100644 index 42f591a885..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2-3.4.0/configure-cross.patch +++ /dev/null @@ -1,77 +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 -Signed-off-by: Shane Wang - -Index: iproute2-3.4.0/configure -=================================================================== ---- iproute2-3.4.0.orig/configure -+++ iproute2-3.4.0/configure -@@ -2,6 +2,7 @@ - # This is not an autconf generated configure - # - INCLUDE=${1:-"$PWD/include"} -+SYSROOT=$1 - - # Make a temp directory in build tree. - TMPDIR=$(mktemp -d config.XXXXXX) -@@ -17,7 +18,7 @@ int main(int argc, char **argv) { - return 0; - } - EOF --gcc -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 -+$CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 - if [ $? -eq 0 ] - then - echo "TC_CONFIG_ATM:=y" >>Config -@@ -51,7 +52,7 @@ int main(int argc, char **argv) - - EOF - --if gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1 -+if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1 - then - echo "TC_CONFIG_XT:=y" >>Config - echo "using xtables" -@@ -88,7 +89,7 @@ int main(int argc, char **argv) { - } - - EOF --gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 -+$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 - - if [ $? -eq 0 ] - then -@@ -128,7 +129,7 @@ int main(int argc, char **argv) { - } - - EOF --gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 -+$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 - - if [ $? -eq 0 ] - then -@@ -149,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/{xtables,iptables}/lib*t_*so ; do - if [ -f $file ]; then -@@ -172,7 +173,7 @@ int main(int argc, char **argv) - return 0; - } - EOF --gcc -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1 -+$CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/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.5.0/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.5.0/configure-cross.patch new file mode 100644 index 0000000000..42f591a885 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2-3.5.0/configure-cross.patch @@ -0,0 +1,77 @@ +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 + +Index: iproute2-3.4.0/configure +=================================================================== +--- iproute2-3.4.0.orig/configure ++++ iproute2-3.4.0/configure +@@ -2,6 +2,7 @@ + # This is not an autconf generated configure + # + INCLUDE=${1:-"$PWD/include"} ++SYSROOT=$1 + + # Make a temp directory in build tree. + TMPDIR=$(mktemp -d config.XXXXXX) +@@ -17,7 +18,7 @@ int main(int argc, char **argv) { + return 0; + } + EOF +-gcc -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 ++$CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 + if [ $? -eq 0 ] + then + echo "TC_CONFIG_ATM:=y" >>Config +@@ -51,7 +52,7 @@ int main(int argc, char **argv) + + EOF + +-if gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1 ++if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1 + then + echo "TC_CONFIG_XT:=y" >>Config + echo "using xtables" +@@ -88,7 +89,7 @@ int main(int argc, char **argv) { + } + + EOF +-gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 ++$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 + + if [ $? -eq 0 ] + then +@@ -128,7 +129,7 @@ int main(int argc, char **argv) { + } + + EOF +-gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 ++$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 + + if [ $? -eq 0 ] + then +@@ -149,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/{xtables,iptables}/lib*t_*so ; do + if [ -f $file ]; then +@@ -172,7 +173,7 @@ int main(int argc, char **argv) + return 0; + } + EOF +-gcc -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1 ++$CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/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.4.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.4.0.bb deleted file mode 100644 index cf1d521bf4..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2_3.4.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -require iproute2.inc - -PR = "r0" - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \ - file://configure-cross.patch" - -SRC_URI[md5sum] = "879d3fac4e90809598b2864ec4a0cbf8" -SRC_URI[sha256sum] = "38e846e412b2fa235a447b50c20ad1e9770d1b3ed4d3ab18ca0b18c6e8b79ba4" diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.5.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.5.0.bb new file mode 100644 index 0000000000..1e8b07388c --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2_3.5.0.bb @@ -0,0 +1,9 @@ +require iproute2.inc + +PR = "r0" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \ + file://configure-cross.patch" + +SRC_URI[md5sum] = "ab1fc3512c852ba0a929f6e589804e78" +SRC_URI[sha256sum] = "ea885642b1d9f8c843a325b85926a75bd36fb4801b37c7707cbd397fb120aa3d" -- cgit v1.2.3-54-g00ecf