diff options
| author |   WANG Xuerui <xen0n@gentoo.org> | 2023-12-15 17:43:16 +0800 |
|---|---|---|
| committer | WANG Xuerui <xen0n@gentoo.org> | 2023-12-19 01:20:49 +0800 |
| commit | ef4219fbf06a27fec86a85a6e4470fc0182fe862 (patch) | |
| tree | 959a3c221aa2b6ae0dcb7ae0bc3e6a3c8995c36e | |
| parent | kernel-install.eclass: support loong in kernel-install_get_qemu_arch (diff) | |
| download | gentoo-ef4219fbf06a27fec86a85a6e4470fc0182fe862.tar.gz gentoo-ef4219fbf06a27fec86a85a6e4470fc0182fe862.tar.bz2 gentoo-ef4219fbf06a27fec86a85a6e4470fc0182fe862.zip | |
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 <xen0n@gentoo.org>
| -rw-r--r-- | eclass/kernel-build.eclass | 12 |
1 files 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 |