[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     a6b0608e5ed75a68dfb1d5d6a31daa59ad6287c2
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 13:50:06 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 14:54:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b0608e

sys-kernel/installkernel: move install.conf from etc to usr/lib

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/34776
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../{installkernel-15.ebuild => installkernel-15-r1.ebuild}   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sys-kernel/installkernel/installkernel-15.ebuild b/sys-kernel/installkernel/installkernel-15-r1.ebuild
similarity index 88%
rename from sys-kernel/installkernel/installkernel-15.ebuild
rename to sys-kernel/installkernel/installkernel-15-r1.ebuild
index 99a5eec37735..a43ea8488b88 100644
--- a/sys-kernel/installkernel/installkernel-15.ebuild
+++ b/sys-kernel/installkernel/installkernel-15-r1.ebuild
@@ -31,7 +31,11 @@ RDEPEND="
 			sys-apps/systemd-utils[ukify(-)]
 		)
 	)
-"
+	!=sys-apps/systemd-255.2-r1
+	!=sys-apps/systemd-254.8-r0
+	!=sys-apps/systemd-254.7-r0
+	!=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
 
 src_install() {
 	keepdir /etc/kernel/postinst.d
@@ -64,6 +68,7 @@ src_install() {
 
 	# set some default config using the flags we have anyway
 	touch "${T}/install.conf" || die
+	echo "# This file is managed by ${CATEGORY}/${PN}" >> "${T}/install.conf" || die
 	if use uki; then
 		echo "layout=uki" >> "${T}/install.conf" || die
 	elif use grub; then
@@ -89,7 +94,7 @@ src_install() {
 		fi
 	fi
 
-	insinto /etc/kernel
+	insinto /usr/lib/kernel
 	doins "${T}/install.conf"
 
 	exeinto /usr/lib/kernel/install.d
@@ -109,5 +114,5 @@ pkg_postinst() {
 	elog
 	elog "See the installkernel wiki page[1] for more details."
 	elog
-	elog "https://wiki.gentoo.org/wiki/Installkernel"
+	elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
 }