diff mbox series

kernel-yocto.bbclass: capture merge_config.sh output to task log

Message ID 20260310113351.194882-1-mikko.rapeli@linaro.org
State New
Headers show
Series kernel-yocto.bbclass: capture merge_config.sh output to task log | expand

Commit Message

Mikko Rapeli March 10, 2026, 11:33 a.m. UTC
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 <mikko.rapeli@linaro.org>
---
 meta/classes-recipe/kernel-yocto.bbclass | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Bruce Ashfield March 10, 2026, 12:41 p.m. UTC | #1
On Tue, Mar 10, 2026 at 7:34 AM Mikko Rapeli via lists.openembedded.org
<mikko.rapeli=linaro.org@lists.openembedded.org> 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 <mikko.rapeli@linaro.org>
> ---
>  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
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#232770):
> https://lists.openembedded.org/g/openembedded-core/message/232770
> Mute This Topic: https://lists.openembedded.org/mt/118239002/1050810
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Mikko Rapeli March 10, 2026, 12:49 p.m. UTC | #2
Hi,

On Tue, Mar 10, 2026 at 08:41:46AM -0400, Bruce Ashfield wrote:
> On Tue, Mar 10, 2026 at 7:34 AM Mikko Rapeli via lists.openembedded.org
> <mikko.rapeli=linaro.org@lists.openembedded.org> 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 <mikko.rapeli@linaro.org>
> > ---
> >  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.

Which tools? Why aren't these tools part of oe-core?

Standard practice of oe-core is to have details in task logs. I do not
think extra log locations should be used or logs hidden behind other
variables or switches.

Cheers,

-Mikko
Bruce Ashfield March 10, 2026, 12:55 p.m. UTC | #3
On Tue, Mar 10, 2026 at 8:49 AM Mikko Rapeli <mikko.rapeli@linaro.org>
wrote:

> Hi,
>
> On Tue, Mar 10, 2026 at 08:41:46AM -0400, Bruce Ashfield wrote:
> > On Tue, Mar 10, 2026 at 7:34 AM Mikko Rapeli via lists.openembedded.org
> > <mikko.rapeli=linaro.org@lists.openembedded.org> 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 <mikko.rapeli@linaro.org>
> > > ---
> > >  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.
>
> Which tools? Why aren't these tools part of oe-core?




> Standard practice of oe-core is to have details in task logs. I do not
> think extra log locations should be used or logs hidden behind other
> variables or switches.
>
>
Thanks, but I'm not sure why you are educating me on something
I've been involved with for a very long time.

Bruce




> Cheers,
>
> -Mikko
>
diff mbox series

Patch

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
 	fi
 
 	if [ ! -z "${LINUX_VERSION_EXTENSION}" ]; then