commit: fcb9ecdc3dc77da03db79fa74fa458c4e5808c16
Author: Zen <z <AT> pyl <DOT> onl>
AuthorDate: Thu Jul 4 18:05:38 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> 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 <z <AT> pyl.onl>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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 @@
<name>Distribution Kernel Project</name>
</maintainer>
<use>
- <flag name="dracut">Generate an initrd or UKI on each kernel
installation</flag>
+ <flag name="dracut">Generate an initramfs or UKI on each kernel
installation</flag>
<flag name="efistub">EXPERIMENTAL: Update UEFI configuration on
each kernel installation</flag>
<flag name="grub">Re-generate grub.cfg on each kernel
installation, used grub.cfg is overridable with GRUB_CFG env var</flag>
<flag name="refind">Install a Gentoo icon for rEFInd alongside
the (unified) kernel image, used icon is overridable with REFIND_ICON env
var</flag>
<flag name="systemd">Use systemd's kernel-install to install
kernels, overridable with SYSTEMD_KERNEL_INSTALL env var</flag>
<flag name="systemd-boot">Use systemd-boot's native layout by
default</flag>
+ <flag name="ugrd">Generate an initramfs using UGRD on each
kernel installation</flag>
<flag name="uki">Install UKIs to ESP/EFI/Linux for EFI stub
booting and/or bootloaders with support for auto-discovering UKIs</flag>
<flag name="ukify">Build an UKI with systemd's ukify on each
kernel installation</flag>
</use>
