commit:     91941778110d7aa5181f1ca2af17bfa25b7c645b
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 19 10:56:56 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jan 19 10:57:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91941778

sys-kernel/installkernel: drop 16

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

 sys-kernel/installkernel/Manifest                |   1 -
 sys-kernel/installkernel/installkernel-16.ebuild | 114 -----------------------
 2 files changed, 115 deletions(-)

diff --git a/sys-kernel/installkernel/Manifest 
b/sys-kernel/installkernel/Manifest
index 8c7e4cb07a09..1e354b8e2f95 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,4 +1,3 @@
 DIST installkernel-12.tar.gz 4385 BLAKE2B 
2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a
 SHA512 
b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
 DIST installkernel-15.tar.gz 5485 BLAKE2B 
c80aaf96c74eed23f13f2825839daeb9d44d1f721b35270ed4dd587858a9b43edaa958965a97b6381f58c24d137094c4b80f880b4e114dff621bdc6dc51f47d6
 SHA512 
352478323d76ec9b74e4ff1a42555a65292e9a262907dc3dfe08ee0c8613fa1d9618d2f3c1de9ab02551be67fc107d8c0212e462e46b6d6ce065c2f1628067f0
-DIST installkernel-16.tar.gz 6773 BLAKE2B 
c54682159d60b7de7283ad6dda209155b7a6338f524164d8a6aee13e12d724678a027a57dd27a7023e78ed1ed263aa0ced60e5349afb3b319339b4396805c655
 SHA512 
f751ecd164ba955c89660ca46b632325bb8cf2364204629ca87c9d89a08a55d1f8b920261d5ea5a2ef93a25d206ad097f98812a2c6a89060ccd6d127a8ec1515
 DIST installkernel-17.tar.gz 7109 BLAKE2B 
1b9ac1528262a842d306b5061207316d088b78702a2045d5f49de08d9111ecf6306ac6c45262ae0eca3565aba4f20098b3678090510af808192cb310b53af216
 SHA512 
f80c3d9141e3c6a41e55204eff7df8d8e2c42e6cca0e86db6d0036da1d2a23b4b69add8cb3abb8577459f7b46211d65a5cf4d7f9349f4a3a85d4f6e0a1215f03

diff --git a/sys-kernel/installkernel/installkernel-16.ebuild 
b/sys-kernel/installkernel/installkernel-16.ebuild
deleted file mode 100644
index 0f0f4cb9259d..000000000000
--- a/sys-kernel/installkernel/installkernel-16.ebuild
+++ /dev/null
@@ -1,114 +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";
-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 module-rebuild 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 module-rebuild && doexe 
hooks/30-emerge-kernel-module-rebuild.install
-       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 module-rebuild && doexe 
hooks/systemd/30-emerge-kernel-module-rebuild.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";
-}

Reply via email to