[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Nowa Ammerlaan" <nowa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/
Date: Sat, 16 Aug 2025 19:22:46 +0000 (UTC)	[thread overview]
Message-ID: <1755372087.4fe3ff393d0c26ff16b8b35c49c72c10cec93d67.nowa@gentoo> (raw)

commit:     4fe3ff393d0c26ff16b8b35c49c72c10cec93d67
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 16 19:07:59 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 16 19:21:27 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe3ff39

sys-kernel/installkernel: drop 61

Closes: https://bugs.gentoo.org/961529
Closes: https://bugs.gentoo.org/961525
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 sys-kernel/installkernel/Manifest                |   1 -
 sys-kernel/installkernel/installkernel-61.ebuild | 237 -----------------------
 2 files changed, 238 deletions(-)

diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index c537ab08a859..24e1c1e4baf9 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,4 +1,3 @@
 DIST installkernel-50.tar.gz 25265 BLAKE2B 12fe64bc584d7ead4a24a7d81b83c69fb0aad21fb0f88195e5608519ade5dbf9e6009b6b6d0f81190b96cf170b6b5e7f220522bded20d99fa95b3fe65e8476a6 SHA512 fb780d7e0c724e93c2c0a0f43fc17a95862a55733ad76df43daab3ce09f4d06e2c357a0bac0decd821c9c36dbda846cf89f8cc60d721f0cb32b39f336da2c72c
 DIST installkernel-60.tar.gz 30032 BLAKE2B f1c268a26a233b94e0ce199895de09b0fb4ec72bbf80c9f7e17e7622bc987679e88ef0b45e3cd453d0fbe5f65229bca6bc082fb97636797631769da9202ebae9 SHA512 e73b23dc61682ef9db4535342a70fb7329e8bc6f6201797e0f55e5e63d70ec36659685bc0e871c2eb5f9d9e536aa963942758501835d4c1613ade8d6868eb10d
-DIST installkernel-61.tar.gz 30454 BLAKE2B 066ab8b5a7daf625f73770b1e546cdac495edd56d8b33059bd3b5fcd68f9000b24ed2865b1695e27d432d0b8adf2770794bd016da570ed5eae86083efa17dbf5 SHA512 ded074cd4a5f21f4bcf1e83e559488a9bff2b3226e59d49cbba3dc1f4c760a62cc4eeca1610c86e4f1e41b998cb62ccb696bc4323ec31c8e5e5409e301886d2e
 DIST installkernel-62.tar.gz 30446 BLAKE2B 8f123e64b9abe75a02ec1129d03724957e02b687266b0d66413984411127014dca54380ba292702f022b7aea7f229190a7b4cf0ce352421b6197a893f581d75d SHA512 8626425f313dbfc062833c38af7f7df6aa97d866da98f3b6e4a540b77a118726a6311c6570ea8b5ae025745f5481c01ddfb9fc5fc472d2f2ed3fa68da2e8604a

diff --git a/sys-kernel/installkernel/installkernel-61.ebuild b/sys-kernel/installkernel/installkernel-61.ebuild
deleted file mode 100644
index 5c10fbfc01af..000000000000
--- a/sys-kernel/installkernel/installkernel-61.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 2019-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit eapi9-ver 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="
-	systemd-boot? ( systemd )
-	ukify? ( uki )
-	?? ( dracut ugrd )
-"
-# 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-108
-		uki? (
-			|| (
-				sys-apps/systemd[boot(-)]
-				sys-apps/systemd-utils[boot(-)]
-			)
-		)
-	)
-	efistub? (
-		systemd? ( >=app-emulation/virt-firmware-24.7 )
-		!systemd? ( sys-boot/uefi-mkconfig )
-	)
-	grub? ( sys-boot/grub )
-	refind? ( sys-boot/refind )
-	systemd? (
-		|| (
-			>=sys-apps/systemd-255[kernel-install(-)]
-			>=sys-apps/systemd-utils-255[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-1.31.2 )
-	!=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/52-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 dracut && doexe hooks/systemd/52-dracut.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 grub && use uki; then
-		exeinto /etc/grub.d
-		doexe grub/05_uki
-	fi
-
-	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 ver_replacing -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_replacing -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
-}

next             reply	other threads:[~2025-08-16 19:22 UTC|newest]

Thread overview: 105+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-16 19:22 Nowa Ammerlaan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-16 19:46 [gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/ Nowa Ammerlaan
2025-08-18 17:37 Nowa Ammerlaan
2025-08-16 19:22 Nowa Ammerlaan
2025-08-04 18:41 Nowa Ammerlaan
2025-08-04 18:41 Nowa Ammerlaan
2025-07-04  6:39 Nowa Ammerlaan
2025-07-04  6:39 Nowa Ammerlaan
2025-05-14 13:07 Nowa Ammerlaan
2025-05-14 13:07 Nowa Ammerlaan
2025-05-04 14:39 Nowa Ammerlaan
2025-05-04 14:39 Nowa Ammerlaan
2025-04-18 13:14 Nowa Ammerlaan
2025-03-01 19:30 Nowa Ammerlaan
2025-02-28 18:05 Nowa Ammerlaan
2025-02-22 20:19 Nowa Ammerlaan
2025-02-22 20:19 Nowa Ammerlaan
2025-02-20 10:56 Nowa Ammerlaan
2025-02-19 17:04 Nowa Ammerlaan
2025-02-19 17:04 Nowa Ammerlaan
2025-02-04 19:31 Nowa Ammerlaan
2025-02-03 17:40 Nowa Ammerlaan
2025-01-30 11:35 Nowa Ammerlaan
2025-01-30 11:35 Nowa Ammerlaan
2024-12-30 10:19 Nowa Ammerlaan
2024-12-29 18:51 Nowa Ammerlaan
2024-12-29 17:33 Nowa Ammerlaan
2024-10-24 14:54 Andrew Ammerlaan
2024-09-05  7:46 Andrew Ammerlaan
2024-09-05  7:46 Andrew Ammerlaan
2024-08-05 14:58 Andrew Ammerlaan
2024-08-05 14:28 Andrew Ammerlaan
2024-08-05 14:28 Andrew Ammerlaan
2024-08-03 15:59 Andrew Ammerlaan
2024-08-03 15:59 Andrew Ammerlaan
2024-08-03  9:21 Andrew Ammerlaan
2024-08-03  9:21 Andrew Ammerlaan
2024-08-03  7:37 Andrew Ammerlaan
2024-08-03  7:37 Andrew Ammerlaan
2024-07-31  7:21 Andrew Ammerlaan
2024-07-31  7:21 Andrew Ammerlaan
2024-07-30 18:25 Andrew Ammerlaan
2024-07-30 18:24 Andrew Ammerlaan
2024-07-30 17:55 Andrew Ammerlaan
2024-07-26 20:36 Andrew Ammerlaan
2024-07-25 12:16 Andrew Ammerlaan
2024-07-15 19:18 Andrew Ammerlaan
2024-07-03 12:13 Andrew Ammerlaan
2024-07-03 12:13 Andrew Ammerlaan
2024-07-03 12:13 Andrew Ammerlaan
2024-06-07 12:48 Andrew Ammerlaan
2024-06-07 12:48 Andrew Ammerlaan
2024-06-03 17:59 Andrew Ammerlaan
2024-05-07 15:57 Andrew Ammerlaan
2024-05-07 15:57 Andrew Ammerlaan
2024-04-24 10:13 Andrew Ammerlaan
2024-04-24 10:13 Andrew Ammerlaan
2024-04-13 15:19 Andrew Ammerlaan
2024-04-13 15:19 Andrew Ammerlaan
2024-04-12 10:39 Andrew Ammerlaan
2024-04-09 16:16 Andrew Ammerlaan
2024-04-09  9:59 Andrew Ammerlaan
2024-04-09  9:59 Andrew Ammerlaan
2024-03-22 21:40 Andrew Ammerlaan
2024-03-22 21:40 Andrew Ammerlaan
2024-03-20 18:30 Andrew Ammerlaan
2024-03-20 18:30 Andrew Ammerlaan
2024-03-19 15:47 Andrew Ammerlaan
2024-03-19 15:47 Andrew Ammerlaan
2024-03-08 16:06 Andrew Ammerlaan
2024-03-08 16:06 Andrew Ammerlaan
2024-02-24  6:28 Andrew Ammerlaan
2024-02-24  2:44 Ionen Wolkens
2024-02-23 14:59 Andrew Ammerlaan
2024-02-23 14:59 Andrew Ammerlaan
2024-02-23 13:02 Andrew Ammerlaan
2024-02-22 13:08 Andrew Ammerlaan
2024-02-09 12:51 Andrew Ammerlaan
2024-02-02 13:11 Andrew Ammerlaan
2024-02-02 13:11 Andrew Ammerlaan
2024-02-02  6:28 Andrew Ammerlaan
2024-02-02  6:28 Andrew Ammerlaan
2024-01-29  8:48 Andrew Ammerlaan
2024-01-29  8:48 Andrew Ammerlaan
2024-01-27 21:08 Andrew Ammerlaan
2024-01-25 12:03 Andrew Ammerlaan
2024-01-25  1:37 Sam James
2024-01-24 14:44 Andrew Ammerlaan
2024-01-24 14:39 Andrew Ammerlaan
2024-01-24 14:35 Andrew Ammerlaan
2024-01-24 13:37 Sam James
2024-01-24 10:59 Sam James
2024-01-24 10:58 Sam James
2024-01-24 10:58 Sam James
2024-01-24 10:58 Sam James
2024-01-19 21:33 Andrew Ammerlaan
2024-01-19 10:57 Andrew Ammerlaan
2024-01-19 10:57 Andrew Ammerlaan
2024-01-18 10:22 Andrew Ammerlaan
2024-01-17 20:52 Andrew Ammerlaan
2024-01-13 14:56 Andrew Ammerlaan
2024-01-13  7:45 Andrew Ammerlaan
2024-01-13  7:45 Andrew Ammerlaan
2024-01-13  6:49 Andrew Ammerlaan
2024-01-12 11:45 Andrew Ammerlaan

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:c537ab08a85 dfblob:24e1c1e4baf dfblob:5c10fbfc01a )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1755372087.4fe3ff393d0c26ff16b8b35c49c72c10cec93d67.nowa@gentoo \
    --to=nowa@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox