summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-09-24 17:27:31 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-28 12:00:29 +0100
commitf8da3b616c9ec3f27514bd28b540c4043a5efd6a (patch)
treec3dee4f0dac03851cc5253434dabf78b0f1dc6ab
parent218d9f480f29e971379b2bd65a257aed94db3334 (diff)
downloadpoky-f8da3b616c9ec3f27514bd28b540c4043a5efd6a.tar.gz
iproute2: fix the configure process
Previously, the iproute2's configure script is actually run in the do_compile stage. There's a Makefile rule 'all: Config' which makes the configure process run to generate the Config file. However, this makes it hard to fix the dependency problems. We need to generate the Config file in the do_configure stage. Add do_configure_append to separate the configure process from the compile process. Besides, explicitly disable ATM support for iproute2, otherwise we'll sometimes meet errors like below when building. ld: cannot find -latm collect2: error: ld returned 1 exit status Makefile:154: recipe for target 'q_atm.so' failed make[1]: *** [q_atm.so] Error 1 (From OE-Core rev: a6967f6e441eca758058ced9982b715984ee9b5b) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
index a53a4e6abc..29f90629a7 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
@@ -15,6 +15,12 @@ inherit update-alternatives
15 15
16EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" 16EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'"
17 17
18do_configure_append () {
19 sh configure ${STAGING_INCDIR}
20 # Explicitly disable ATM support
21 sed -i -e '/TC_CONFIG_ATM/d' Config
22}
23
18do_install () { 24do_install () {
19 oe_runmake DESTDIR=${D} install 25 oe_runmake DESTDIR=${D} install
20 mv ${D}${base_sbindir}/ip ${D}${base_sbindir}/ip.iproute2 26 mv ${D}${base_sbindir}/ip ${D}${base_sbindir}/ip.iproute2