From b6daf20b1c9e50d8eba2809081ce20517b7a9773 Mon Sep 17 00:00:00 2001 From: Mei Lei Date: Wed, 30 Nov 2011 13:57:52 +0800 Subject: iproute2: Upgrade from 3.0.0 to 3.1.0 Signed-off-by: Mei Lei Signed-off-by: Richard Purdie --- .../iproute2/iproute2-3.0.0/configure-cross.patch | 82 ---------------------- .../iproute2/iproute2-3.1.0/configure-cross.patch | 82 ++++++++++++++++++++++ .../iproute2/iproute2_3.0.0.bb | 8 --- .../iproute2/iproute2_3.1.0.bb | 8 +++ 4 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch create mode 100644 meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb create mode 100644 meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb (limited to 'meta/recipes-connectivity/iproute2') diff --git a/meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch deleted file mode 100644 index 92c12be83..000000000 --- a/meta/recipes-connectivity/iproute2/iproute2-3.0.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.1.0/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch new file mode 100644 index 000000000..92c12be83 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch @@ -0,0 +1,82 @@ +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.0.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb deleted file mode 100644 index 8d1db85bc..000000000 --- a/meta/recipes-connectivity/iproute2/iproute2_3.0.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require iproute2.inc - -#v3.0.0 tag -SRCREV = "ce691fb5ce78b2c75243c60a757a3990ae09681c" -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.1.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb new file mode 100644 index 000000000..0b4704624 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb @@ -0,0 +1,8 @@ +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" + -- cgit v1.2.3