From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A79E9158089 for ; Sun, 1 Oct 2023 09:28:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED8B02BC048; Sun, 1 Oct 2023 09:28:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1D342BC048 for ; Sun, 1 Oct 2023 09:28:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED67A335C5D for ; Sun, 1 Oct 2023 09:28:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38E8210F4 for ; Sun, 1 Oct 2023 09:28:41 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1696152438.151c847ec2fd8417433af2d8b0ceed5b786d6ce0.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/kernel-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 151c847ec2fd8417433af2d8b0ceed5b786d6ce0 X-VCS-Branch: master Date: Sun, 1 Oct 2023 09:28:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 676608d8-9279-44e9-9b66-800005952593 X-Archives-Hash: 880594bdfb76342f09c462541690ca51 commit: 151c847ec2fd8417433af2d8b0ceed5b786d6ce0 Author: Andrew Ammerlaan gentoo org> AuthorDate: Fri Sep 15 05:53:56 2023 +0000 Commit: Andrew Ammerlaan gentoo 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 gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/32793 Signed-off-by: Andrew Ammerlaan 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