11 files changed, 134 insertions, 12 deletions
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 0af529d184da..d791e9fd5fc6 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
deleted file mode 100644
index a8c974928694..000000000000
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST installkernel-gentoo-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
-EBUILD installkernel-gentoo-12.ebuild 1410 BLAKE2B b35c0f1ce42c7c60ef590ce6cf275af8e5ea11130caf71adb8c4363480fb7e69cd0a49fd3d1608f6faac6bdc1e426dadfd5f519ffa11e5cfdef5ab1dc4d5ff21 SHA512 7932f74ccc3579f23492923ed0dc12511ddd58db88bcee3915bf233a7c68a88017aca0d03eb1c42e419811bea17659c5fae94d09cabddd7380d2f343de594ac9
-MISC metadata.xml 782 BLAKE2B 2abb439bd8ff160b52fd8d630cc69c0f422ecac14e2f11d81a9aff13fb3c66ff5c2638a45a9f04af74647ca74ead2280d28902830757efbed7db12ba6c1d2df2 SHA512 4fd2e50d662abc3a6459db579379effe987df787059fa5998101ac669bccffadeae493ff4b215ea34efdf394d07d3b122d855ad3b60991b559dd7a23d396e989
diff --git a/sys-kernel/installkernel-systemd/Manifest b/sys-kernel/installkernel-systemd/Manifest
index 951af705efda..30cb78cf276f 100644
--- a/sys-kernel/installkernel-systemd/Manifest
+++ b/sys-kernel/installkernel-systemd/Manifest
@@ -1,6 +1,7 @@
 AUX installkernel-systemd-2-r2-00-00machineid-directory.install 732 BLAKE2B eb0d08c8d266cf57e35a618ca0f87b25ea59df5a9ea11bcb076d4a9e4c269a9a60040493d61ea8e39f785d3bfb8c4920dfc738112960570b4682f1bb7e33ce8a SHA512 01dfa27c76b23d6ddec354118b2573eb244bd11b1a626f3cf6fcc205f0c6bd11c11f518e8460de16c83d9074ed759ba2251ed892cbadac17784e611a64cb404e
 AUX installkernel-systemd-3-10-copy-prebuilt.install 542 BLAKE2B 687fd634ef84d86dce82fb69e443cb0288de018305467ef6adc636a7fbeacd7b028554208ce0f542e37465ab1c879bec9baa99f194eb45ab7b55241a26b4b13b SHA512 6a726be2c6a293f2786dd239a5547535f78ce3ce34edb37d166a603593e8ffc50d42b1258d37a84f325c2e43d988a449d8eeeada7e2ba6becad6cdd1f9a0e856
-EBUILD installkernel-systemd-2-r4.ebuild 954 BLAKE2B 4f1d14062b56663b79d71a47ff4f5d58dc719c697a6febb668494a0dac0c43f3315a30d1e91364146258a85049ac058d1fde6d4b18e34945c5f9e538a9140d41 SHA512 b7a5204ea1014bb3ea2f549ccc787a9807bb204a6fc26af25f169f62f5c52be067ed8d074cd7d719d6dde02d0ded4abd94c6e4f1d978fda8f63355cb7fb76d30
-EBUILD installkernel-systemd-2-r5.ebuild 920 BLAKE2B b74a90d35ee526e34dfe34b21308b5046db03be263768f0dcb2b61dd1ba300dd61f3b18cae453ba17e65d115f65984757116d4c68ce7e9bb5f6ac3dc545e1a67 SHA512 c6ea5589122d3e622a776feeac10d752327e990bcde4f848a81ddeedcb73a54b4813a15b5ee5585e455918f1a11c224a7d51399d9efa550cba2c49f3efd8af46
-EBUILD installkernel-systemd-3.ebuild 1008 BLAKE2B 286f523c11a91954c1dcdf77c4f855aa345bc255281165fa9c6437981bdc29b6bcc6077dce3f247e9620e6850641a355bbcbeec277e6e73af8df133d8be63313 SHA512 cf1d806fba4192ec37d3ac32b74221e56f021a857641fa406693d2d243d5269fc79a4f34306b0082ec8ce6babb771241b4d40fca9e3acf82fe6298062a58f55d
+EBUILD installkernel-systemd-2-r4.ebuild 947 BLAKE2B b785b8534677e064ee9f78f3fe82d50d2397880c767629918f16bb1f86089b09e7ac3dda2ffd50b67af8c5baeb270a404ad98a537d6417eb7c36913004058ce2 SHA512 24f6c882dd584e05fad6867398558b9eef977b015e6d51677a90f50d306c940963dbf59492affe7c3ff9955da5a516ddde7ac692d9f3aa384b8409a378233fea
+EBUILD installkernel-systemd-2-r5.ebuild 913 BLAKE2B 3bfd1b5583f40155fab5bc43fb0f0a7d8d4c45a2b29bce4f90735e58c6e78c6899084edb78a982df354dfe15c953b35e55fde83d252181bc88e4eb58d59bd555 SHA512 d266718261caf4319df3e8554e004d680fa46afb08911645dfa6728e6b2fb68bc7d50e9d162444a020e3edc7b5941c4d8ee18604f103fd92c7f4499041ae1f26
+EBUILD installkernel-systemd-3.ebuild 1001 BLAKE2B 09425dcf37b74cd774bcefc1a65c4c233f08e8da132e76664df65b393218b766b98d0b583dbf34ea07c231e37c388aecc4677249041f4e3eb2f2fb5182c847af SHA512 7e096871518c26ae7f9dac751106dd6b1eab7e5ccf314672a6a84a87c687844b6c9b66e126e087ef5177c12e69e31ee9fe987aebfeb08fd0ccfd55a61ae8356c
+EBUILD installkernel-systemd-4.ebuild 713 BLAKE2B 66601dcfbe03b39dab1dab6cb7019a79e98f13be5c4a29c5d11a62a51af76e50e50c6c2ff62b33651f72b42a9fa701a546641146c9aea5644fba775142960b73 SHA512 d4a44c9e59042e058985cdf02def9a0c9cae781af57d2f2c5c66131320294a6073ce8482c52fba2eb72a74a51567e65150991a16ac74aed9c7795b28f27df61e
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
index 219ca981dfe2..b89b45be80e9 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="amd64 arm64 ~loong ppc64 x86"
 
 RDEPEND="
-	!sys-kernel/installkernel-gentoo
+	!sys-kernel/installkernel
 	|| (
 		sys-apps/systemd[gnuefi(-)]
 		sys-apps/systemd[boot(-)]
diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
index 64c179be1f34..8a88e9602d27 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="
-	!sys-kernel/installkernel-gentoo
+	!sys-kernel/installkernel
 	|| (
 		sys-apps/systemd[kernel-install(-)]
 		sys-apps/systemd-utils[kernel-install(-)]
diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild
index f5c22ec7a318..2c0e8d48576c 100644
--- a/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
-	!sys-kernel/installkernel-gentoo
+	!sys-kernel/installkernel
 	|| (
 		sys-apps/systemd[kernel-install(-)]
 		sys-apps/systemd-utils[kernel-install(-)]
diff --git a/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild b/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild
new file mode 100644
index 000000000000..73a4f2318f28
--- /dev/null
+++ b/sys-kernel/installkernel-systemd/installkernel-systemd-4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Wrap kernel-install from systemd as installkernel"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND=">=sys-kernel/installkernel-14"
+
+pkg_setup() {
+	elog "The wrapper functionality of ${PN} has been integrated into"
+	elog "sys-kernel/installkernel[systemd]."
+	elog "${PN} can be safely removed and replaced:"
+	elog
+	elog "emerge --noreplace sys-kernel/installkernel"
+	elog "emerge --depclean sys-kernel/installkernel-systemd"
+}
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
new file mode 100644
index 000000000000..5984e6483a2a
--- /dev/null
+++ b/sys-kernel/installkernel/Manifest
@@ -0,0 +1,5 @@
+DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
+DIST installkernel-14.tar.gz 5501 BLAKE2B cf7b47483440ec84f8aa17e1c6e585259ff13cf9ff76c89a262799c5143f3f994c0babe5f6ab0abf25f1a359ba3ea39e0027eb2df6c6b2c7a8627dab550f6504 SHA512 f6af5ee009738fa503b575d3464494c8296b3b986ac9b8fab074f38f98159209b4d2ce0cf555890d5bfcfa506ab08d334af97798f695d895863bcb68b3ecea66
+EBUILD installkernel-12.ebuild 1444 BLAKE2B 7ef1f8e8205cf742b2304e8232f7f017245a21ab5ff6723b677e4dd810dfd46977632b0c0e3cb5ce66523206cec4cfd539829bbe467838e4b65f6fb51a56d2ec SHA512 a7d72bd6ebb3b42d3348253756caaf169d0dce9c92403c3ccec5486f470d60e5d681299bfa3d9f41c6bab2dca35d958adf9663562c3e30282a66e78dfd39f53e
+EBUILD installkernel-14-r1.ebuild 2249 BLAKE2B 8ea11046e4bbd2848caf7fd2a72507edfee8be89fd94706d9c82557e20dbd5857fcbe4be564410ed7c94a0bccc25470667d5020d3993766c0627cd51d5a56b83 SHA512 1331362a873a0b746b72d9a33f538326ca251439e44521b493d7b2836414a840b368d25044f200dd43f994847f08d562c2e000b1af2a20e9bf2945d30a45f4d9
+MISC metadata.xml 861 BLAKE2B b5526c0440f51568a5afd3f5c8f8d862b29713d5c8b20fbb3388cadf1bd48bf1897fa7e5c2561ad589a97eac5df7f0c6aa8f38a71226c34b422e70ec81b32a8b SHA512 128b33f9aa08247e1733640449b5ae89be093473d78464d1eea9280e2cfaf22d0b91450660590f2ee6dec8c9987f7b9bf4520ad6492f1feabc89eee308d46061
diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-12.ebuild b/sys-kernel/installkernel/installkernel-12.ebuild
index b3fc7f5fa826..042e7cbdf2d6 100644
--- a/sys-kernel/installkernel-gentoo/installkernel-gentoo-12.ebuild
+++ b/sys-kernel/installkernel/installkernel-12.ebuild
@@ -7,6 +7,7 @@ DESCRIPTION="Gentoo fork of installkernel script from debianutils"
 HOMEPAGE="https://github.com/projg2/installkernel-gentoo"
 SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
 	-> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-gentoo-${PV}"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/sys-kernel/installkernel/installkernel-14-r1.ebuild b/sys-kernel/installkernel/installkernel-14-r1.ebuild
new file mode 100644
index 000000000000..cb9f31daa48c
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-14-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="https://github.com/projg2/installkernel-gentoo"
+SRC_URI="https://github.com/projg2/installkernel-gentoo/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+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 grub systemd uki ukify"
+
+RDEPEND="
+	>=sys-apps/debianutils-4.9-r1
+	systemd? (
+		|| (
+			sys-apps/systemd[kernel-install(-)]
+			sys-apps/systemd-utils[kernel-install(-)]
+		)
+	)
+"
+
+src_install() {
+	keepdir /etc/kernel/postinst.d
+	keepdir /etc/kernel/preinst.d
+
+	if use dracut; then
+		exeinto /etc/kernel/preinst.d
+		doexe hooks/50-dracut.install
+	fi
+
+	if use grub; then
+		exeinto /etc/kernel/postinst.d
+		doexe hooks/91-grub-mkconfig.install
+	fi
+
+	if use uki; then
+		exeinto /etc/kernel/postinst.d
+		doexe hooks/90-uki-copy.install
+	fi
+
+	if use ukify; then
+		exeinto /etc/kernel/preinst.d
+		doexe hooks/60-ukify.install
+	fi
+
+	if use systemd; then
+		sed -e 's/${SYSTEMD_KERNEL_INSTALL:=0}/${SYSTEMD_KERNEL_INSTALL:=1}/g' -i installkernel ||
+			die "enabling systemd's kernel-install failed"
+	fi
+
+	# set some default config using the flags we have anyway
+	touch "${T}/install.conf" || die
+	if use uki; then
+		echo "layout=uki" >> "${T}/install.conf" || die
+	elif use grub; then
+		echo "layout=grub" >> "${T}/install.conf" || die
+	else
+		echo "layout=bls" >> "${T}/install.conf" || die
+	fi
+
+	if use dracut; then
+		echo "initrd_generator=dracut" >> "${T}/install.conf" || die
+		if ! use ukify; then
+			echo "uki_generator=dracut" >> "${T}/install.conf" || die
+		fi
+	else
+		echo "initrd_generator=none" >> "${T}/install.conf" || die
+	fi
+
+	if use ukify; then
+		echo "uki_generator=ukify" >> "${T}/install.conf" || die
+	else
+		if ! use dracut; then
+			echo "uki_generator=none" >> "${T}/install.conf" || die
+		fi
+	fi
+
+	if [[ -s "${T}/install.conf" ]]; then
+		insinto /etc/kernel
+		doins "${T}/install.conf"
+	fi
+
+	exeinto /usr/lib/kernel/install.d
+	doexe hooks/systemd/*.install
+
+	into /
+	dosbin installkernel
+	doman installkernel.8
+}
diff --git a/sys-kernel/installkernel-gentoo/metadata.xml b/sys-kernel/installkernel/metadata.xml
index 11418da8042d..65393ba6a433 100644
--- a/sys-kernel/installkernel-gentoo/metadata.xml
+++ b/sys-kernel/installkernel/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="dracut">Generate an initrd or UKI on each kernel installation</flag>
 		<flag name="grub">Re-generate grub.cfg on each kernel installation</flag>
+		<flag name="systemd">Use systemd's kernel-install to install kernels'</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>