10 files changed, 10 insertions, 67 deletions
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index efe1910f9786..388f87d60d35 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/installkernel-gentoo/Manifest b/sys-kernel/installkernel-gentoo/Manifest
index 28a80a8ecaa9..91d54cd5c417 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1,3 +1,3 @@
 DIST installkernel-gentoo-7.tar.gz 2962 BLAKE2B 675a1e33470ef10a38cf880591cc78ce3bf92dad20feaea740cee7cdad657b9a9b30f53ff8078b610ed09e7ec306dc3b565856c92755e3aad2a5ef387df0522b SHA512 9944b20884a0fb252dced70d33963f24af221ffa41b99f14f5f3569c155c48a0e0762fc70ca103723cac35740f94fb2120712c7ba41a442e9f971251365a194e
-EBUILD installkernel-gentoo-7.ebuild 1097 BLAKE2B b99166038b37ae2833160ec598520d7fbd443177197045a046ccbb97db35ad8e87d24130cb2df6f20d37371921995c666127a0b731895f53b24da4e6c9957aa2 SHA512 451b0da40a65fe00e09f2c795a3da753bbc8e84e58de112f0bf4d43d178e94e9bcec8feaf0265699d82f06754b7287e3da2e77b9de11343ca9d2c16bb2ceb02d
+EBUILD installkernel-gentoo-7.ebuild 1092 BLAKE2B b549038bc3464d9065a8ee677ba52ca98a2d30bc61acaf79220f0402731621ef2f00203b9fecf0103dfce32153db9f9cc7fcecfc5b22a5d028408ccc02891c0f SHA512 e3585dca416081f92a7fb082da1e3924d569d8ffe91cf27dec5d4411467fec1a77b22b2bea95ef516606ed3c1c40ae7a4f523bd08efea56ba97efae967522c20
 MISC metadata.xml 450 BLAKE2B 67538f7d8059e68c7b1e84b29d7ea4a579af9238fe65f4fb8fe29b83760b38b6e586c2b7d2e12b5bab31ac5484def40b2814d084d62f7cdf867b32cd85526788 SHA512 16efb4e63b44889af229a18c4da550a7be0e6a8ab2d7538aca6976bb0eca7d9be120e0d394e0ccf90f20e79a1f0b790da695ac355db278bb7b8d6e6415be29f9
diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild b/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
index 3a1e960924ef..a62868a3c86b 100644
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-7.ebuild
@@ -16,7 +16,7 @@ IUSE="grub"
 RDEPEND="
 	>=sys-apps/debianutils-4.9-r1
 	!<sys-apps/debianutils-4.9-r1[installkernel(+)]
-	!sys-kernel/installkernel-systemd-boot"
+	!sys-kernel/installkernel-systemd"
 
 src_install() {
 	into /
diff --git a/sys-kernel/installkernel-systemd-boot/Manifest b/sys-kernel/installkernel-systemd-boot/Manifest
deleted file mode 100644
index 9bc67bebb575..000000000000
--- a/sys-kernel/installkernel-systemd-boot/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 00-00machineid-directory.install 694 BLAKE2B d4347645fb0a6401fc2b3ed43dac6c925591c289484a1946be137045066e5064d6df0aa9d547c1b720683434636b16a6a182c7b1ba18faf9733ce984e4a5b4b0 SHA512 f8af2f19a605b59f54662dfa909254de4fe2f4f5334d7bce7c6c5babb8e78382b6497a4a28d6d34b5c27af3f5b5b55772d0a1b8ade98cb63eb5d9266e7b9067e
-AUX installkernel-systemd-boot-2-r2-00-00machineid-directory.install 737 BLAKE2B cc4c2d2cf91de01f42242ce995c79afbb23deb942265ad0a57490260a22b1fc1aac5d85221f03fe93f3d337fbe36e69e3c57b13ec7d90129aa4d4c6949167cad SHA512 427363db8acded018621b23d97b64cbe897ffc08b75dc3f1aa669b24907f6bce7cc8978614f9327dbc125ae0184c84abf8087a08fcbf19651a0c6f9bbb4cd6e9
-EBUILD installkernel-systemd-boot-2-r1.ebuild 811 BLAKE2B 650427828e062194127b4ae6b9a5a5748fdd1965673580bffc8e63429a8d6a694177bd08851def3179059e33c85f076fd188cf1b5c514304e4e7b793a028a5c2 SHA512 532b7751a0d246c205140fb204ef38b27d7fba63472d3dab3760fab7bdc2d965998d7c0d5243affd70a51cd2a5de1328a212cbb3c52bf7db64df2092ed30f9b6
-EBUILD installkernel-systemd-boot-2-r3.ebuild 867 BLAKE2B e06084bff9a4f88d0cefd2c5f524d6e24b5420611d1805c6d7c763fc223574e140d1a509e23327a6be9f84af8f69891e47c4151100bbe32e81865eebf14614c3 SHA512 4688044f7c922b9d9c648471d08fabed9f0e3e5d4f756b4f17f3608964a7327c722925956d2b623b854ef46e614183edf77ab4f914bb734c6f357d8b3713e9e8
-MISC metadata.xml 267 BLAKE2B 4449a3159ae97fc4f2152d9305dc77bf8df18a3dc3ae5881b9e56fc0a30da17d7dabf24901b421389b0cea4b7f0037f46e193d8a74a79431c1ccbd3db1fde9ea SHA512 54190f2ef340d1e355087b7a9af6f651be3704bbf23600f024eabb1bdffd36fd92c1f3f37b409dbde82f52b5287e08a427537ca1028bc326d19470f755cefd43
diff --git a/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install b/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install
deleted file mode 100644
index 70b966fbf4b3..000000000000
--- a/sys-kernel/installkernel-systemd-boot/files/00-00machineid-directory.install
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# this file is installed by sys-kernel/installkernel-systemd-boot
-
-COMMAND="${1}"
-ENTRY_DIR_ABS="${3}"
-
-# this is exported by kernel-install
-if ! [[ $KERNEL_INSTALL_MACHINE_ID ]]; then
-    exit 0
-fi
-
-if [[ $COMMAND != add ]]; then
-    exit 0
-fi
-
-# If the machine-id dir does not exist (e.g. $ESP/<machine-id>)
-# create it. It receives values directly from kernel-install.
-# This is the only function of this plugin.
-MACHINE_ID_DIR="${ENTRY_DIR_ABS%/*}"
-if ! [[ -d "${MACHINE_ID_DIR}" ]]; then
-	if [[ "${KERNEL_INSTALL_VERBOSE}" -gt 0 ]]; then
-    		echo "+mkdir -v -p ${MACHINE_ID_DIR}"
-    		mkdir -v -p "${MACHINE_ID_DIR}"
-	else
-    		mkdir -p "${MACHINE_ID_DIR}"
-	fi
-fi
diff --git a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild b/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild
deleted file mode 100644
index b4b0308233e7..000000000000
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wrap kernel-install from systemd-boot as installkernel"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-S=${WORKDIR}
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-RDEPEND="|| ( sys-apps/systemd sys-apps/systemd-utils[boot] )
-	!<sys-apps/debianutils-4.9-r1[installkernel(+)]
-	!sys-kernel/installkernel-gentoo"
-
-src_install() {
-	# we could technically use a symlink here but it would require
-	# us to know the correct path, and that implies /usr merge problems
-	into /
-	newsbin - installkernel <<-EOF
-		#!/usr/bin/env sh
-		exec kernel-install add "\${1}" "\${2}"
-	EOF
-
-	exeinto /usr/lib/kernel/install.d/
-	doexe "${FILESDIR}/00-00machineid-directory.install"
-}
diff --git a/sys-kernel/installkernel-systemd/Manifest b/sys-kernel/installkernel-systemd/Manifest
new file mode 100644
index 000000000000..8dc38a039aa3
--- /dev/null
+++ b/sys-kernel/installkernel-systemd/Manifest
@@ -0,0 +1,3 @@
+AUX installkernel-systemd-2-r2-00-00machineid-directory.install 732 BLAKE2B eb0d08c8d266cf57e35a618ca0f87b25ea59df5a9ea11bcb076d4a9e4c269a9a60040493d61ea8e39f785d3bfb8c4920dfc738112960570b4682f1bb7e33ce8a SHA512 01dfa27c76b23d6ddec354118b2573eb244bd11b1a626f3cf6fcc205f0c6bd11c11f518e8460de16c83d9074ed759ba2251ed892cbadac17784e611a64cb404e
+EBUILD installkernel-systemd-2-r4.ebuild 954 BLAKE2B 4f1d14062b56663b79d71a47ff4f5d58dc719c697a6febb668494a0dac0c43f3315a30d1e91364146258a85049ac058d1fde6d4b18e34945c5f9e538a9140d41 SHA512 b7a5204ea1014bb3ea2f549ccc787a9807bb204a6fc26af25f169f62f5c52be067ed8d074cd7d719d6dde02d0ded4abd94c6e4f1d978fda8f63355cb7fb76d30
+MISC metadata.xml 267 BLAKE2B 4449a3159ae97fc4f2152d9305dc77bf8df18a3dc3ae5881b9e56fc0a30da17d7dabf24901b421389b0cea4b7f0037f46e193d8a74a79431c1ccbd3db1fde9ea SHA512 54190f2ef340d1e355087b7a9af6f651be3704bbf23600f024eabb1bdffd36fd92c1f3f37b409dbde82f52b5287e08a427537ca1028bc326d19470f755cefd43
diff --git a/sys-kernel/installkernel-systemd-boot/files/installkernel-systemd-boot-2-r2-00-00machineid-directory.install b/sys-kernel/installkernel-systemd/files/installkernel-systemd-2-r2-00-00machineid-directory.install
index 5fa3bbeffc04..54871f9e70eb 100644
--- a/sys-kernel/installkernel-systemd-boot/files/installkernel-systemd-boot-2-r2-00-00machineid-directory.install
+++ b/sys-kernel/installkernel-systemd/files/installkernel-systemd-2-r2-00-00machineid-directory.install
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# this file is installed by sys-kernel/installkernel-systemd-boot
+# this file is installed by sys-kernel/installkernel-systemd
 
 COMMAND="${1}"
 ENTRY_DIR_ABS="${3}"
diff --git a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
index 6ecb8c8f7702..219ca981dfe2 100644
--- a/sys-kernel/installkernel-systemd-boot/installkernel-systemd-boot-2-r3.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DESCRIPTION="Wrap kernel-install from systemd-boot as installkernel"
+DESCRIPTION="Wrap kernel-install from systemd as installkernel"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 S="${WORKDIR}"
 
@@ -16,7 +16,9 @@ RDEPEND="
 	|| (
 		sys-apps/systemd[gnuefi(-)]
 		sys-apps/systemd[boot(-)]
+		sys-apps/systemd[kernel-install(-)]
 		sys-apps/systemd-utils[boot]
+		sys-apps/systemd-utils[kernel-install(-)]
 	)
 "
 
@@ -26,7 +28,7 @@ src_install() {
 	into /
 	newsbin - installkernel <<-EOF
 		#!/usr/bin/env sh
-		exec kernel-install add "\${1}" "\${2}"
+		exec kernel-install add "\${1}" "\${2}" --verbose
 	EOF
 
 	exeinto /usr/lib/kernel/install.d/
diff --git a/sys-kernel/installkernel-systemd-boot/metadata.xml b/sys-kernel/installkernel-systemd/metadata.xml
index fae0ca9e8b97..fae0ca9e8b97 100644
--- a/sys-kernel/installkernel-systemd-boot/metadata.xml
+++ b/sys-kernel/installkernel-systemd/metadata.xml