[OE-core] [OE-Core][PATCH] module-base.bbclass: Call make instead of oe_runmake in do_make_scripts

[Darren Hart]

On 01/26/2013 10:54 PM, Khem Raj wrote:
> This makes the external module compilation a bit more robust for
> cases where external module recipes may be passing extra params
> to make via EXTRA_OEMAKE, and more that often one needs to pass

s/that/than/ (this honestly through me a bit :-)

> M=$(PWD) when building external modules and if we use EXTRA_OEMAKE
> that would mean that it would appear in do_make_scripts as well
> and since we are only changing the reference kernel src tree here
> it will not run the make scripts in desired directory.
> 
> It is also well explained in top makefile in kernel tree around
> line# 1335 in 3.4
> 
> |else # KBUILD_EXTMOD
> |
> |###
> |# External module support.
> |# When building external modules the kernel used as basis is considered
> |# read-only, and no consistency checks are made and the make
> |# system is not used on the basis kernel. If updates are required
> |# in the basis kernel ordinary make commands (without M=...) must
> |# be used.
> 
> Therefore passing  M=... will not do the updates in the basis
> kernel as expected with 'make scripts' so we have to bypass EXTRA_OEMAKE
> 
> [Yocto #3787]
> 
> Signed-off-by: Khem Raj <raj.khem at gmail.com>


Acked-by: Darren Hart <dvhart at linux.intel.com>

Thanks Khem!

--
Darren

> ---
>  meta/classes/module-base.bbclass |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/module-base.bbclass b/meta/classes/module-base.bbclass
> index cfee50a..9dbb4b4 100644
> --- a/meta/classes/module-base.bbclass
> +++ b/meta/classes/module-base.bbclass
> @@ -18,6 +18,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
>  #
>  do_make_scripts() {
>  	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS 
> -	oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \
> +	make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \
>  	           -C ${STAGING_KERNEL_DIR} scripts
>  }
> 

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