[gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/

[Nowa Ammerlaan]

commit:     f4415c5448aa9842d280a93c9d4f887fb0bbafb7
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 18 15:32:10 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Mon Aug 18 15:32:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4415c54

sys-kernel/vanilla-kernel: 5.x.y.9999 drop zboot and broken workaround

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

 sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild | 8 +-------
 sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild
index fc4acdc0d4ba..767fee347039 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild
@@ -126,13 +126,7 @@ src_prepare() {
                merge_configs+=( "${dist_conf_path}/big-endian.config" )
        fi
 
-       use secureboot && merge_configs+=(
-               "${dist_conf_path}/secureboot.config"
-               "${dist_conf_path}/zboot.config"
-       )
-
-       # 5.10 series: No ZBOOT, disable explicitly to not confuse the eclass
-       echo "# CONFIG_EFI_ZBOOT is not set" >> 
"${dist_conf_path}/secureboot.config" || die
+       use secureboot && merge_configs+=( 
"${dist_conf_path}/secureboot.config" )
 
        kernel-build_merge_configs "${merge_configs[@]}"
 }

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild
index cff136347dfb..d22a74cf97ca 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild
@@ -130,13 +130,7 @@ src_prepare() {
                merge_configs+=( "${dist_conf_path}/big-endian.config" )
        fi
 
-       use secureboot && merge_configs+=(
-               "${dist_conf_path}/secureboot.config"
-               "${dist_conf_path}/zboot.config"
-       )
-
-       # 5.15 series: No ZBOOT, disable explicitly to not confuse the eclass
-       echo "# CONFIG_EFI_ZBOOT is not set" >> 
"${dist_conf_path}/secureboot.config" || die
+       use secureboot && merge_configs+=( 
"${dist_conf_path}/secureboot.config" )
 
        kernel-build_merge_configs "${merge_configs[@]}"
 }