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

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     833a37f1917ee124d6bdbb644e262098a8769321
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 08:42:08 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 08:42:08 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=833a37f1

sys-kernel/installkernel: drop 18-r1

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-kernel/installkernel/Manifest                  |   1 -
 .../installkernel/installkernel-18-r1.ebuild       | 115 ---------------------
 2 files changed, 116 deletions(-)

diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 4d1f4b247633..6da69eaadfb6 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,3 +1,2 @@
 DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
-DIST installkernel-18.tar.gz 7223 BLAKE2B b813cbab818674abde969378d66ccdf05ff296b32232c11c85f84292b6f7ab91f846d66cc2a34d8912fa731d70d6b8b87339eb75cbef9dd2672e58a1be310d40 SHA512 3afe20ee58cea986d2b8e8e2621d6b6c76a883b41105521f69822107b3fce11700839d0fefeea1ea1e8b2ad69df18ef4219e4db606bda2349e6eab0924625686
 DIST installkernel-19.tar.gz 13966 BLAKE2B cee0ab63ababae533ad51e6bfe217e65cf8e01213e51f79738cf34a09cb4f12a89cbc63480e1e85f29396a51408ca4bcebaeec6759993e7d800b35f84c6087e2 SHA512 a004727a7e54efc7a5925410005255cf963c81b839e872576f70f739e26c265fa8baa4e08895fbbc3d2c1a56742cfcbb8cdf971169ddf69e8a6f70a11acbe9b0

diff --git a/sys-kernel/installkernel/installkernel-18-r1.ebuild b/sys-kernel/installkernel/installkernel-18-r1.ebuild
deleted file mode 100644
index 3b9e7deb08d9..000000000000
--- a/sys-kernel/installkernel/installkernel-18-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 grub systemd uki ukify"
-
-RDEPEND="
-	!<=sys-kernel/installkernel-systemd-3
-	>=sys-apps/debianutils-4.9-r1
-	dracut? ( >=sys-kernel/dracut-060_pre20240104 )
-	grub? ( sys-boot/grub )
-	systemd? (
-		|| (
-			sys-apps/systemd[kernel-install(-)]
-			sys-apps/systemd-utils[kernel-install(-)]
-		)
-	)
-	ukify? (
-		|| (
-			sys-apps/systemd[ukify(-)]
-			sys-apps/systemd-utils[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
-
-src_install() {
-	keepdir /etc/kernel/postinst.d
-	keepdir /etc/kernel/preinst.d
-
-	exeinto /etc/kernel/preinst.d
-	use dracut && doexe hooks/50-dracut.install
-	use ukify && doexe hooks/60-ukify.install
-
-	exeinto /etc/kernel/postinst.d
-	use uki && doexe hooks/90-uki-copy.install
-	use grub && doexe hooks/91-grub-mkconfig.install
-
-	exeinto /usr/lib/kernel/install.d
-	doexe hooks/systemd/00-00machineid-directory.install
-	doexe hooks/systemd/10-copy-prebuilt.install
-	use grub && doexe hooks/systemd/91-grub-mkconfig.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 grub; then
-		echo "layout=grub" >> "${T}/install.conf" || die
-	else
-		echo "layout=bls" >> "${T}/install.conf" || die
-	fi
-
-	if use dracut; then
-		echo "initrd_generator=dracut" >> "${T}/install.conf" || die
-		if ! use ukify; then
-			echo "uki_generator=dracut" >> "${T}/install.conf" || die
-		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
-}
-
-pkg_postinst() {
-	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"
-}