From b6fa31c964a602f8461a77d5b83355e8750c12eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 16 Jul 2024 12:27:58 +0100 Subject: gentoo auto-resync : 16:07:2024 - 12:27:58 --- sys-kernel/installkernel/Manifest | 4 +- .../installkernel/installkernel-39-r1.ebuild | 204 -------------------- .../installkernel/installkernel-39-r2.ebuild | 208 +++++++++++++++++++++ sys-kernel/installkernel/metadata.xml | 3 +- 4 files changed, 212 insertions(+), 207 deletions(-) delete mode 100644 sys-kernel/installkernel/installkernel-39-r1.ebuild create mode 100644 sys-kernel/installkernel/installkernel-39-r2.ebuild (limited to 'sys-kernel/installkernel') diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest index 0d23a8d628a0..bde6c49b4897 100644 --- a/sys-kernel/installkernel/Manifest +++ b/sys-kernel/installkernel/Manifest @@ -1,3 +1,3 @@ DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa -EBUILD installkernel-39-r1.ebuild 6475 BLAKE2B e1261d4613c563f621681ca99de1a3f4ffdf95f4fc42ed105241e4ec31d4b037e1ea151c64597be82ef03db94671583a3ca9458e456a169289f570ed22bc10af SHA512 1748b2a2f824ca6fe996e99eaa177b66b152375932d00c26d90f53a1b71e1bfc70ae98ebf47076fde1ce8f87dd3c1b3d9b9f35dc4d873c737b697073b121d4ba -MISC metadata.xml 1288 BLAKE2B a80d5022072c362c1787723b7222638f01993675f5c3bbc87962d998497dcd1673664ef4802cb8b3bce7ad81825521be1747c00f6ef5f5e1c9e2d976b09c8d85 SHA512 d51a5b1c5977049a9a499c2f7edcd95ea5e2b47c4fb49fa76d3df9839b2ad7652bbfff41fae823da3b86a52f2b9cb120759a15e5e9967e7b1148ea3bc92ed793 +EBUILD installkernel-39-r2.ebuild 6609 BLAKE2B 3771de41d1b828f04606742669e2bc7b811526bb12edcf4757fb3111b469b72a538b3593045684c3cbefa7c4c9201630b7fe52cb0a0068c7018d282f587fcde8 SHA512 b53e9b3c7625cdce03490c57f38a7d62a78e253f732e57a2ec7249b2b40a0f268ba17dca33d36d385dae8aca4f07076fb449c4f60b28d3a157cd68686da336f5 +MISC metadata.xml 1379 BLAKE2B c141302cfe1dddf7d11d68cafdf97437f037caab171b1c1b071cc366b6a98acb5940c1ab73bcc49bf97fe9c852ad28c8923fbf00f0a51f2a02174a5d542f9edf SHA512 f5a20936b0b569fd2a8eadb76eeb8d7ec8c905b0e15ae285c351d82bef0c001e64d47a19774a6b958b845a20adc3df5e7cc583649dfcf9ef7c684132498e8bf8 diff --git a/sys-kernel/installkernel/installkernel-39-r1.ebuild b/sys-kernel/installkernel/installkernel-39-r1.ebuild deleted file mode 100644 index 719dc80ce7be..000000000000 --- a/sys-kernel/installkernel/installkernel-39-r1.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# 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 grub systemd-boot ) - refind? ( !systemd-boot !grub ) - systemd-boot? ( systemd ) - ukify? ( uki ) -" -# Only select one flag that sets "layout=", except for uki since grub, -# systemd-boot, and efistub booting are all compatible with UKIs and -# the uki layout. -# -# Refind does not set a layout=, it is compatible with the compat, uki -# and efistub layout. So block against only grub and systemd-boot. -# -# systemd-boot could be made to work without the systemd flag, but this -# makes no sense since in systemd(-utils) the boot flag already -# requires the kernel-install flag. -# -# Ukify hooks do nothing if the layout is not uki, so force this here. -# -# Only one initramfs generator flag can be selected. Note that while -# both dracut and ukify are UKI generators we don't block those because -# enabling both results in building an initramfs only with dracut and -# building an UKI with ukify, which is a valid configuration. - -RDEPEND=" - !<=sys-kernel/installkernel-systemd-3 - dracut? ( - >=sys-kernel/dracut-060_pre20240104-r4 - uki? ( - || ( - sys-apps/systemd[boot(-)] - sys-apps/systemd-utils[boot(-)] - ) - ) - ) - efistub? ( - systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 ) - !systemd? ( sys-boot/uefi-mkconfig ) - ) - 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 grub && doexe hooks/91-grub-mkconfig.install - use efistub && doexe hooks/95-efistub-uefi-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 grub && doexe hooks/systemd/91-grub-mkconfig.install - use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.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; 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/installkernel-39-r2.ebuild b/sys-kernel/installkernel/installkernel-39-r2.ebuild new file mode 100644 index 000000000000..2b11a30d57c5 --- /dev/null +++ b/sys-kernel/installkernel/installkernel-39-r2.ebuild @@ -0,0 +1,208 @@ +# 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 ugrd uki ukify" +REQUIRED_USE=" + ?? ( efistub grub systemd-boot ) + refind? ( !systemd-boot !grub ) + systemd-boot? ( systemd ) + ukify? ( uki ) + ?? ( dracut ugrd ) +" +# Only select one flag that sets "layout=", except for uki since grub, +# systemd-boot, and efistub booting are all compatible with UKIs and +# the uki layout. +# +# Refind does not set a layout=, it is compatible with the compat, uki +# and efistub layout. So block against only grub and systemd-boot. +# +# systemd-boot could be made to work without the systemd flag, but this +# makes no sense since in systemd(-utils) the boot flag already +# requires the kernel-install flag. +# +# Ukify hooks do nothing if the layout is not uki, so force this here. +# +# Only one initramfs generator flag can be selected. Note that while +# both dracut and ukify are UKI generators we don't block those because +# enabling both results in building an initramfs only with dracut and +# building an UKI with ukify, which is a valid configuration. + +RDEPEND=" + !<=sys-kernel/installkernel-systemd-3 + dracut? ( + >=sys-kernel/dracut-060_pre20240104-r4 + uki? ( + || ( + sys-apps/systemd[boot(-)] + sys-apps/systemd-utils[boot(-)] + ) + ) + ) + efistub? ( + systemd? ( >=app-emulation/virt-firmware-24.2_p20240315-r2 ) + !systemd? ( sys-boot/uefi-mkconfig ) + ) + 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(-)] + ) + ) + ugrd? ( sys-kernel/ugrd ) + !=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 grub && doexe hooks/91-grub-mkconfig.install + use efistub && doexe hooks/95-efistub-uefi-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 grub && doexe hooks/systemd/91-grub-mkconfig.install + use efistub && doexe hooks/systemd/95-efistub-kernel-bootcfg.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 + elif use ugrd; then + echo "initrd_generator=ugrd" >> "${T}/install.conf" || die + 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; 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 ba5cbd9d6764..70634cd58829 100644 --- a/sys-kernel/installkernel/metadata.xml +++ b/sys-kernel/installkernel/metadata.xml @@ -6,12 +6,13 @@ Distribution Kernel Project - Generate an initrd or UKI on each kernel installation + Generate an initramfs or UKI on each kernel installation EXPERIMENTAL: Update UEFI configuration on each kernel installation Re-generate grub.cfg on each kernel installation, used grub.cfg is overridable with GRUB_CFG env var Install a Gentoo icon for rEFInd alongside the (unified) kernel image, used icon is overridable with REFIND_ICON env var Use systemd's kernel-install to install kernels, overridable with SYSTEMD_KERNEL_INSTALL env var Use systemd-boot's native layout by default + Generate an initramfs using UGRD on each kernel installation 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