commit: a06be6d1239b91b59e36a81dbbf54232db49d767 Author: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org> AuthorDate: Thu Jan 30 11:34:49 2025 +0000 Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org> CommitDate: Thu Jan 30 11:34:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a06be6d1
sys-kernel/installkernel: drop 48-r1, 49 Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org> sys-kernel/installkernel/Manifest | 2 - .../installkernel/installkernel-48-r1.ebuild | 239 -------------------- sys-kernel/installkernel/installkernel-49.ebuild | 240 --------------------- 3 files changed, 481 deletions(-) diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest index 16b31cab1f19..165de170a0b4 100644 --- a/sys-kernel/installkernel/Manifest +++ b/sys-kernel/installkernel/Manifest @@ -1,3 +1 @@ -DIST installkernel-48.tar.gz 25079 BLAKE2B 73bf66071dc7dd76afd1ee42d4c3528430f2b00e38c94ff274d6af78c302243fe33959b721c29435819feeed56d94fb1d6f9381b92d8718acee1d9934cfbf5b8 SHA512 302ec0657564dfe3f8d02f564f39a1d7203dcb81d9dd748d3b0b30b0c73b8e9d94758f53076d7b685f57f2a3beeec1a75ad5f807b91200a2f0a2de5510191cb1 -DIST installkernel-49.tar.gz 25238 BLAKE2B c2b5f165dc3aaabe24833916d47ac072f10db004ee3d33ee2b2320e30eea908d0ddb143ab3c01fd164c99a59d59a0e3d9d49cb992c4cb942f96be2f58e7e4541 SHA512 6967367499d0ddea4311028b1ccf2d4c28ca57691ff02b515f436710a218c4abd9b9c1ba6e62c718101b62a04e2fe04238c6209769d7f0956d7ffc90248eec1b DIST installkernel-50.tar.gz 25265 BLAKE2B 12fe64bc584d7ead4a24a7d81b83c69fb0aad21fb0f88195e5608519ade5dbf9e6009b6b6d0f81190b96cf170b6b5e7f220522bded20d99fa95b3fe65e8476a6 SHA512 fb780d7e0c724e93c2c0a0f43fc17a95862a55733ad76df43daab3ce09f4d06e2c357a0bac0decd821c9c36dbda846cf89f8cc60d721f0cb32b39f336da2c72c diff --git a/sys-kernel/installkernel/installkernel-48-r1.ebuild b/sys-kernel/installkernel/installkernel-48-r1.ebuild deleted file mode 100644 index 62c21454e7fb..000000000000 --- a/sys-kernel/installkernel/installkernel-48-r1.ebuild +++ /dev/null @@ -1,239 +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 ~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/install.d - keepdir /etc/kernel/preinst.d - keepdir /etc/kernel/postinst.d - keepdir /usr/lib/kernel/install.d - keepdir /usr/lib/kernel/preinst.d - keepdir /usr/lib/kernel/postinst.d - - exeinto /usr/lib/kernel/preinst.d - doexe hooks/99-check-diskspace.install - use dracut && doexe hooks/50-dracut.install - use ukify && doexe hooks/60-ukify.install - - exeinto /usr/lib/kernel/postinst.d - doexe hooks/99-write-log.install - 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/85-check-diskspace.install - doexe hooks/systemd/90-compat.install - doexe hooks/systemd/90-zz-update-static.install - doexe hooks/systemd/99-write-log.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" - - insinto /etc/logrotate.d - newins installkernel.logrotate installkernel - keepdir /var/lib/misc - - 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 - - # Initialize log file if there is none - local log=${ROOT}/var/log/installkernel.log - if [[ ! -f ${log} ]]; then - echo -e \ -"DATE\t"\ -"KI_VENDOR\t"\ -"VERSION\t"\ -"CONF_ROOT\t"\ -"LAYOUT\t"\ -"INITRD_GEN\t"\ -"UKI_GEN\t"\ -"BOOT_ROOT\t"\ -"KERNEL_REL_PATH\t"\ -"INITRD_REL_PATH\t"\ -"PLUGIN_OVERRIDE\t"\ ->> "${log}" || die - fi -} diff --git a/sys-kernel/installkernel/installkernel-49.ebuild b/sys-kernel/installkernel/installkernel-49.ebuild deleted file mode 100644 index fd725cda3fbc..000000000000 --- a/sys-kernel/installkernel/installkernel-49.ebuild +++ /dev/null @@ -1,240 +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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~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/install.d - keepdir /etc/kernel/preinst.d - keepdir /etc/kernel/postinst.d - keepdir /usr/lib/kernel/install.d - keepdir /usr/lib/kernel/preinst.d - keepdir /usr/lib/kernel/postinst.d - - exeinto /usr/lib/kernel/preinst.d - doexe hooks/99-check-diskspace.install - use dracut && doexe hooks/50-dracut.install - use ukify && doexe hooks/60-ukify.install - - exeinto /usr/lib/kernel/postinst.d - doexe hooks/99-write-log.install - 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/85-check-diskspace.install - doexe hooks/systemd/90-compat.install - doexe hooks/systemd/90-zz-update-static.install - doexe hooks/systemd/99-write-log.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" - - insinto /etc/logrotate.d - newins installkernel.logrotate installkernel - keepdir /var/lib/misc - - 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 - - # Initialize log file if there is none - dodir /var/log - local log=${ROOT}/var/log/installkernel.log - if [[ ! -s ${log} ]]; then - echo -e \ -"DATE\t"\ -"KI_VENDOR\t"\ -"VERSION\t"\ -"CONF_ROOT\t"\ -"LAYOUT\t"\ -"INITRD_GEN\t"\ -"UKI_GEN\t"\ -"BOOT_ROOT\t"\ -"KERNEL_REL_PATH\t"\ -"INITRD_REL_PATH\t"\ -"PLUGIN_OVERRIDE\t"\ ->> "${log}" || die - fi -}
