commit:     151c847ec2fd8417433af2d8b0ceed5b786d6ce0
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 15 05:53:56 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Oct  1 09:27:18 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=151c847e

kernel-build.eclass: drop obsolete if use secureboot statement

CONFIG_EFI_ZBOOT (among other things) is now set by secureboot.config in
GENTOO_CONFIG version g9 and up.

All {gentoo,vanilla}-kernel versions with "KERNEL_IUSE_MODULES_SIGN=1" and
GENTOO_CONFIG_VER<9 have been removed.

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/32793
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 eclass/kernel-build.eclass | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index 01cd184f41c0..4f7e4d047739 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -444,20 +444,6 @@ kernel-build_merge_configs() {
                fi
        fi
 
-       if [[ ${KERNEL_IUSE_SECUREBOOT} ]]; then
-               if use secureboot; then
-                       # This only effects arm64 and riscv where the bootable 
image may
-                       # contain its own decompressor (zboot). If enabled we 
get a
-                       # sign-able efi file.
-                       cat <<-EOF > "${WORKDIR}/secureboot.config" || die
-                               ## Enable zboot for signing
-                               CONFIG_EFI_ZBOOT=y
-                       EOF
-
-                       merge_configs+=( "${WORKDIR}/secureboot.config" )
-               fi
-       fi
-
        if [[ ${#user_configs[@]} -gt 0 ]]; then
                elog "User config files are being applied:"
                local x

Reply via email to