From 62285873e2a6b9375a96a3de7a500205aeb18fb3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 26 Jan 2013 22:20:45 -0800 Subject: [PATCH] module-base.bbclass: Call make instead of oe_runmake in do_make_scripts 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 than often one needs to pass 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] (From OE-Core rev: 0e0a5ee405bab478f35690e95219a1e5f2ac7aa6) Signed-off-by: Khem Raj Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- 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 cfee50a598..9dbb4b424b 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 }