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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 67AE815806C for ; Sun, 13 Jul 2025 11:20:25 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 59BC9341F52 for ; Sun, 13 Jul 2025 11:20:25 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 5596911036B; 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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 4946311036B 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 F2B1C341F55 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 2DE7A2C5D 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: <1752403412.8f7a9128db5bbd61671568fe6dba50db36ffa1da.nowa@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: nowa X-VCS-Committer-Name: Nowa Ammerlaan X-VCS-Revision: 8f7a9128db5bbd61671568fe6dba50db36ffa1da 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: c0f81de7-7acd-4b56-aa50-2151472c1427 X-Archives-Hash: 2a068b0ea4eeb3be909cfd51429b5954 commit: 8f7a9128db5bbd61671568fe6dba50db36ffa1da Author: Nowa Ammerlaan gentoo org> AuthorDate: Sun Jul 13 10:43:32 2025 +0000 Commit: Nowa Ammerlaan gentoo org> CommitDate: Sun Jul 13 10:43:32 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f7a9128 kernel-build.eclass: error out early if generic-uki but no zboot Signed-off-by: Nowa Ammerlaan gentoo.org> eclass/kernel-build.eclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 67c074495000..3296f2c6ad75 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -263,6 +263,9 @@ kernel-build_src_configure() { # on the name of the output image. Set this variable to track this setting. if grep -q "CONFIG_EFI_ZBOOT=y" .config; then KERNEL_EFI_ZBOOT=1 + elif { use arm64 || use riscv || use loong ;} && + [[ ${KERNEL_IUSE_GENERIC_UKI} ]] && use generic-uki; then + die "USE=generic-uki requires enabling CONFIG_EFI_ZBOOT" fi mkdir -p "${WORKDIR}"/modprep || die