commit: b9ed549647db434a28353bd972c7451b1b752fec Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Sun Mar 17 18:31:55 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sun Mar 17 18:33:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9ed5496
sys-kernel/installkernel: add 29 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> profiles/arch/amd64/package.use.mask | 4 + profiles/arch/amd64/package.use.stable.mask | 4 + profiles/arch/base/package.use.mask | 4 + sys-kernel/installkernel/Manifest | 1 + sys-kernel/installkernel/installkernel-29.ebuild | 194 +++++++++++++++++++++++ sys-kernel/installkernel/metadata.xml | 1 + 6 files changed, 208 insertions(+) diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index 36a45fb0e33a..ab647373fb87 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Andrew Ammerlaan <andrewammerl...@gentoo.org> (2024-03-17) +# virt-firmware is keyworded here +sys-kernel/installkernel -efistub + # Ionen Wolkens <io...@gentoo.org> (2024-03-08) # media-libs/libdovi is keyworded here media-libs/libplacebo -libdovi diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index 325b6833d7e9..da0b707dd420 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Andrew Ammerlaan <andrewammerl...@gentoo.org> (2024-03-17) +# Experimental, virt-firmware is keyworded only unstable +sys-kernel/installkernel efistub + # Ionen Wolkens <io...@gentoo.org> (2024-03-08) # media-libs/libdovi is not stable here yet media-libs/libplacebo libdovi diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 167339367215..a51be55b952e 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andrew Ammerlaan <andrewammerl...@gentoo.org> (2024-03-17) +# Experimental, only keyworded for amd64 currently +sys-kernel/installkernel efistub + # Ionen Wolkens <io...@gentoo.org> (2024-03-08) # media-libs/libdovi has very few keywords and there is little interest # in adding extras unless requested (also needs rust+cargo-c) diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest index 835db019e6be..7c37de71cbd5 100644 --- a/sys-kernel/installkernel/Manifest +++ b/sys-kernel/installkernel/Manifest @@ -1,2 +1,3 @@ DIST installkernel-25.tar.gz 18441 BLAKE2B 7237cf0bff5c82a55dddd968f612fdeb080496077ff8bf04f71645f7702d45183bdbdc4382e22d25a5697451cfbbc161745402278cb1a96b360935293f38a482 SHA512 c7ad6ef614edb805ba4da81d44190362fbe6ada6e507f6f0b8804d6bfc7bb260f0344db20c6032a2830502b278bae35a842d5c9ff2d85d57dfd01f66a3f5bb38 DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0 +DIST installkernel-29.tar.gz 20796 BLAKE2B 280cc9b3f0906b9fe874411e5911c26c303d53bfa37530c9c3da4d1ab99507014ce240e386db6676e422e646ea3f51cd08fa1ded2b899933de7076085aaa9ab4 SHA512 c72ad5a187edf24eb49924576cb553fcef797e797373d8a0f6f5e599155c35a8418463ba8138479d016f555e9e683146be681f959197533951169cf2aea6be95 diff --git a/sys-kernel/installkernel/installkernel-29.ebuild b/sys-kernel/installkernel/installkernel-29.ebuild new file mode 100644 index 000000000000..9ba8f5cf4c74 --- /dev/null +++ b/sys-kernel/installkernel/installkernel-29.ebuild @@ -0,0 +1,194 @@ +# Copyright 2019-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info + +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 efistub grub refind systemd systemd-boot uki ukify" +REQUIRED_USE=" + efistub? ( systemd ) + systemd-boot? ( systemd ) + ukify? ( uki ) + ?? ( efistub grub refind systemd-boot ) +" +# efistub requires systemd's kernel-install because: +# - We need support for removal to clean-up the created entry +# - We need to know the location of the ESP +# - kernel-bootcfg at some point calls bootctl (to find ESP) + +RDEPEND=" + !<=sys-kernel/installkernel-systemd-3 + dracut? ( + >=sys-kernel/dracut-060_pre20240104-r4 + uki? ( + || ( + sys-apps/systemd[boot(-)] + sys-apps/systemd-utils[boot(-)] + ) + ) + ) + efistub? ( + >=app-emulation/virt-firmware-24.2_p20240315-r2 + || ( + sys-apps/systemd[boot(-)] + sys-apps/systemd-utils[boot(-)] + ) + ) + grub? ( sys-boot/grub ) + refind? ( sys-boot/refind ) + 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[boot(-),ukify(-)] + sys-apps/systemd-utils[boot(-),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 + +pkg_setup() { + use efistub && CONFIG_CHECK="EFI_STUB" linux-info_pkg_setup +} + +src_install() { + keepdir /etc/kernel/postinst.d + keepdir /etc/kernel/preinst.d + + exeinto /usr/lib/kernel/preinst.d + use dracut && doexe hooks/50-dracut.install + use ukify && doexe hooks/60-ukify.install + + exeinto /usr/lib/kernel/postinst.d + use uki && doexe hooks/90-uki-copy.install + use grub && doexe hooks/91-grub-mkconfig.install + use refind && doexe hooks/95-refind-copy-icon.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 + use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.install + use grub && doexe hooks/systemd/91-grub-mkconfig.install + use refind && doexe hooks/systemd/95-refind-copy-icon.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 efistub; then + echo "layout=efistub" >> "${T}/install.conf" || die + elif use grub; then + echo "layout=grub" >> "${T}/install.conf" || die + elif use systemd-boot; then + echo "layout=bls" >> "${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 + if use uki; then + echo "uki_generator=dracut" >> "${T}/install.conf" || die + else + echo "uki_generator=none" >> "${T}/install.conf" || die + fi + 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 + + if use efistub && ! has_version "${CATEGORY}/${PN}[efistub]"; then + ewarn "Automated EFI Stub booting is highly experimental. UEFI implementations" + ewarn "often differ between vendors and as a result EFI stub booting is not" + ewarn "guaranteed to work for all UEFI systems. Ensure an alternative method" + ewarn "of booting the system is available before rebooting." + fi +} diff --git a/sys-kernel/installkernel/metadata.xml b/sys-kernel/installkernel/metadata.xml index e99bb67ffdb8..ba5cbd9d6764 100644 --- a/sys-kernel/installkernel/metadata.xml +++ b/sys-kernel/installkernel/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="dracut">Generate an initrd or UKI on each kernel installation</flag> + <flag name="efistub">EXPERIMENTAL: Update UEFI configuration on each kernel installation</flag> <flag name="grub">Re-generate grub.cfg on each kernel installation, used grub.cfg is overridable with GRUB_CFG env var</flag> <flag name="refind">Install a Gentoo icon for rEFInd alongside the (unified) kernel image, used icon is overridable with REFIND_ICON env var</flag> <flag name="systemd">Use systemd's kernel-install to install kernels, overridable with SYSTEMD_KERNEL_INSTALL env var</flag>
