Patchwork kernel.bbclass: Allow do_compile_kernelmodules to use PARALLEL_MAKE

login
register
mail settings
Submitter Koen Kooi
Date Dec. 11, 2011, 8:56 a.m.
Message ID <4672BCAC-24D2-42DA-8EE5-76965C027DCD@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/16661/
State New
Headers show

Comments

Koen Kooi - Dec. 11, 2011, 8:56 a.m.
Op 11 dec. 2011, om 00:28 heeft Khem Raj het volgende geschreven:

> On Fri, Dec 9, 2011 at 4:34 PM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>> Without this we don't take advantage of any configured multiple CPU
>> cores which seems a shame.
>> 
>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> ---
>> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
>> index d0cc279..120a524 100644
>> --- a/meta/classes/kernel.bbclass
>> +++ b/meta/classes/kernel.bbclass
>> @@ -89,7 +89,7 @@ kernel_do_compile() {
>>  do_compile_kernelmodules() {
>>        unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
>>        if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
>> -               oe_runmake modules  CC="${KERNEL_CC}" LD="${KERNEL_LD}"
>> +               oe_runmake ${PARALLEL_MAKE} modules  CC="${KERNEL_CC}" LD="${KERNEL_LD}"
>>        else
>>                bbnote "no modules to compile"
>>        fi
> 
> 
> in base.bbclass oe_runmake says
> 
> ${MAKE} ${EXTRA_OEMAKE} "$@"
> 
> and
> 
> conf/bitbake.conf says
> 
> EXTRA_OEMAKE_prepend_task-compile = "${PARALLEL_MAKE} "
> 
> hmmm so we dont parallel make if task is not called do_compile ?

Correct, that's why I did the following in meta-ti a while ago:

commit c62d16735db1beecd47a0ea3c4c51ddd29a1aeeb
Author: Koen Kooi <koen@dominion.thruhere.net>
Date:   Thu Jul 21 13:38:33 2011 +0200

    linux.inc: enable parallel make for modules as well
    
    Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>


regards,

Koen

Patch

diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index 77e3179..9650e68 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -228,6 +228,10 @@  do_configure_append() {
        fi
 }
 
+# bitbake.conf only prepends PARALLEL make in tasks called do_compile, which isn't the case for compile_modules
+# So explicitly enable it for that in here
+EXTRA_OEMAKE = "${PARALLEL_MAKE} "
+
 do_install_append() {
        oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH
 }