From bdd56b68122666ee19d8e9a755474b696a88fc23 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 12 Jan 2024 12:03:30 +0100 Subject: sys-kernel/installkernel-gentoo: add 14 Changelog: - added grub-mkconfig plugin for systemd's kernel-install - call systemd's kernel-install if it is installed, this can be controlled with the SYSTEMD_KERNEL_INSTALL env var, whose default is set by the ebuild depending on USE=systemd - imported plugins from installkernel-systemd - clarified warning messages when dracut/ukify is not installed - set some default install.conf based on the flags we already have for the "legacy" install anyway. Use /etc/ instead of /usr/lib because systemd already installs a dummy file to /usr/lib and we would have a file conflict with this. Bug: https://bugs.gentoo.org/917145 Signed-off-by: Andrew Ammerlaan --- sys-kernel/installkernel-gentoo/Manifest | 1 + .../installkernel-gentoo-14.ebuild | 85 ++++++++++++++++++++++ sys-kernel/installkernel-gentoo/metadata.xml | 1 + 3 files changed, 87 insertions(+) create mode 100644 sys-kernel/installkernel-gentoo/installkernel-gentoo-14.ebuild diff --git a/sys-kernel/installkernel-gentoo/Manifest b/sys-kernel/installkernel-gentoo/Manifest index 92cd07a0ba25..e74c54c2b028 100644 --- a/sys-kernel/installkernel-gentoo/Manifest +++ b/sys-kernel/installkernel-gentoo/Manifest @@ -1 +1,2 @@ DIST installkernel-gentoo-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2 +DIST installkernel-gentoo-14.tar.gz 5501 BLAKE2B cf7b47483440ec84f8aa17e1c6e585259ff13cf9ff76c89a262799c5143f3f994c0babe5f6ab0abf25f1a359ba3ea39e0027eb2df6c6b2c7a8627dab550f6504 SHA512 f6af5ee009738fa503b575d3464494c8296b3b986ac9b8fab074f38f98159209b4d2ce0cf555890d5bfcfa506ab08d334af97798f695d895863bcb68b3ecea66 diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-14.ebuild b/sys-kernel/installkernel-gentoo/installkernel-gentoo-14.ebuild new file mode 100644 index 000000000000..4be27a583bfa --- /dev/null +++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-14.ebuild @@ -0,0 +1,85 @@ +# 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" + +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 + fi + if use ukify; then + echo "uki_generator=ukify" >> "${T}/install.conf" || die + 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-gentoo/metadata.xml index 11418da8042d..65393ba6a433 100644 --- a/sys-kernel/installkernel-gentoo/metadata.xml +++ b/sys-kernel/installkernel-gentoo/metadata.xml @@ -8,6 +8,7 @@ Generate an initrd or UKI on each kernel installation Re-generate grub.cfg on each kernel installation + Use systemd's kernel-install to install kernels' Install UKIs to ESP/EFI/Linux for EFI stub booting and/or bootloaders with support for auto-discovering UKIs Build an UKI with systemd's ukify on each kernel installation -- cgit v1.2.3-65-gdbad