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 935AD15838C for ; Tue, 16 Jan 2024 09:02:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0438E2B88; Tue, 16 Jan 2024 09:02:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 983F6E2B88 for ; Tue, 16 Jan 2024 09:02:23 +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 C016E34327E for ; Tue, 16 Jan 2024 09:02:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3036C12C8 for ; Tue, 16 Jan 2024 09:02:21 +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: <1705395593.8e23288a8fd00d0a2bda462cb6463d8c1d6ca892.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/kernel-install.eclass X-VCS-Directories: eclass/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 8e23288a8fd00d0a2bda462cb6463d8c1d6ca892 X-VCS-Branch: master Date: Tue, 16 Jan 2024 09:02:21 +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: 843f8c70-da54-4328-8a61-48d7b1a3646d X-Archives-Hash: 5f01392c0a5dd5e11ddd0c1cf28026f5 commit: 8e23288a8fd00d0a2bda462cb6463d8c1d6ca892 Author: Andrew Ammerlaan gentoo org> AuthorDate: Tue Jan 16 08:59:53 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Tue Jan 16 08:59:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e23288a kernel-install.eclass: USE=generic-uki drop requirement for installkernel[uki] it is not strictly necessary, i.e. we might also want to just use the generic initrd. Or install the uki in the grub layout. But more importantly this requirement creates a bit of an unfortunate conflict in binpkg-docker that would otherwise have to be resolved with manual overrides of install.conf. See-also: https://github.com/projg2/binpkg-docker/pull/7 Signed-off-by: Andrew Ammerlaan gentoo.org> eclass/kernel-install.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass index 5a98446b12ee..9ab96628b5e4 100644 --- a/eclass/kernel-install.eclass +++ b/eclass/kernel-install.eclass @@ -200,7 +200,7 @@ if [[ ${KERNEL_IUSE_GENERIC_UKI} ]]; then IDEPEND=" generic-uki? ( || ( - >=sys-kernel/installkernel-8[-dracut(-),-ukify(-),uki(-)] + >=sys-kernel/installkernel-8[-dracut(-),-ukify(-)] >=sys-kernel/installkernel-systemd-3 ) )