On Tue, Mar 10, 2026 at 7:34 AM Mikko Rapeli via lists.openembedded.org <[email protected]> wrote:
> With https://lists.yoctoproject.org/g/linux-yocto/message/16359 > updates to merge_config.sh in kern-tools-native the output > is useful and not too verbose. Thus capture it to normal > do_kernel_configme task logs. > > Signed-off-by: Mikko Rapeli <[email protected]> > --- > meta/classes-recipe/kernel-yocto.bbclass | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/meta/classes-recipe/kernel-yocto.bbclass > b/meta/classes-recipe/kernel-yocto.bbclass > index e53bf1519418..d981ca0e30e6 100644 > --- a/meta/classes-recipe/kernel-yocto.bbclass > +++ b/meta/classes-recipe/kernel-yocto.bbclass > @@ -492,14 +492,9 @@ 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}" OBJCOPY="${KERNEL_OBJCOPY}" STRIP="${KERNEL_STRIP}" > ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > > ${meta_dir}/cfg/merge_config_build.log 2>&1 > + CFLAGS="${CFLAGS} ${TOOLCHAIN_OPTIONS}" HOSTCC="${BUILD_CC} > ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}" CC="${KERNEL_CC}" > LD="${KERNEL_LD}" OBJCOPY="${KERNEL_OBJCOPY}" STRIP="${KERNEL_STRIP}" > ARCH=${ARCH} merge_config.sh -O ${B} ${config_flags} ${configs} > if [ $? -ne 0 -o ! -f ${B}/.config ]; then > 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 > There are tools built on having the log around in a file. So we can't merge this as-is. Why not just change the default to 1 (and not make it fatal) instead of undoing all the infrastructure ? Bruce fi > > if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then > -- > 2.34.1 > > > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#232775): https://lists.openembedded.org/g/openembedded-core/message/232775 Mute This Topic: https://lists.openembedded.org/mt/118239002/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
