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

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

commit:     3b0704586288958c44056d2da3fd9be9c3d733ea
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 12:46:51 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb  2 06:15:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b070458

sys-kernel/installkernel: add 23

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-kernel/installkernel/Manifest                |   1 +
 sys-kernel/installkernel/installkernel-23.ebuild | 147 +++++++++++++++++++++++
 sys-kernel/installkernel/metadata.xml            |   3 +-
 3 files changed, 150 insertions(+), 1 deletion(-)

diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 6da69eaadfb6..33cec081f9f9 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,2 +1,3 @@
 DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
 DIST installkernel-19.tar.gz 13966 BLAKE2B cee0ab63ababae533ad51e6bfe217e65cf8e01213e51f79738cf34a09cb4f12a89cbc63480e1e85f29396a51408ca4bcebaeec6759993e7d800b35f84c6087e2 SHA512 a004727a7e54efc7a5925410005255cf963c81b839e872576f70f739e26c265fa8baa4e08895fbbc3d2c1a56742cfcbb8cdf971169ddf69e8a6f70a11acbe9b0
+DIST installkernel-23.tar.gz 14290 BLAKE2B 4384277d07ce0328c7f72c33dc3e08424b356a462609ad543c6ee556d6f7688ac8d819524067e6cf0fe5b3dc9d374f55395dfdb2a356e9e218b40650c74b06ef SHA512 508d95dadc34e813f3d05389ebfeaf78b921480b1e400ae7d9cb724307551acf4b9c6f2ca8d1f714b973295aaa3a5db5512859a480dac507665e883b582a4963

diff --git a/sys-kernel/installkernel/installkernel-23.ebuild b/sys-kernel/installkernel/installkernel-23.ebuild
new file mode 100644
index 000000000000..333ea4b45568
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-23.ebuild
@@ -0,0 +1,147 @@
+# 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
+	https://wiki.gentoo.org/wiki/Installkernel
+"
+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 systemd-boot uki ukify"
+REQUIRED_USE="systemd-boot? ( systemd )"
+
+RDEPEND="
+	!<=sys-kernel/installkernel-systemd-3
+	dracut? ( >=sys-kernel/dracut-060_pre20240104 )
+	grub? ( sys-boot/grub )
+	systemd? (
+		|| (
+			sys-apps/systemd[kernel-install(-)]
+			sys-apps/systemd-utils[kernel-install(-)]
+		)
+	)
+	systemd-boot? (
+		|| (
+			sys-apps/systemd[boot(-)]
+			sys-apps/systemd-utils[boot(-)]
+		)
+	)
+	ukify? (
+		|| (
+			sys-apps/systemd[ukify(-)]
+			sys-apps/systemd-utils[ukify(-)]
+		)
+	)
+	!=sys-apps/systemd-255.2-r1
+	!=sys-apps/systemd-255.2-r0
+	!~sys-apps/systemd-255.1
+	!~sys-apps/systemd-255.0
+	!=sys-apps/systemd-254.8-r0
+	!=sys-apps/systemd-254.7-r0
+	!~sys-apps/systemd-254.6
+	!<=sys-apps/systemd-254.5-r1
+" # Block against systemd that still installs dummy install.conf
+
+src_install() {
+	keepdir /etc/kernel/postinst.d
+	keepdir /etc/kernel/preinst.d
+
+	exeinto /etc/kernel/preinst.d
+	use dracut && doexe hooks/50-dracut.install
+	use ukify && doexe hooks/60-ukify.install
+
+	exeinto /etc/kernel/postinst.d
+	use uki && doexe hooks/90-uki-copy.install
+	use grub && doexe hooks/91-grub-mkconfig.install
+
+	exeinto /usr/lib/kernel/install.d
+	doexe hooks/systemd/00-00machineid-directory.install
+	doexe hooks/systemd/10-copy-prebuilt.install
+	doexe hooks/systemd/90-compat.install
+	doexe hooks/systemd/91-grub-mkconfig.install
+
+	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
+	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 systemd-boot; then
+		echo "layout=bls" >> "${T}/install.conf" || die
+	elif use grub; then
+		echo "layout=grub" >> "${T}/install.conf" || die
+	else
+		echo "layout=compat" >> "${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
+
+	insinto /usr/lib/kernel
+	doins "${T}/install.conf"
+
+	into /
+	dosbin installkernel
+	doman installkernel.8
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	# show only when upgrading to 14+
+	if [[ -n "${REPLACING_VERSIONS}" ]] && ver_test "${REPLACING_VERSIONS}" -lt 14; then
+		elog "Version 14 and up of ${PN} effectively merges"
+		elog "${PN}-gentoo and ${PN}-systemd."
+		elog "Switching between the traditional installkernel and systemd's"
+		elog "kernel-install is controlled with the systemd USE flag or the"
+		elog "SYSTEMD_KERNEL_INSTALL environment variable."
+		elog
+		elog "See the installkernel wiki page[1] for more details."
+		elog
+		elog "[1]: https://wiki.gentoo.org/wiki/Installkernel"
+		elog
+	fi
+
+	# show only on first install of version 20+
+	if [[ -z "${REPLACING_VERSIONS}" ]] || ver_test "${REPLACING_VERSIONS}" -lt 20; then
+		if has_version "sys-boot/grub" && ! use grub; then
+			elog "sys-boot/grub is installed but the grub USE flag is not enabled."
+			elog "Users may want to enable this flag to automatically update the"
+			elog "bootloader configuration on each kernel install."
+		fi
+		if ( has_version "sys-apps/systemd[boot]" ||
+			has_version "sys-apps/systemd-utils[boot]" ) &&
+			! use systemd-boot; then
+				elog "systemd-boot is installed but the systemd-boot USE flag"
+				elog "is not enabled. Users should enable this flag to install kernels"
+				elog "in a layout that systemd-boot understands and to automatically"
+				elog "update systemd-boot's configuration on each kernel install."
+		fi
+	fi
+}

diff --git a/sys-kernel/installkernel/metadata.xml b/sys-kernel/installkernel/metadata.xml
index 65393ba6a433..6fffd1cc0b32 100644
--- a/sys-kernel/installkernel/metadata.xml
+++ b/sys-kernel/installkernel/metadata.xml
@@ -8,7 +8,8 @@
 	<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="systemd">Use systemd's kernel-install to install kernels</flag>
+		<flag name="systemd-boot">Use systemd-boot's native layout by default</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>