From ef4219fbf06a27fec86a85a6e4470fc0182fe862 Mon Sep 17 00:00:00 2001 From: WANG Xuerui Date: Fri, 15 Dec 2023 17:43:16 +0800 Subject: kernel-build.eclass: ensure KERNEL_EFI_ZBOOT is probed in all cases The several partially-supported arches (those relying on USE=savedconfig) directly return in src_prepare(), hence previously the CONFIG_EFI_ZBOOT probing didn't have a chance to run when building for those arches, leading to wrong kernel artifact path and failed src_install(). Move the probing to near the end of eclass src_configure(), so the flag correctly reflects the reality in all circumstances. Signed-off-by: WANG Xuerui --- eclass/kernel-build.eclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 6b692dc4f9a0..7a041a8aacdf 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -203,6 +203,12 @@ kernel-build_src_configure() { .config) fi + # If this is set by USE=secureboot or user config this will have an effect + # on the name of the output image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" .config; then + KERNEL_EFI_ZBOOT=1 + fi + mkdir -p "${WORKDIR}"/modprep || die mv .config "${WORKDIR}"/modprep/ || die emake O="${WORKDIR}"/modprep "${MAKEARGS[@]}" olddefconfig @@ -456,12 +462,6 @@ kernel-build_merge_configs() { ./scripts/kconfig/merge_config.sh -m -r \ .config "${merge_configs[@]}" || die - - # If this is set by USE=secureboot or user config this will have an effect - # on the name of the output image. Set this variable to track this setting. - if grep -q "CONFIG_EFI_ZBOOT=y" .config; then - KERNEL_EFI_ZBOOT=1 - fi } fi -- cgit v1.2.3-65-gdbad