From 5944ce177026c93b7dab690db9d970567ddbf75f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 5 Dec 2023 11:04:31 +0000
Subject: gentoo auto-resync : 05:12:2023 - 11:04:31

---
 eclass/kernel-install.eclass | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

(limited to 'eclass/kernel-install.eclass')

diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index a0eceae8280b..b4d84f3986c0 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -48,11 +48,21 @@ RESTRICT+="
 
 # note: we need installkernel with initramfs support!
 IDEPEND="
-	|| (
-		sys-kernel/installkernel-gentoo
-		sys-kernel/installkernel-systemd
+	!initramfs? (
+		|| (
+			sys-kernel/installkernel-gentoo
+			sys-kernel/installkernel-systemd
+		)
 	)
-	initramfs? ( >=sys-kernel/dracut-059-r4 )"
+	initramfs? (
+		>=sys-kernel/dracut-059-r4
+		|| (
+			<=sys-kernel/installkernel-gentoo-7
+			>=sys-kernel/installkernel-gentoo-8[dracut(-)]
+			sys-kernel/installkernel-systemd
+		)
+	)
+"
 # needed by objtool that is installed along with the kernel and used
 # to build external modules
 # NB: linux-mod.eclass also adds this dep but it's cleaner to have
@@ -429,9 +439,13 @@ kernel-install_pkg_preinst() {
 # @FUNCTION: kernel-install_install_all
 # @USAGE: <ver>
 # @DESCRIPTION:
-# Build an initramfs for the kernel and install the kernel.  This is
-# called from pkg_postinst() and pkg_config().  <ver> is the full
-# kernel version.
+# Build an initramfs for the kernel if required and install the kernel.
+# This is called from pkg_postinst() and pkg_config().  <ver> is the
+# full kernel version.
+#
+# With sys-kernel/installkernel-systemd, or version 8 or greater of
+# sys-kernel/installkernel-gentoo, the generation of the initrd via dracut
+# is handled by kernel-install instead.
 kernel-install_install_all() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -448,7 +462,7 @@ kernel-install_install_all() {
 		nonfatal mount-boot_check_status || break
 
 		local image_path=$(dist-kernel_get_image_path)
-		if use initramfs; then
+		if use initramfs && has_version "<=sys-kernel/installkernel-gentoo-7"; then
 			# putting it alongside kernel image as 'initrd' makes
 			# kernel-install happier
 			nonfatal dist-kernel_build_initramfs \
-- 
cgit v1.2.3