[gentoo-commits] repo/gentoo:master commit in: eclass/

[Nowa Ammerlaan]

commit:     8f7a9128db5bbd61671568fe6dba50db36ffa1da
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 13 10:43:32 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 13 10:43:32 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f7a9128

kernel-build.eclass: error out early if generic-uki but no zboot

Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 eclass/kernel-build.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index 67c074495000..3296f2c6ad75 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -263,6 +263,9 @@ kernel-build_src_configure() {
        # 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
+       elif { use arm64 || use riscv || use loong ;} &&
+               [[ ${KERNEL_IUSE_GENERIC_UKI} ]] && use generic-uki; then
+                       die "USE=generic-uki requires enabling CONFIG_EFI_ZBOOT"
        fi
 
        mkdir -p "${WORKDIR}"/modprep || die