mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

iproute2: upgrade to 3.2.0

Browse Source 
This patch is to upgrade iproute2 to tag 3.2.0.
And the tag is not fully testd by the upstream and has build error.
We use the next commit of tag 3.2.0 which fixs the error.

(From OE-Core rev: f2a7b225b5a243e0a364be678a71bdc3b0fa99e0)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Shane Wang
2012-01-22 16:01:11 +08:00
committed by Richard Purdie
parent e96ec29709
commit d6a55ca79c
3 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch → meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch
+12 -18
View File
@@ -7,14 +7,11 @@ According to Kevin Tian:
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
--- Signed-off-by: Shane Wang <shane.wang@intel.com>
configure | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/configure b/configure diff -r e4e1b14b9c4a configure
index f5c3d40..bcc1948 100755 --- a/configure Sun Jan 22 15:26:47 2012 +0800
--- a/configure +++ b/configure Sun Jan 22 15:29:38 2012 +0800
+++ b/configure
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
# This is not an autconf generated configure # This is not an autconf generated configure
# #
@@ -23,7 +20,7 @@ index f5c3d40..bcc1948 100755
check_atm() check_atm()
{ {
@@ -13,7 +14,7 @@ int main(int argc, char **argv) { @@ -13,7 +14,7 @@
return 0; return 0;
} }
EOF EOF
@@ -32,16 +29,16 @@ index f5c3d40..bcc1948 100755
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo "TC_CONFIG_ATM:=y" >>Config echo "TC_CONFIG_ATM:=y" >>Config
@@ -47,7 +48,7 @@ int main(int argc, char **argv) @@ -47,7 +48,7 @@
EOF EOF
-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 -if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
+if $CC -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 $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
then then
echo "TC_CONFIG_XT:=y" >>Config echo "TC_CONFIG_XT:=y" >>Config
echo "using xtables" echo "using xtables"
@@ -84,7 +85,7 @@ int main(int argc, char **argv) { @@ -84,7 +85,7 @@
} }
EOF EOF
@@ -50,7 +47,7 @@ index f5c3d40..bcc1948 100755
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
@@ -124,7 +125,7 @@ int main(int argc, char **argv) { @@ -124,7 +125,7 @@
} }
EOF EOF
@@ -59,7 +56,7 @@ index f5c3d40..bcc1948 100755
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
@@ -145,7 +146,7 @@ check_ipt() @@ -145,7 +146,7 @@
check_ipt_lib_dir() check_ipt_lib_dir()
{ {
IPT_LIB_DIR="" IPT_LIB_DIR=""
@@ -68,7 +65,7 @@ index f5c3d40..bcc1948 100755
do do
for file in $dir/{xtables,iptables}/lib*t_*so ; do for file in $dir/{xtables,iptables}/lib*t_*so ; do
if [ -f $file ]; then if [ -f $file ]; then
@@ -168,7 +169,7 @@ int main(int argc, char **argv) @@ -168,7 +169,7 @@
return 0; return 0;
} }
EOF EOF
@@ -77,6 +74,3 @@ index f5c3d40..bcc1948 100755
if [ $? -eq 0 ] if [ $? -eq 0 ]
then then
echo "IP_CONFIG_SETNS:=y" >>Config echo "IP_CONFIG_SETNS:=y" >>Config
--
1.7.2.5
meta/recipes-connectivity/iproute2/iproute2_3.1.0.bb
-8
View File
@@ -1,8 +0,0 @@
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"
meta/recipes-connectivity/iproute2/iproute2_3.2.0.bb
+9
View File
@@ -0,0 +1,9 @@
require iproute2.inc
#v3.2.0 tag is "447c118f138171b260ad045ad6e1b17f9ef462e2"
#but it was not fully tested and had build error, and the next commit fixed it.
SRCREV = "13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git \
file://configure-cross.patch"
S = "${WORKDIR}/git"