summaryrefslogtreecommitdiffstats
path: root/meta/classes/kernel-yocto.bbclass
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2020-02-06 12:35:51 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-08 13:20:02 +0000
commit7ba241a697f87c5410604e72596a2d40e36e3e54 (patch)
tree20d65cc61d50426d43573eb2eba13a6b6d9791ea /meta/classes/kernel-yocto.bbclass
parent040ec2d8abe9bd1e98b36b7e04fdb95543d88b88 (diff)
downloadpoky-7ba241a697f87c5410604e72596a2d40e36e3e54.tar.gz
kernel-yocto.bbclass: do_kernel_configme: don't use +errexit, merge_config_build.log and fail when /.config wasn't created
* for whatever reason, instead of silently continuing to build default kernel config (From OE-Core rev: ec281a948a23365bd4536139dac077fb1a5eae6d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel-yocto.bbclass')
-rw-r--r--meta/classes/kernel-yocto.bbclass7
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index f71aa7d0a6..d961901b74 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -327,8 +327,6 @@ do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot"
327do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" 327do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot"
328do_kernel_configme[dirs] += "${S} ${B}" 328do_kernel_configme[dirs] += "${S} ${B}"
329do_kernel_configme() { 329do_kernel_configme() {
330 set +e
331
332 # translate the kconfig_mode into something that merge_config.sh 330 # translate the kconfig_mode into something that merge_config.sh
333 # understands 331 # understands
334 case ${KCONFIG_MODE} in 332 case ${KCONFIG_MODE} in
@@ -354,8 +352,9 @@ do_kernel_configme() {
354 bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)" 352 bbfatal_log "Could not find configuration queue (${meta_dir}/config.queue)"
355 fi 353 fi
356 354
357 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 355 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}
358 if [ $? -ne 0 ]; then 356
357 if [ $? -ne 0 -o ! -f ${B}/.config ]; then
359 bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" 358 bbfatal_log "Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
360 fi 359 fi
361 360