[OE-core] [PATCH 1/9] kernel.bbclass: compile kernel and modules in a single task

[Darren Hart]

On 12/13/2011 08:19 AM, Dmitry Eremin-Solenikov wrote:
> There is no point in compiling kernel modules in a separate task, run
> right after do_compile. On the other hand merging those tasks will e.g.
> make icecc used also for modules compilation, etc.

This split was done intentionally to allow tasks to be inserted between
compile and compile_kernelmodules. See:

commit 509364eb634cf148b6ac1fb5f51924f4eb6a8991
Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Tue Mar 15 11:25:01 2011 +0100

    kernel bbclass: split do_compile into do_compile and do_compile_modules

    This allows recipes to insert a custom task in between building
*Image and modules

    >From OE .dev revision 615876fe218dc3feb4a3df9e6546a7b1a6376800

    (From OE-Core rev: a2cc999d663407d17f41e1b0344361944993fa86)

    Signed-off-by: Koen Kooi <koen at openembedded.org>
    Acked-by: Graeme Gregory <dp at xora.org.uk>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

If you want to be able to use icecc, can you pull the necessary logic
into compile_kernelmodules rather than reverting Koen's patch?

Thanks,

Darren

> 
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
> ---
>  meta/classes/kernel.bbclass |    6 +-----
>  1 files changed, 1 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 3f2f75a..a75c199 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -89,17 +89,13 @@ kernel_do_compile() {
>  	if test "${KERNEL_IMAGETYPE_FOR_MAKE}.gz" = "${KERNEL_IMAGETYPE}"; then
>  		gzip -9c < "${KERNEL_IMAGETYPE_FOR_MAKE}" > "${KERNEL_OUTPUT}"
>  	fi
> -}
>  
> -do_compile_kernelmodules() {
> -	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
>  	if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
> -		oe_runmake ${PARALLEL_MAKE} modules  CC="${KERNEL_CC}" LD="${KERNEL_LD}"
> +		oe_runmake modules  CC="${KERNEL_CC}" LD="${KERNEL_LD}"
>  	else
>  		bbnote "no modules to compile"
>  	fi
>  }
> -addtask compile_kernelmodules after do_compile before do_install
>  
>  kernel_do_install() {
>  	#

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel