From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 296DE159C9B for ; Mon, 5 Aug 2024 14:28:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BFA22BC08D; Mon, 5 Aug 2024 14:28:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39EEC2BC089 for ; Mon, 5 Aug 2024 14:28:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A92D341214 for ; Mon, 5 Aug 2024 14:28:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C1871E86 for ; Mon, 5 Aug 2024 14:28:19 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1722868078.b01bf093d3458b7436697f3aa06d431720397af1.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/installkernel/Manifest sys-kernel/installkernel/installkernel-47.ebuild X-VCS-Directories: sys-kernel/installkernel/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: b01bf093d3458b7436697f3aa06d431720397af1 X-VCS-Branch: master Date: Mon, 5 Aug 2024 14:28:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f6dc0d4d-c474-4794-bdc4-ce95acf4751b X-Archives-Hash: 70ac7d9c26a5d5ed42d205508b2d925d commit: b01bf093d3458b7436697f3aa06d431720397af1 Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon Aug 5 14:27:58 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon Aug 5 14:27:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b01bf093 sys-kernel/installkernel: drop 47 Signed-off-by: Andrew Ammerlaan gentoo.org> sys-kernel/installkernel/Manifest | 1 - sys-kernel/installkernel/installkernel-47.ebuild | 238 ----------------------- 2 files changed, 239 deletions(-) diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest index 010f5a85e62d..93867b4676d1 100644 --- a/sys-kernel/installkernel/Manifest +++ b/sys-kernel/installkernel/Manifest @@ -1,3 +1,2 @@ DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa -DIST installkernel-47.tar.gz 25073 BLAKE2B 92c60c4bd9691f046821a65fc1f3216b1c6c65ed96fad9f917fa44cd58f11fddb99f8254209aa00dfa11719812e605225a8675cc0204cd53851b5b21c49065a6 SHA512 1ed109d2ae8d1b5c2018bc78e43ab0f516305a3ec6ee666ee38ed6d0603ca426eebd01b36804728d0b91c8772fa35483f2971a11d09e9b454763a7f238136774 DIST installkernel-48.tar.gz 25079 BLAKE2B 73bf66071dc7dd76afd1ee42d4c3528430f2b00e38c94ff274d6af78c302243fe33959b721c29435819feeed56d94fb1d6f9381b92d8718acee1d9934cfbf5b8 SHA512 302ec0657564dfe3f8d02f564f39a1d7203dcb81d9dd748d3b0b30b0c73b8e9d94758f53076d7b685f57f2a3beeec1a75ad5f807b91200a2f0a2de5510191cb1 diff --git a/sys-kernel/installkernel/installkernel-47.ebuild b/sys-kernel/installkernel/installkernel-47.ebuild deleted file mode 100644 index 5a8924a19afa..000000000000 --- a/sys-kernel/installkernel/installkernel-47.ebuild +++ /dev/null @@ -1,238 +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 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 - - 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 -}