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 E35E91581C1 for ; Wed, 3 Jul 2024 12:13:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 029F22BC028; Wed, 3 Jul 2024 12:13:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D75B22BC028 for ; Wed, 3 Jul 2024 12:13:46 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C7F72342FA3 for ; Wed, 3 Jul 2024 12:13:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E25E1DBC for ; Wed, 3 Jul 2024 12:13:44 +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: <1720008810.d5a3fa1a5b04e14ee5802d9caa011ccb254267be.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-38.ebuild X-VCS-Directories: sys-kernel/installkernel/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: d5a3fa1a5b04e14ee5802d9caa011ccb254267be X-VCS-Branch: master Date: Wed, 3 Jul 2024 12:13:44 +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: 07949afc-fb99-4cf1-a66c-7a8dc1fbf5ce X-Archives-Hash: bef2f7520ae7f949e6f5f2d7b7a79e6a commit: d5a3fa1a5b04e14ee5802d9caa011ccb254267be Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed Jul 3 12:13:03 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Wed Jul 3 12:13:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a3fa1a sys-kernel/installkernel: drop 38 Signed-off-by: Andrew Ammerlaan gentoo.org> sys-kernel/installkernel/Manifest | 1 - sys-kernel/installkernel/installkernel-38.ebuild | 186 ----------------------- 2 files changed, 187 deletions(-) diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest index 6dbe36012b99..410f392a2829 100644 --- a/sys-kernel/installkernel/Manifest +++ b/sys-kernel/installkernel/Manifest @@ -1,2 +1 @@ -DIST installkernel-38.tar.gz 20987 BLAKE2B 64937dad646b4736555bd9cdeb575d37fb40764a97ba0429136172b268429d05c4df8317862fb8004538f0a3e6bba953123a30cd89fe67812a6624ff2d57b5c6 SHA512 2f6576bc04be7dd22a3c47460caa7b2da526ad7239cd99766756a03e74299d7d980a3cab2951713d7313af32fa58d1cb95d121617b091cfe9eac18d77c347c39 DIST installkernel-39.tar.gz 21689 BLAKE2B 22c76e735fb9849ff2b2daf44d428568435495251960e0f518ab12167d57c31bba670738fd51c4d564f95adcfcbf60b5324d048a1f6bd7ebf9d1b5258f0371b3 SHA512 5a5d2035fa737ede3aa9e668ac18d1777f77f15a38fb685e3e488cc06ef5da99d55789e8e5770e056025f224ff5a5ec57e75fa08cf6f3ec3a0b9dabdfe6fefaa diff --git a/sys-kernel/installkernel/installkernel-38.ebuild b/sys-kernel/installkernel/installkernel-38.ebuild deleted file mode 100644 index 60f6910aa12c..000000000000 --- a/sys-kernel/installkernel/installkernel-38.ebuild +++ /dev/null @@ -1,186 +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=" - systemd-boot? ( systemd ) - ukify? ( uki ) - ?? ( efistub grub refind systemd-boot ) -" - -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 -}