1 files changed, 7 insertions, 3 deletions

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 918d101d3d..44863adc27 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -352,10 +352,14 @@ do_kernel_configme() {
                 bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)"
         fi
 
-        CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs}
-
+        CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > ${meta_dir}/cfg/merge_config_build.log 2>&1
         if [ $? -ne 0 -o ! -f ${B}/.config ]; then
-                bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
+                bberror "Could not generate a .config for ${KMACHINE}-${LINUX_KERNEL_TYPE}"
+                if [ ${KCONF_AUDIT_LEVEL} -gt 1 ]; then
+                        bbfatal_log "`cat ${meta_dir}/cfg/merge_config_build.log`"
+                else
+                        bbfatal_log "Details can be found at: ${S}/${meta_dir}/cfg/merge_config_build.log"
+                fi
         fi
 
         if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then