From 1b6ddd452837e67b500a84455a234f5edc8250a9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Enrico=20J=C3=B6rns?= Date: Fri, 28 Feb 2025 08:42:27 +0100 Subject: [PATCH] cml1.bbclass: use consistent make flags for menuconfig MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The class called 'make menuconfig' without any of the make variables and options set in EXTRA_OEMAKE, resulting in a quite different build environment than actually intended. For the kernel.bbclass this was fixed in commit 8c616bc0 ("kernel: Use consistent make flags for menuconfig") by appending ${EXTRA_OEMAKE} to KCONFIG_CONFIG_COMMAND. Instead of fixing this individually for additional recipes, we simply include ${EXTRA_OEMAKE} in KCONFIG_CONFIG_COMMAND by default. For most class users, this change is directly visible in the generated .config file: * For barebox and u-boot, the CONFIG_GCC_VERSION erroneously reflected the host GCC version before where it now correctly reflects the target toolchain's GCC. * For u-boot, also the "Compiler: " line at the beginning of the .config now prints the target toolchain instead of the host ones. * The kernel had this already set. * busybox did not produce any difference. Note that these projects might base some compile-time decisions on e.g. the actual compiler version used. Having the wrong one in the menuconfig-generated .config affects at least the visibility and consistency. Reported-by: Ulrich Ölmann Signed-off-by: Enrico Jörns Signed-off-by: Richard Purdie --- meta/classes-recipe/cml1.bbclass | 2 +- meta/classes-recipe/kernel.bbclass | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/classes-recipe/cml1.bbclass b/meta/classes-recipe/cml1.bbclass index d18b008aec2..3c2b4da4aff 100644 --- a/meta/classes-recipe/cml1.bbclass +++ b/meta/classes-recipe/cml1.bbclass @@ -31,7 +31,7 @@ CROSS_CURSES_LIB = "-lncurses -ltinfo" CROSS_CURSES_INC = '-DCURSES_LOC=""' TERMINFO = "${STAGING_DATADIR_NATIVE}/terminfo" -KCONFIG_CONFIG_COMMAND ??= "menuconfig" +KCONFIG_CONFIG_COMMAND ??= "menuconfig ${EXTRA_OEMAKE}" KCONFIG_CONFIG_ENABLE_MENUCONFIG ??= "true" KCONFIG_CONFIG_ROOTDIR ??= "${B}" python do_menuconfig() { diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index 6fe7c60e17c..64a685a964d 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass @@ -691,9 +691,6 @@ kernel_do_configure() { inherit cml1 pkgconfig -# Need LD, HOSTLDFLAGS and more for config operations -KCONFIG_CONFIG_COMMAND:append = " ${EXTRA_OEMAKE}" - EXPORT_FUNCTIONS do_compile do_transform_kernel do_transform_bundled_initramfs do_install do_configure # kernel-base becomes kernel-${KERNEL_VERSION} -- 2.47.3