diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/kernel-yocto.bbclass | 7 |
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" | |||
327 | do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" | 327 | do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" |
328 | do_kernel_configme[dirs] += "${S} ${B}" | 328 | do_kernel_configme[dirs] += "${S} ${B}" |
329 | do_kernel_configme() { | 329 | do_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 | ||