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 049A415939F for ; Mon, 15 Jul 2024 19:18:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEAEDE2A6C; Mon, 15 Jul 2024 19:18:23 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8FF9AE2A6C for ; Mon, 15 Jul 2024 19:18: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 971E6340940 for ; Mon, 15 Jul 2024 19:18:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE1091E32 for ; Mon, 15 Jul 2024 19:18:20 +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: <1721070907.fcb9ecdc3dc77da03db79fa74fa458c4e5808c16.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-r2.ebuild sys-kernel/installkernel/metadata.xml X-VCS-Directories: sys-kernel/installkernel/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: fcb9ecdc3dc77da03db79fa74fa458c4e5808c16 X-VCS-Branch: master Date: Mon, 15 Jul 2024 19:18:20 +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: eea8ae2c-aca0-4c6c-8a94-e6d57a41f977 X-Archives-Hash: 550f4093c0204b1d87504d7ccc3b1ff2 commit: fcb9ecdc3dc77da03db79fa74fa458c4e5808c16 Author: Zen pyl onl> AuthorDate: Thu Jul 4 18:05:38 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon Jul 15 19:15:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb9ecdc sys-kernel/installkernel: Add UGRD USE functions to installkernel-39. Signed-off-by: Zen pyl.onl> Signed-off-by: Andrew Ammerlaan gentoo.org> .../{installkernel-39-r1.ebuild => installkernel-39-r2.ebuild} | 6 +++++- sys-kernel/installkernel/metadata.xml | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys-kernel/installkernel/installkernel-39-r1.ebuild b/sys-kernel/installkernel/installkernel-39-r2.ebuild similarity index 96% rename from sys-kernel/installkernel/installkernel-39-r1.ebuild rename to sys-kernel/installkernel/installkernel-39-r2.ebuild index 719dc80ce7be..2b11a30d57c5 100644 --- a/sys-kernel/installkernel/installkernel-39-r1.ebuild +++ b/sys-kernel/installkernel/installkernel-39-r2.ebuild @@ -17,12 +17,13 @@ S="${WORKDIR}/${PN}-gentoo-${PV}" LICENSE="GPL-2+" 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" +IUSE="dracut efistub grub refind systemd systemd-boot ugrd uki ukify" REQUIRED_USE=" ?? ( efistub grub systemd-boot ) refind? ( !systemd-boot !grub ) systemd-boot? ( systemd ) ukify? ( uki ) + ?? ( dracut ugrd ) " # Only select one flag that sets "layout=", except for uki since grub, # systemd-boot, and efistub booting are all compatible with UKIs and @@ -77,6 +78,7 @@ RDEPEND=" sys-apps/systemd-utils[boot(-),ukify(-)] ) ) + ugrd? ( sys-kernel/ugrd ) !=sys-apps/systemd-255.2-r1 !=sys-apps/systemd-255.2-r0 !~sys-apps/systemd-255.1 @@ -141,6 +143,8 @@ src_install() { echo "uki_generator=none" >> "${T}/install.conf" || die fi fi + elif use ugrd; then + echo "initrd_generator=ugrd" >> "${T}/install.conf" || die else echo "initrd_generator=none" >> "${T}/install.conf" || die fi diff --git a/sys-kernel/installkernel/metadata.xml b/sys-kernel/installkernel/metadata.xml index ba5cbd9d6764..70634cd58829 100644 --- a/sys-kernel/installkernel/metadata.xml +++ b/sys-kernel/installkernel/metadata.xml @@ -6,12 +6,13 @@ Distribution Kernel Project - Generate an initrd or UKI on each kernel installation + Generate an initramfs or UKI on each kernel installation EXPERIMENTAL: Update UEFI configuration on each kernel installation Re-generate grub.cfg on each kernel installation, used grub.cfg is overridable with GRUB_CFG env var Install a Gentoo icon for rEFInd alongside the (unified) kernel image, used icon is overridable with REFIND_ICON env var Use systemd's kernel-install to install kernels, overridable with SYSTEMD_KERNEL_INSTALL env var Use systemd-boot's native layout by default + Generate an initramfs using UGRD on each kernel installation Install UKIs to ESP/EFI/Linux for EFI stub booting and/or bootloaders with support for auto-discovering UKIs Build an UKI with systemd's ukify on each kernel installation