From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id A1FA815827B for ; Mon, 18 Aug 2025 15:33:22 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 87E9E340FB8 for ; Mon, 18 Aug 2025 15:33:22 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 81CB9110280; Mon, 18 Aug 2025 15:33:21 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 78E18110280 for ; Mon, 18 Aug 2025 15:33:21 +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 060AC340FB8 for ; Mon, 18 Aug 2025 15:33:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 656F9336B for ; Mon, 18 Aug 2025 15:33:19 +0000 (UTC) From: "Nowa 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, "Nowa Ammerlaan" Message-ID: <1755531130.f4415c5448aa9842d280a93c9d4f887fb0bbafb7.nowa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/vanilla-kernel/vanilla-kernel-5.10.9999.ebuild sys-kernel/vanilla-kernel/vanilla-kernel-5.15.9999.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: nowa X-VCS-Committer-Name: Nowa Ammerlaan X-VCS-Revision: f4415c5448aa9842d280a93c9d4f887fb0bbafb7 X-VCS-Branch: master Date: Mon, 18 Aug 2025 15:33:19 +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: 9baca33e-6e46-430c-bfdb-df732878697e X-Archives-Hash: 05e4e7ff73b017b69e59596a55d89832 commit: f4415c5448aa9842d280a93c9d4f887fb0bbafb7 Author: Nowa Ammerlaan gentoo org> AuthorDate: Mon Aug 18 15:32:10 2025 +0000 Commit: Nowa Ammerlaan gentoo 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 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[@]}" }