gentoo auto-resync : 13:04:2024 - 12:04:19

2 files changed, 192 insertions, 0 deletions

diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 4311578dc2c0..f55456fb62c6 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,5 +1,7 @@
 DIST installkernel-28.tar.gz 18922 BLAKE2B 26e7b073cd44896f830a8977efb9730b92d01074084a3cfc934719de87bbf6ec25ea865f8b1cd88613279dbb83bb9ad72eb2c90bc0f6152aa0cc11ca71a9963a SHA512 5a0ed452e131d85628c1cf6ecc2a6bb9fe3c9f20c999c9919b3e238d1aa09a114c6086cf5de8d3ecf63cfa80fd2804092ebb8ad6505b51df2786eb3037bdf3f0
 DIST installkernel-34.tar.gz 20816 BLAKE2B b6ed5ed823b949d2d64eeadc9d725e5b19593f2bf691b9878673eb18998b14b0fc71d9dd6a71461e911aefb376600b911dd354671c0503c683a630f011b451ac SHA512 1165113a0e1f942b9bf333f97432fa43ce72460f7081b34160cfbee283274a4756f1d81fa27448e156b90f8b6fa4506bebdc4224f7bc28568a357b67ce33fa21
+DIST installkernel-35.tar.gz 21084 BLAKE2B b8138904302baafa32725c0f21f505cbe5ecd6381586c55cbb10a728be797eda3c718419c24542cd5c802d3fecc7208219b766fba6057ba66dce2ce1e59ae80b SHA512 532f754c554cf872cb8940d320d22e38160675e4197845d5855282fc71c77af7abf8ee6c755008529f4e1da475dca2d0b40192fb721f90a970f783063f15106b
 EBUILD installkernel-28.ebuild 4902 BLAKE2B b2c7826d18637206cca65638290fdc43aa3ca1b6753005e8acbd6fe99a8c635730b07ab75b6e22cce2829720b2627b96bdbda72a1654ab0c3c3a335f60ee06eb SHA512 5adc536c0baadbcc2e8e17adfaffbd68a94219acf4989b8561b1433c1954fc0ab35457be9194390be9da71fd10ebd68595ff04c92ed30ffee8f9c79f8940ed6d
 EBUILD installkernel-34-r1.ebuild 5857 BLAKE2B f10425f21f7201d71a4c420d6c916fd298312d3d3f5380bee90a4fc4c0900899138e654bd6884e791c0da423fcfefb11c0c378a8f08859dba4bf23212edc8742 SHA512 13f728ede6bf4c6eec8444ee822242973a2ba5b8f77dd3fc2ea0b5a8a24f68b0d1f46ac22b66c86d881e9d9aab84aa8b668834dc5237c0e71ed9137ef5afe7ca
+EBUILD installkernel-35.ebuild 5857 BLAKE2B f10425f21f7201d71a4c420d6c916fd298312d3d3f5380bee90a4fc4c0900899138e654bd6884e791c0da423fcfefb11c0c378a8f08859dba4bf23212edc8742 SHA512 13f728ede6bf4c6eec8444ee822242973a2ba5b8f77dd3fc2ea0b5a8a24f68b0d1f46ac22b66c86d881e9d9aab84aa8b668834dc5237c0e71ed9137ef5afe7ca
 MISC metadata.xml 1288 BLAKE2B a80d5022072c362c1787723b7222638f01993675f5c3bbc87962d998497dcd1673664ef4802cb8b3bce7ad81825521be1747c00f6ef5f5e1c9e2d976b09c8d85 SHA512 d51a5b1c5977049a9a499c2f7edcd95ea5e2b47c4fb49fa76d3df9839b2ad7652bbfff41fae823da3b86a52f2b9cb120759a15e5e9967e7b1148ea3bc92ed793
diff --git a/sys-kernel/installkernel/installkernel-35.ebuild b/sys-kernel/installkernel/installkernel-35.ebuild
new file mode 100644
index 000000000000..bae0d8720c6e
--- /dev/null
+++ b/sys-kernel/installkernel/installkernel-35.ebuild
@@ -0,0 +1,190 @@
+# 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 )
+"
+# efistub requires systemd's kernel-install because:
+# - We need support for removal to clean-up the created entry
+# - We need to know the location of the ESP
+# - kernel-bootcfg at some point calls bootctl (to find ESP)
+
+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
+}