<div class="gmail_quote">On Tue, Jul 17, 2012 at 11:28 AM, Cristian Iorga <span dir="ltr"><<a href="mailto:cristian.iorga@intel.com" target="_blank">cristian.iorga@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Signed-off-by: Cristian Iorga <<a href="mailto:cristian.iorga@intel.com" target="_blank">cristian.iorga@intel.com</a>><br>
---<br>
.../iproute2/iproute2-3.2.0/configure-cross.patch | 76 -------------------<br>
.../iproute2/iproute2-3.4.0/configure-cross.patch | 77 ++++++++++++++++++++<br>
meta/recipes-connectivity/iproute2/iproute2.inc | 10 +--<br>
.../iproute2/<a href="http://iproute2_3.2.0.bb" target="_blank">iproute2_3.2.0.bb</a> | 11 ---<br>
.../iproute2/<a href="http://iproute2_3.4.0.bb" target="_blank">iproute2_3.4.0.bb</a> | 9 +++<br>
5 files changed, 91 insertions(+), 92 deletions(-)<br>
delete mode 100644 meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch<br>
create mode 100644 meta/recipes-connectivity/iproute2/iproute2-3.4.0/configure-cross.patch<br>
delete mode 100644 meta/recipes-connectivity/iproute2/<a href="http://iproute2_3.2.0.bb" target="_blank">iproute2_3.2.0.bb</a><br>
create mode 100644 meta/recipes-connectivity/iproute2/<a href="http://iproute2_3.4.0.bb" target="_blank">iproute2_3.4.0.bb</a><br>
<br>
diff --git a/meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch<br>
deleted file mode 100644<br>
index bed7b84..0000000<br>
--- a/meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch<br>
+++ /dev/null<br>
@@ -1,76 +0,0 @@<br>
-From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001<br>
-From: Koen Kooi <<a href="mailto:koen@dominion.thruhere.net" target="_blank">koen@dominion.thruhere.net</a>><br>
-Date: Thu, 3 Nov 2011 10:46:16 +0100<br>
-Subject: [PATCH] make configure cross compile safe<br>
-<br>
-According to Kevin Tian:<br>
-Upstream-Status: Pending<br>
-<br>
-Signed-off-by: Koen Kooi <<a href="mailto:koen@dominion.thruhere.net" target="_blank">koen@dominion.thruhere.net</a>><br>
-Signed-off-by: Shane Wang <<a href="mailto:shane.wang@intel.com" target="_blank">shane.wang@intel.com</a>><br>
-<br>
-diff -r e4e1b14b9c4a configure<br>
---- a/configure Sun Jan 22 15:26:47 2012 +0800<br>
-+++ b/configure Sun Jan 22 15:29:38 2012 +0800<br>
-@@ -2,6 +2,7 @@<br>
- # This is not an autconf generated configure<br>
- #<br>
- INCLUDE=${1:-"$PWD/include"}<br>
-+SYSROOT=$1<br>
-<br>
- check_atm()<br>
- {<br>
-@@ -13,7 +14,7 @@<br>
- return 0;<br>
- }<br>
- EOF<br>
--gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1<br>
-+$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1<br>
- if [ $? -eq 0 ]<br>
- then<br>
- echo "TC_CONFIG_ATM:=y" >>Config<br>
-@@ -47,7 +48,7 @@<br>
-<br>
- EOF<br>
-<br>
--if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1<br>
-+if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1<br>
- then<br>
- echo "TC_CONFIG_XT:=y" >>Config<br>
- echo "using xtables"<br>
-@@ -84,7 +85,7 @@<br>
- }<br>
-<br>
- EOF<br>
--gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1<br>
-+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1<br>
-<br>
- if [ $? -eq 0 ]<br>
- then<br>
-@@ -124,7 +125,7 @@<br>
- }<br>
-<br>
- EOF<br>
--gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1<br>
-+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1<br>
-<br>
- if [ $? -eq 0 ]<br>
- then<br>
-@@ -145,7 +146,7 @@<br>
- check_ipt_lib_dir()<br>
- {<br>
- IPT_LIB_DIR=""<br>
-- for dir in /lib /usr/lib /usr/local/lib<br>
-+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib<br>
- do<br>
- for file in $dir/{xtables,iptables}/lib*t_*so ; do<br>
- if [ -f $file ]; then<br>
-@@ -168,7 +169,7 @@<br>
- return 0;<br>
- }<br>
- EOF<br>
--gcc -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1<br>
-+$CC -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1<br>
- if [ $? -eq 0 ]<br>
- then<br>
- echo "IP_CONFIG_SETNS:=y" >>Config<br>
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<br>
new file mode 100644<br>
index 0000000..42f591a<br>
--- /dev/null<br>
+++ b/meta/recipes-connectivity/iproute2/iproute2-3.4.0/configure-cross.patch<br>
@@ -0,0 +1,77 @@<br>
+From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001<br>
+From: Koen Kooi <<a href="mailto:koen@dominion.thruhere.net" target="_blank">koen@dominion.thruhere.net</a>><br>
+Date: Thu, 3 Nov 2011 10:46:16 +0100<br>
+Subject: [PATCH] make configure cross compile safe<br>
+<br>
+According to Kevin Tian:<br>
+Upstream-Status: Pending<br>
+<br>
+Signed-off-by: Koen Kooi <<a href="mailto:koen@dominion.thruhere.net" target="_blank">koen@dominion.thruhere.net</a>><br>
+Signed-off-by: Shane Wang <<a href="mailto:shane.wang@intel.com" target="_blank">shane.wang@intel.com</a>><br>
+<br>
+Index: iproute2-3.4.0/configure<br>
+===================================================================<br>
+--- iproute2-3.4.0.orig/configure<br>
++++ iproute2-3.4.0/configure<br>
+@@ -2,6 +2,7 @@<br>
+ # This is not an autconf generated configure<br>
+ #<br>
+ INCLUDE=${1:-"$PWD/include"}<br>
++SYSROOT=$1<br>
+<br>
+ # Make a temp directory in build tree.<br>
+ TMPDIR=$(mktemp -d config.XXXXXX)<br>
+@@ -17,7 +18,7 @@ int main(int argc, char **argv) {<br>
+ return 0;<br>
+ }<br>
+ EOF<br>
+-gcc -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1<br>
++$CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1<br>
+ if [ $? -eq 0 ]<br>
+ then<br>
+ echo "TC_CONFIG_ATM:=y" >>Config<br>
+@@ -51,7 +52,7 @@ int main(int argc, char **argv)<br>
+<br>
+ EOF<br>
+<br>
+-if gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1<br>
++if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1<br>
+ then<br>
+ echo "TC_CONFIG_XT:=y" >>Config<br>
+ echo "using xtables"<br>
+@@ -88,7 +89,7 @@ int main(int argc, char **argv) {<br>
+ }<br>
+<br>
+ EOF<br>
+-gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1<br>
++$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1<br>
+<br>
+ if [ $? -eq 0 ]<br>
+ then<br>
+@@ -128,7 +129,7 @@ int main(int argc, char **argv) {<br>
+ }<br>
+<br>
+ EOF<br>
+-gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1<br>
++$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1<br>
+<br>
+ if [ $? -eq 0 ]<br>
+ then<br>
+@@ -149,7 +150,7 @@ check_ipt()<br>
+ check_ipt_lib_dir()<br>
+ {<br>
+ IPT_LIB_DIR=""<br>
+- for dir in /lib /usr/lib /usr/local/lib<br>
++ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib<br>
+ do<br>
+ for file in $dir/{xtables,iptables}/lib*t_*so ; do<br>
+ if [ -f $file ]; then<br>
+@@ -172,7 +173,7 @@ int main(int argc, char **argv)<br>
+ return 0;<br>
+ }<br>
+ EOF<br>
+-gcc -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1<br>
++$CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1<br>
+ if [ $? -eq 0 ]<br>
+ then<br>
+ echo "IP_CONFIG_SETNS:=y" >>Config<br>
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc<br>
index 86847ef..7caf7d0 100644<br>
--- a/meta/recipes-connectivity/iproute2/iproute2.inc<br>
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc<br>
@@ -26,12 +26,12 @@ do_install () {<br>
# There are only .so files in iproute2<br>
INSANE_SKIP_${PN} = "dev-so"<br>
<br>
-FILES_${PN} += "${base_libdir}/tc"<br>
-FILES_${PN}-dbg += "${base_libdir}/tc/.debug"<br>
+FILES_${PN} += "${libdir}/tc"<br>
+FILES_${PN}-dbg += "${libdir}/tc/.debug"<br>
<br>
-ALTERNATIVE_NAME = "ip"<br>
-ALTERNATIVE_PATH = "${base_sbindir}/ip.iproute2"<br>
-ALTERNATIVE_LINK = "${base_bindir}/ip"<br>
+ALTERNATIVE_${PN} = "ip"<br>
+ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}"<br>
+ALTERNATIVE_LINK_NAME[ip] = "${base_bindir}/ip"<br>
ALTERNATIVE_PRIORITY = "100"<br>
<br></blockquote><div><br></div><div>You could state this change in the description.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
PARALLEL_MAKE = ""<br>
diff --git a/meta/recipes-connectivity/iproute2/<a href="http://iproute2_3.2.0.bb" target="_blank">iproute2_3.2.0.bb</a> b/meta/recipes-connectivity/iproute2/<a href="http://iproute2_3.2.0.bb" target="_blank">iproute2_3.2.0.bb</a><br>
deleted file mode 100644<br>
index 5af12af..0000000<br>
--- a/meta/recipes-connectivity/iproute2/<a href="http://iproute2_3.2.0.bb" target="_blank">iproute2_3.2.0.bb</a><br>
+++ /dev/null<br>
@@ -1,11 +0,0 @@<br>
-require iproute2.inc<br>
-<br>
-PR = "r1"<br>
-<br>
-#v3.2.0 tag is "447c118f138171b260ad045ad6e1b17f9ef462e2"<br>
-#but it was not fully tested and had build error, and the next commit fixed it.<br>
-SRCREV = "13603f6a9e46f08576f6284a0ef1ce1fbf94ffe0"<br>
-SRC_URI = "git://<a href="http://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git" target="_blank">git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git</a> \<br>
- file://configure-cross.patch"<br>
-S = "${WORKDIR}/git"<br>
-<br>
diff --git a/meta/recipes-connectivity/iproute2/<a href="http://iproute2_3.4.0.bb" target="_blank">iproute2_3.4.0.bb</a> b/meta/recipes-connectivity/iproute2/<a href="http://iproute2_3.4.0.bb" target="_blank">iproute2_3.4.0.bb</a><br>
new file mode 100644<br>
index 0000000..cf1d521<br>
--- /dev/null<br>
+++ b/meta/recipes-connectivity/iproute2/<a href="http://iproute2_3.4.0.bb" target="_blank">iproute2_3.4.0.bb</a><br>
@@ -0,0 +1,9 @@<br>
+require iproute2.inc<br>
+<br>
+PR = "r0"<br><br></blockquote><div><br></div><div>Not needed anymore. (The same mention for wpa-s. and pulseaudio.)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BPN}-${PV}.tar.xz \<br>
+ file://configure-cross.patch"<br>
+<br>
+SRC_URI[md5sum] = "879d3fac4e90809598b2864ec4a0cbf8"<br>
+SRC_URI[sha256sum] = "38e846e412b2fa235a447b50c20ad1e9770d1b3ed4d3ab18ca0b18c6e8b79ba4"<br>
<span><font color="#888888">--<br>
1.7.9.5<br>
<br>
<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core" target="_blank">http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br>