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 84AC315806C for ; Sun, 13 Jul 2025 11:20:27 +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 6F683341F80 for ; Sun, 13 Jul 2025 11:20:27 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 628FD11055B; Sun, 13 Jul 2025 11:20:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5706911055B for ; Sun, 13 Jul 2025 11:20:24 +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 DAC87341F52 for ; Sun, 13 Jul 2025 11:20:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EA322DF8 for ; Sun, 13 Jul 2025 11:20:22 +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: <1752405166.e34e786c7cc7aeee8d6b5093c09e0ef9185da6f1.nowa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.238.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.239.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.185.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.186.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.187.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.141.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.142.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.143.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.144.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.34.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.35.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.36.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.37.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.4.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.5.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15. 6.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.94.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.95.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.96.ebuild sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.97.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: nowa X-VCS-Committer-Name: Nowa Ammerlaan X-VCS-Revision: e34e786c7cc7aeee8d6b5093c09e0ef9185da6f1 X-VCS-Branch: master Date: Sun, 13 Jul 2025 11:20:22 +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: 4307127c-c212-491f-9bd8-a000038d6ffd X-Archives-Hash: 8a779442cd04cab1efacde11199ac658 commit: e34e786c7cc7aeee8d6b5093c09e0ef9185da6f1 Author: Nowa Ammerlaan gentoo org> AuthorDate: Sun Jul 13 11:12:46 2025 +0000 Commit: Nowa Ammerlaan gentoo org> CommitDate: Sun Jul 13 11:12:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e34e786c sys-kernel/gentoo-kernel-bin: increase ebuild symmetry Instead of setting KERNEL_EFI_ZBOOT, we add a check for it to all ebuilds. We also set KERNEL_IUSE_MODULES_SIGN=1 here because the kernel-install eclass enables enforcing of module signatures in the test phase conditional to this variable. This is temporary until we finish symmetrising the older kernel series with the newer ones, then we can just drop this KERNEL_IUSE_MODULES_SIGN guard from the eclasses entirely. Signed-off-by: Nowa Ammerlaan gentoo.org> .../gentoo-kernel-bin/gentoo-kernel-bin-5.10.238.ebuild | 8 ++++++++ .../gentoo-kernel-bin/gentoo-kernel-bin-5.10.239.ebuild | 8 ++++++++ .../gentoo-kernel-bin/gentoo-kernel-bin-5.15.185.ebuild | 8 ++++++++ .../gentoo-kernel-bin/gentoo-kernel-bin-5.15.186.ebuild | 8 ++++++++ .../gentoo-kernel-bin/gentoo-kernel-bin-5.15.187.ebuild | 8 ++++++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.141.ebuild | 8 ++++++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.142.ebuild | 8 ++++++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.143.ebuild | 8 ++++++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.144.ebuild | 8 ++++++++ sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.34.ebuild | 11 ++++++++++- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.35.ebuild | 11 ++++++++++- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.36.ebuild | 11 ++++++++++- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.37.ebuild | 11 ++++++++++- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.4.ebuild | 11 ++++++++++- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.5.ebuild | 11 ++++++++++- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.6.ebuild | 11 ++++++++++- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.94.ebuild | 11 ++++++++++- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.95.ebuild | 11 ++++++++++- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.96.ebuild | 11 ++++++++++- sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.97.ebuild | 11 ++++++++++- 20 files changed, 182 insertions(+), 11 deletions(-) diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.238.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.238.ebuild index 49da8a8c7b5f..8ce3aa172523 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.238.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.238.ebuild @@ -103,6 +103,14 @@ src_configure() { O="${WORKDIR}"/modprep ) + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + fi + mkdir modprep || die cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.239.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.239.ebuild index e15d0acef84d..dab55b5a4559 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.239.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.239.ebuild @@ -103,6 +103,14 @@ src_configure() { O="${WORKDIR}"/modprep ) + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + fi + mkdir modprep || die cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.185.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.185.ebuild index 174218184b05..d1827f7c936e 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.185.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.185.ebuild @@ -103,6 +103,14 @@ src_configure() { O="${WORKDIR}"/modprep ) + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + fi + mkdir modprep || die cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.186.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.186.ebuild index 8f91ebee766a..cd5ab885bab9 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.186.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.186.ebuild @@ -103,6 +103,14 @@ src_configure() { O="${WORKDIR}"/modprep ) + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + fi + mkdir modprep || die cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.187.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.187.ebuild index 9f857df1b90b..64b76b99eb81 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.187.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.187.ebuild @@ -133,6 +133,14 @@ src_configure() { O="${WORKDIR}"/modprep ) + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + fi + mkdir modprep || die cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.141.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.141.ebuild index 174218184b05..d1827f7c936e 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.141.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.141.ebuild @@ -103,6 +103,14 @@ src_configure() { O="${WORKDIR}"/modprep ) + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + fi + mkdir modprep || die cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.142.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.142.ebuild index 8f91ebee766a..cd5ab885bab9 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.142.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.142.ebuild @@ -103,6 +103,14 @@ src_configure() { O="${WORKDIR}"/modprep ) + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + fi + mkdir modprep || die cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.143.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.143.ebuild index e330cc624623..0d1862801b65 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.143.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.143.ebuild @@ -133,6 +133,14 @@ src_configure() { O="${WORKDIR}"/modprep ) + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + fi + mkdir modprep || die cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.144.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.144.ebuild index c381a88a3118..25c60dffca15 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.144.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.144.ebuild @@ -133,6 +133,14 @@ src_configure() { O="${WORKDIR}"/modprep ) + local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + fi + mkdir modprep || die cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die emake -C "${MY_P}" "${makeargs[@]}" modules_prepare diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.34.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.34.ebuild index e16264cffb24..f8e4332186bf 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.34.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.34.ebuild @@ -3,8 +3,8 @@ EAPI=8 -KERNEL_EFI_ZBOOT=1 KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 inherit kernel-install toolchain-funcs unpacker @@ -110,6 +110,15 @@ src_configure() { ) local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + elif use arm64 && use generic-uki; then + die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build" + fi + local image="${kernel_dir}/$(dist-kernel_get_image_path)" local uki="${image%/*}/uki.efi" if [[ -s ${uki} ]]; then diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.35.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.35.ebuild index 7997d623cb79..370506f87000 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.35.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.35.ebuild @@ -3,8 +3,8 @@ EAPI=8 -KERNEL_EFI_ZBOOT=1 KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 inherit kernel-install toolchain-funcs unpacker @@ -110,6 +110,15 @@ src_configure() { ) local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + elif use arm64 && use generic-uki; then + die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build" + fi + local image="${kernel_dir}/$(dist-kernel_get_image_path)" local uki="${image%/*}/uki.efi" if [[ -s ${uki} ]]; then diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.36.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.36.ebuild index bcbaa65d8558..fce2a64f0328 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.36.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.36.ebuild @@ -3,8 +3,8 @@ EAPI=8 -KERNEL_EFI_ZBOOT=1 KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 inherit kernel-install toolchain-funcs unpacker verify-sig @@ -141,6 +141,15 @@ src_configure() { ) local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + elif use arm64 && use generic-uki; then + die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build" + fi + local image="${kernel_dir}/$(dist-kernel_get_image_path)" local uki="${image%/*}/uki.efi" if [[ -s ${uki} ]]; then diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.37.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.37.ebuild index b0c98e2fc3c1..eefe373fb9ce 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.37.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.37.ebuild @@ -3,8 +3,8 @@ EAPI=8 -KERNEL_EFI_ZBOOT=1 KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 inherit kernel-install toolchain-funcs unpacker verify-sig @@ -141,6 +141,15 @@ src_configure() { ) local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + elif use arm64 && use generic-uki; then + die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build" + fi + local image="${kernel_dir}/$(dist-kernel_get_image_path)" local uki="${image%/*}/uki.efi" if [[ -s ${uki} ]]; then diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.4.ebuild index 75d6d062f5e3..8e873c4afe68 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.4.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.4.ebuild @@ -3,8 +3,8 @@ EAPI=8 -KERNEL_EFI_ZBOOT=1 KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 inherit kernel-install toolchain-funcs unpacker @@ -110,6 +110,15 @@ src_configure() { ) local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + elif use arm64 && use generic-uki; then + die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build" + fi + local image="${kernel_dir}/$(dist-kernel_get_image_path)" local uki="${image%/*}/uki.efi" if [[ -s ${uki} ]]; then diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.5.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.5.ebuild index bcbaa65d8558..fce2a64f0328 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.5.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.5.ebuild @@ -3,8 +3,8 @@ EAPI=8 -KERNEL_EFI_ZBOOT=1 KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 inherit kernel-install toolchain-funcs unpacker verify-sig @@ -141,6 +141,15 @@ src_configure() { ) local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + elif use arm64 && use generic-uki; then + die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build" + fi + local image="${kernel_dir}/$(dist-kernel_get_image_path)" local uki="${image%/*}/uki.efi" if [[ -s ${uki} ]]; then diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.6.ebuild index 220e880ff0ee..539bb9a8afe9 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.6.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.6.ebuild @@ -3,8 +3,8 @@ EAPI=8 -KERNEL_EFI_ZBOOT=1 KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 inherit kernel-install toolchain-funcs unpacker verify-sig @@ -141,6 +141,15 @@ src_configure() { ) local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + elif use arm64 && use generic-uki; then + die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build" + fi + local image="${kernel_dir}/$(dist-kernel_get_image_path)" local uki="${image%/*}/uki.efi" if [[ -s ${uki} ]]; then diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.94.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.94.ebuild index d0d40c3b13a9..6910acb29e52 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.94.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.94.ebuild @@ -3,8 +3,8 @@ EAPI=8 -KERNEL_EFI_ZBOOT=1 KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 inherit kernel-install toolchain-funcs unpacker @@ -110,6 +110,15 @@ src_configure() { ) local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + elif use arm64 && use generic-uki; then + die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build" + fi + local image="${kernel_dir}/$(dist-kernel_get_image_path)" local uki="${image%/*}/uki.efi" if [[ -s ${uki} ]]; then diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.95.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.95.ebuild index f2781f3d402d..76f3270c2af1 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.95.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.95.ebuild @@ -3,8 +3,8 @@ EAPI=8 -KERNEL_EFI_ZBOOT=1 KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 inherit kernel-install toolchain-funcs unpacker @@ -110,6 +110,15 @@ src_configure() { ) local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + elif use arm64 && use generic-uki; then + die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build" + fi + local image="${kernel_dir}/$(dist-kernel_get_image_path)" local uki="${image%/*}/uki.efi" if [[ -s ${uki} ]]; then diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.96.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.96.ebuild index bcbaa65d8558..fce2a64f0328 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.96.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.96.ebuild @@ -3,8 +3,8 @@ EAPI=8 -KERNEL_EFI_ZBOOT=1 KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 inherit kernel-install toolchain-funcs unpacker verify-sig @@ -141,6 +141,15 @@ src_configure() { ) local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + elif use arm64 && use generic-uki; then + die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build" + fi + local image="${kernel_dir}/$(dist-kernel_get_image_path)" local uki="${image%/*}/uki.efi" if [[ -s ${uki} ]]; then diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.97.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.97.ebuild index d6be78edc270..f63cbd21ee06 100644 --- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.97.ebuild +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.97.ebuild @@ -3,8 +3,8 @@ EAPI=8 -KERNEL_EFI_ZBOOT=1 KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 inherit kernel-install toolchain-funcs unpacker verify-sig @@ -141,6 +141,15 @@ src_configure() { ) local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + elif use arm64 && use generic-uki; then + die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build" + fi + local image="${kernel_dir}/$(dist-kernel_get_image_path)" local uki="${image%/*}/uki.efi" if [[ -s ${uki} ]]; then