[oe-commits] [openembedded-core] 07/07: make-mod-scripts: add build requirements for external modules

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit b873dd45a4115c752b3a42860b8fcb620b04608a
Author: Bruce Ashfield <bruce.ashfield at windriver.com>
AuthorDate: Sun Feb 18 21:25:44 2018 -0500

    make-mod-scripts: add build requirements for external modules
    
    Newer kernels (4.14/v4.15+) have dependencies for the build of
    modules (and hence external modules). Without these dependencies
    explicitly in the build chain, you can end up with build failures like:
    
      work-shared/qemux86/kernel-source/scripts/extract-cert.c:21:25: fatal
      error: openssl/bio.h: No such file or directory
      |  #include <openssl/bio.h>
      |                          ^
      | compilation terminated.
      | make[2]: *** [scripts/extract-cert] Error 1
      | make[1]: *** [scripts] Error 2
    
    To ensure that these headers are in place, and that the scripts use
    our build environment flags, we add a dependency on openssl-native
    and use oe_make to invoke the build.
    
    Older kernels have no issues with the extra dependency, so there's no
    need to make this conditional.
    
    Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
index 845b409..2d75960 100644
--- a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
+++ b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
@@ -7,15 +7,17 @@ inherit pkgconfig
 
 S = "${WORKDIR}"
 
-do_configure[depends] += "virtual/kernel:do_shared_workdir"
+do_configure[depends] += "virtual/kernel:do_shared_workdir openssl-native:do_populate_sysroot"
 do_compile[depends] += "virtual/kernel:do_compile_kernelmodules"
 
+EXTRA_OEMAKE = " HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}""
+
 # Build some host tools under work-shared.  CC, LD, and AR are probably
 # not used, but this is the historical way of invoking "make scripts".
 #
 do_configure() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-	make CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \
+	oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" AR="${KERNEL_AR}" \
 	           -C ${STAGING_KERNEL_DIR} O=${STAGING_KERNEL_BUILDDIR} scripts
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.