[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2262/8267] kernel-yocto: do_kernel_configme: Fix silent sysroot poisoning error

[Emmanuele Bassi <ebassi src gnome org>]

commit d1528403d5a48592ca0c85772d5175ac1cd20f98
Author: Ioan-Adrian Ratiu <adrian ratiu ni com>
Date:   Tue Aug 30 12:49:06 2016 -0400

    kernel-yocto: do_kernel_configme: Fix silent sysroot poisoning error
    
    do_kernel_configme calls merge_config.sh (installed in the sysroot by
    the kern-tools-native recipe) which may invoke the compiler to complete
    the configuration process.
    
    Depending on the build (and dependencies), this may error due to sysroot poisoning [1].
    
    The errors are similar to:
    
      make[1]: Entering directory '4.1+gitAUTOINC+a7e53ecc27-r0/linux-x64-standard-build' HOSTCC  
scripts/basic/fixdep
      work-shared/x64/kernel-source/scripts/basic/fixdep.c:106:23: fatal error: sys/types.h: No such file or 
directory
      compilation terminated.
      make[2]: *** [work-shared/x64/kernel-source/scripts/basic/Makefile:22: 
scripts/basic/x86_64-nilrt-linux-fixdep] Error 1
    
    Adding $TOOLCHAIN_OPTIONS to $CFLAGS before calling merge_configs.sh
    fixes the error because $TOOLCHAIN_OPTIONS defines the sysroot and make
    uses it to correctly compile & fill all missing kernel config options.
    
    [1] http://lists.openembedded.org/pipermail/openembedded-core/2014-October/098253.html
    
    (From OE-Core rev: 4b770d62472d1b1a26366de0a1742db240aa5239)
    
    Signed-off-by: Ioan-Adrian Ratiu <adrian ratiu ni com>
    Signed-off-by: Bruce Ashfield <bruce ashfield windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel-yocto.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 9b8bab6..068378f 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -255,7 +255,7 @@ do_kernel_configme() {
                bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)"
        fi
 
-       ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > 
${meta_dir}/cfg/merge_config_build.log 2>&1
+       CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} 
${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1
        if [ $? -ne 0 ]; then
                bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
        fi