| Message ID | 20250227092821.2766396-1-ejo@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
| Series | barebox.bbclass: use consistent make flags for menuconfig | expand |
On Thu, 2025-02-27 at 10:28 +0100, Enrico Jörns via lists.openembedded.org wrote: > This change is done similar to the change in the kernel.bbclass of > commit 8c616bc0 ("kernel: Use consistent make flags for menuconfig"). > > This was discovered since the new CONFIG_GCC_VERSION kconfig symbol > reflected the host GCC version instead of the target ones after running > do_menuconfig. > > Reported-by: Ulrich Ölmann <u.oelmann@pengutronix.de> > Signed-off-by: Enrico Jörns <ejo@pengutronix.de> > --- > meta/classes-recipe/barebox.bbclass | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/meta/classes-recipe/barebox.bbclass b/meta/classes-recipe/barebox.bbclass > index 200ba08326..baba0a2965 100644 > --- a/meta/classes-recipe/barebox.bbclass > +++ b/meta/classes-recipe/barebox.bbclass > @@ -53,6 +53,7 @@ EXTRA_OEMAKE = " \ > PKG_CONFIG=pkg-config-native \ > CROSS_PKG_CONFIG=pkg-config \ > " > +KCONFIG_CONFIG_COMMAND:append = " ${EXTRA_OEMAKE}" > Can we use += here rather than append? Cheers, Richard
Am Donnerstag, dem 27.02.2025 um 11:17 +0000 schrieb Richard Purdie: > On Thu, 2025-02-27 at 10:28 +0100, Enrico Jörns via lists.openembedded.org wrote: > > This change is done similar to the change in the kernel.bbclass of > > commit 8c616bc0 ("kernel: Use consistent make flags for menuconfig"). > > > > This was discovered since the new CONFIG_GCC_VERSION kconfig symbol > > reflected the host GCC version instead of the target ones after running > > do_menuconfig. > > > > Reported-by: Ulrich Ölmann <u.oelmann@pengutronix.de> > > Signed-off-by: Enrico Jörns <ejo@pengutronix.de> > > --- > > meta/classes-recipe/barebox.bbclass | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/meta/classes-recipe/barebox.bbclass b/meta/classes-recipe/barebox.bbclass > > index 200ba08326..baba0a2965 100644 > > --- a/meta/classes-recipe/barebox.bbclass > > +++ b/meta/classes-recipe/barebox.bbclass > > @@ -53,6 +53,7 @@ EXTRA_OEMAKE = " \ > > PKG_CONFIG=pkg-config-native \ > > CROSS_PKG_CONFIG=pkg-config \ > > " > > +KCONFIG_CONFIG_COMMAND:append = " ${EXTRA_OEMAKE}" > > > > Can we use += here rather than append? TBH I've copied the line from the kernel.bbclass. I guess this is because of KCONFIG_CONFIG_COMMAND ??= "menuconfig" in the cml1.bbclass. If I'd replace the weak default there, it should work. Or would it make sense to just set EXTRA_OEMAKE in cml1.bbclass by default? Like KCONFIG_CONFIG_COMMAND ??= "menuconfig ${EXTRA_OEMAKE}" Regards, Enrico > Cheers, > > Richard >
On Thu, 2025-02-27 at 12:23 +0100, Enrico Jörns wrote: > Am Donnerstag, dem 27.02.2025 um 11:17 +0000 schrieb Richard Purdie: > > On Thu, 2025-02-27 at 10:28 +0100, Enrico Jörns via > > lists.openembedded.org wrote: > > > This change is done similar to the change in the kernel.bbclass > > > of > > > commit 8c616bc0 ("kernel: Use consistent make flags for > > > menuconfig"). > > > > > > This was discovered since the new CONFIG_GCC_VERSION kconfig > > > symbol > > > reflected the host GCC version instead of the target ones after > > > running > > > do_menuconfig. > > > > > > Reported-by: Ulrich Ölmann <u.oelmann@pengutronix.de> > > > Signed-off-by: Enrico Jörns <ejo@pengutronix.de> > > > --- > > > meta/classes-recipe/barebox.bbclass | 1 + > > > 1 file changed, 1 insertion(+) > > > > > > diff --git a/meta/classes-recipe/barebox.bbclass b/meta/classes- > > > recipe/barebox.bbclass > > > index 200ba08326..baba0a2965 100644 > > > --- a/meta/classes-recipe/barebox.bbclass > > > +++ b/meta/classes-recipe/barebox.bbclass > > > @@ -53,6 +53,7 @@ EXTRA_OEMAKE = " \ > > > PKG_CONFIG=pkg-config-native \ > > > CROSS_PKG_CONFIG=pkg-config \ > > > " > > > +KCONFIG_CONFIG_COMMAND:append = " ${EXTRA_OEMAKE}" > > > > > > > Can we use += here rather than append? > > TBH I've copied the line from the kernel.bbclass. > I guess this is because of > > KCONFIG_CONFIG_COMMAND ??= "menuconfig" > > in the cml1.bbclass. > > If I'd replace the weak default there, it should work. > > Or would it make sense to just set EXTRA_OEMAKE in cml1.bbclass by > default? Like > > KCONFIG_CONFIG_COMMAND ??= "menuconfig ${EXTRA_OEMAKE}" Setting it to just include it probably makes the most sense at this point. I'm just trying to keep the variables simple! That would affect busybox and u-boot but I suspect they probably need the same fix too. Cheers, Richard
Am Donnerstag, dem 27.02.2025 um 11:44 +0000 schrieb Richard Purdie: > On Thu, 2025-02-27 at 12:23 +0100, Enrico Jörns wrote: > > Am Donnerstag, dem 27.02.2025 um 11:17 +0000 schrieb Richard Purdie: > > > On Thu, 2025-02-27 at 10:28 +0100, Enrico Jörns via > > > lists.openembedded.org wrote: > > > > This change is done similar to the change in the kernel.bbclass > > > > of > > > > commit 8c616bc0 ("kernel: Use consistent make flags for > > > > menuconfig"). > > > > > > > > This was discovered since the new CONFIG_GCC_VERSION kconfig > > > > symbol > > > > reflected the host GCC version instead of the target ones after > > > > running > > > > do_menuconfig. > > > > > > > > Reported-by: Ulrich Ölmann <u.oelmann@pengutronix.de> > > > > Signed-off-by: Enrico Jörns <ejo@pengutronix.de> > > > > --- > > > > meta/classes-recipe/barebox.bbclass | 1 + > > > > 1 file changed, 1 insertion(+) > > > > > > > > diff --git a/meta/classes-recipe/barebox.bbclass b/meta/classes- > > > > recipe/barebox.bbclass > > > > index 200ba08326..baba0a2965 100644 > > > > --- a/meta/classes-recipe/barebox.bbclass > > > > +++ b/meta/classes-recipe/barebox.bbclass > > > > @@ -53,6 +53,7 @@ EXTRA_OEMAKE = " \ > > > > PKG_CONFIG=pkg-config-native \ > > > > CROSS_PKG_CONFIG=pkg-config \ > > > > " > > > > +KCONFIG_CONFIG_COMMAND:append = " ${EXTRA_OEMAKE}" > > > > > > > > > > Can we use += here rather than append? > > > > TBH I've copied the line from the kernel.bbclass. > > I guess this is because of > > > > KCONFIG_CONFIG_COMMAND ??= "menuconfig" > > > > in the cml1.bbclass. > > > > If I'd replace the weak default there, it should work. > > > > Or would it make sense to just set EXTRA_OEMAKE in cml1.bbclass by > > default? Like > > > > KCONFIG_CONFIG_COMMAND ??= "menuconfig ${EXTRA_OEMAKE}" > > Setting it to just include it probably makes the most sense at this > point. I'm just trying to keep the variables simple! Sounds good. > That would affect busybox and u-boot but I suspect they probably need > the same fix too. That would be my assumption, too. I'll make a quick check with these to not break too obvious things and will send a new patch then. Thanks and regards Enrico > Cheers, > > Richard >
diff --git a/meta/classes-recipe/barebox.bbclass b/meta/classes-recipe/barebox.bbclass index 200ba08326..baba0a2965 100644 --- a/meta/classes-recipe/barebox.bbclass +++ b/meta/classes-recipe/barebox.bbclass @@ -53,6 +53,7 @@ EXTRA_OEMAKE = " \ PKG_CONFIG=pkg-config-native \ CROSS_PKG_CONFIG=pkg-config \ " +KCONFIG_CONFIG_COMMAND:append = " ${EXTRA_OEMAKE}" BAREBOX_CONFIG[doc] = "The barebox kconfig defconfig file. Not used if a file called defconfig is added to the SRC_URI." BAREBOX_CONFIG ?= ""
This change is done similar to the change in the kernel.bbclass of commit 8c616bc0 ("kernel: Use consistent make flags for menuconfig"). This was discovered since the new CONFIG_GCC_VERSION kconfig symbol reflected the host GCC version instead of the target ones after running do_menuconfig. Reported-by: Ulrich Ölmann <u.oelmann@pengutronix.de> Signed-off-by: Enrico Jörns <ejo@pengutronix.de> --- meta/classes-recipe/barebox.bbclass | 1 + 1 file changed, 1 insertion(+)