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 857EE1581C1 for ; Wed, 3 Jul 2024 12:13:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5DCF2BC018; Wed, 3 Jul 2024 12:13:46 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 9440F2BC018 for ; Wed, 3 Jul 2024 12:13:46 +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 A8F39342FA1 for ; Wed, 3 Jul 2024 12:13:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1AA3C1D78 for ; Wed, 3 Jul 2024 12:13:44 +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: <1720008809.903ac60bcc2ff0c22358946c81cd4d6b5534e8fc.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/installkernel/installkernel-39-r1.ebuild sys-kernel/installkernel/installkernel-39.ebuild X-VCS-Directories: sys-kernel/installkernel/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 903ac60bcc2ff0c22358946c81cd4d6b5534e8fc X-VCS-Branch: master Date: Wed, 3 Jul 2024 12:13:44 +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: f2f76868-8aca-47b5-b0ff-2d4a30d04491 X-Archives-Hash: 7585e71fb6213d03581f3306f5d3f7a0 commit: 903ac60bcc2ff0c22358946c81cd4d6b5534e8fc Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed Jul 3 12:10:43 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Wed Jul 3 12:13:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=903ac60b sys-kernel/installkernel: do not block enabling both refind and efistub and document here why the REQUIRED_USE is the way it is. Signed-off-by: Andrew Ammerlaan gentoo.org> ...llkernel-39.ebuild => installkernel-39-r1.ebuild} | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/sys-kernel/installkernel/installkernel-39.ebuild b/sys-kernel/installkernel/installkernel-39-r1.ebuild similarity index 86% rename from sys-kernel/installkernel/installkernel-39.ebuild rename to sys-kernel/installkernel/installkernel-39-r1.ebuild index 60f6910aa12c..719dc80ce7be 100644 --- a/sys-kernel/installkernel/installkernel-39.ebuild +++ b/sys-kernel/installkernel/installkernel-39-r1.ebuild @@ -19,10 +19,28 @@ SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux" IUSE="dracut efistub grub refind systemd systemd-boot uki ukify" REQUIRED_USE=" + ?? ( efistub grub systemd-boot ) + refind? ( !systemd-boot !grub ) systemd-boot? ( systemd ) ukify? ( uki ) - ?? ( efistub grub refind systemd-boot ) " +# Only select one flag that sets "layout=", except for uki since grub, +# systemd-boot, and efistub booting are all compatible with UKIs and +# the uki layout. +# +# Refind does not set a layout=, it is compatible with the compat, uki +# and efistub layout. So block against only grub and systemd-boot. +# +# systemd-boot could be made to work without the systemd flag, but this +# makes no sense since in systemd(-utils) the boot flag already +# requires the kernel-install flag. +# +# Ukify hooks do nothing if the layout is not uki, so force this here. +# +# Only one initramfs generator flag can be selected. Note that while +# both dracut and ukify are UKI generators we don't block those because +# enabling both results in building an initramfs only with dracut and +# building an UKI with ukify, which is a valid configuration. RDEPEND=" !<=sys-kernel/installkernel-systemd-3