gentoo auto-resync : 02:02:2024 - 11:45:20

11 files changed, 68 insertions, 24 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 6e32b105f2e4..88d4d38f89da 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/dkms/Manifest b/sys-kernel/dkms/Manifest
index 9d0b9791206a..08d5baed7803 100644
--- a/sys-kernel/dkms/Manifest
+++ b/sys-kernel/dkms/Manifest
@@ -1,4 +1,4 @@
 AUX dkms-3.0.12-add-gentoo-os-id.patch 345 BLAKE2B 70642f624869ea17c96bc4c9a51e91fefb01b15827abe2ebdb2ed7d4eb7f4b2a2b2cfa9263834489738d3c91dccd1d557f794453ae515dbd2f287eeaeeff9a79 SHA512 abd6d1cb9ce7b6718599e4c372b1d6c97db5cfb56d23da7ae7847d77941cac23f1ed64b094070c4f73781c965d1bb2b1dc52af654194af8b46c11bdb8b3d34fb
 DIST dkms-3.0.12.tar.gz 88241 BLAKE2B 672105074b7899080a2468d347e1fdd60bb6be92852746bccff69565b4f49631568764d265495610d3aebf8df1e0c717daa123d6c3be8752d417ed1c633942e0 SHA512 81646f39c458039958159f519d4dcdfb5dcaa303f7c9898310d13e36c38f30ce57efcc2f2fc98a18ec3d232fd3c50e7a2d859ee42a023e62475e7dad070029d7
-EBUILD dkms-3.0.12.ebuild 935 BLAKE2B 829d514ed5baa3e2a3100f53b3f468b9e865896da26678ed1d224d7a7984e905e2e78b5247529d16fcec88f8c2717cf0c09ba579b8ab574b41b10ad317b49445 SHA512 759e820b8e33d52eac45b68b9061d0a465aa8079f09594efa9105cd0bc6fe1fa186eff482986b433f85e9c7af06c13aede49a93e9b9d52159e6de485b27cf57f
+EBUILD dkms-3.0.12.ebuild 1091 BLAKE2B 32125d0ba53dde98b994d7cef19d95315e99bf4d7e1c8e319010025186676a50a8cb7fc25fc91513d548e1a5b529e4a1e714ab188429a750eba65402f73c61a8 SHA512 07afa7ef386c07b7a1280aa9c7b8fe77f5979f96a396a6854717275b1d8098261cc88051730e9a026bbe23b1e0929cded821646a0c85416580f68600155ec077
 MISC metadata.xml 1423 BLAKE2B ba5005482cd295624b271e93ccc588a8ded7993c703b81e820150dbc6a8283ae19e8e4fc64327cbb3498292de34740ec15d8561498a8127a588fec01e20eee95 SHA512 15d88c65b0e65e1252ea0fa71fba548aa6bc4e44d727f9933ab0926a7eae9a3a07729a45100213754dac2518ed58b3e13286526b4ebcfed76f8468ae0d7e093d
diff --git a/sys-kernel/dkms/dkms-3.0.12.ebuild b/sys-kernel/dkms/dkms-3.0.12.ebuild
index 370b9e0d2340..832fba5761ab 100644
--- a/sys-kernel/dkms/dkms-3.0.12.ebuild
+++ b/sys-kernel/dkms/dkms-3.0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit linux-info
+inherit linux-info optfeature
 
 DESCRIPTION="Dynamic Kernel Module Support"
 HOMEPAGE="https://github.com/dell/dkms"
@@ -49,3 +49,8 @@ src_install() {
 	einstalldocs
 	keepdir /var/lib/dkms
 }
+
+pkg_postinst() {
+	optfeature "automatically running \"dkms autoinstall\" on each kernel installation" \
+		"sys-kernel/installkernel[systemd]"
+}
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 9f7cfbdcb4d7..f30b16d7cfed 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -14,8 +14,8 @@ AUX gentoo-network-r1.patch 1002 BLAKE2B 719ff76c315e29c2a40f0a485e315622d6678ef
 DIST dracut-059.tar.gz 486487 BLAKE2B 86bbe18875cd3507e187b724cab212dc82e1daca7cedf79aeef13c34601adfff72bf2c0ba4c652e715b43c9a16f7be6a4a2b29dc75bef014640e1ec07c8d455b SHA512 196bc8bf18703c72bffb51a7e0493719c58173ad2da7d121eb42f9a8de47e953af36d109214dc4a10b2dc2d3bd19e844f7f51c2bdec087e064ea11f75124032d
 DIST dracut-060_pre20231030.tar.gz 498954 BLAKE2B ce47f06e1304f732cbad66046c70cbcb03d33d69b9c3e87a4e2e2d30fa837b3b36949462cec9b06125e824ad82db45bd7516c22a1c84ec6884790b37e9c65ab1 SHA512 0cd2fefcd624758063c77836989260a3d5b0d533004c2395124c8200c31602f5d7d0b8c9491de37ce4afb2c5009b2cf944ddd3bb9e0e11120d84176cb1e7423c
 DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3 SHA512 f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e
-EBUILD dracut-059-r7.ebuild 4596 BLAKE2B 651b8e0d034698ae93fd0a226e45c50c09e5512ab72ef7594f52039294ba2e5e377421eb3a6d23653747e0a0bcf432bee3619221e9c519d857ecbd1800abe6b4 SHA512 ec073690a315ba7825008202dedc0a28bf4c72feaab136fcf6718381aeb79bdf08ead567a5529325e0797d136806d857ce3d102f7cf2e652b7ff8c239c4566bf
-EBUILD dracut-060_pre20231030-r2.ebuild 4413 BLAKE2B 929a215594fd5813bbd35e2fcaa5096ab972b86e534b0597e297ced93a431148774b1212942c2ff662440089eb37b9ec55271c7766f0c8b18f5785b1c534622f SHA512 d21a0cf8234b93e5f8a370f6ceae45dc661b56b89a6bd9a552a8a2133d72897bfe581565916fb5797f0cd558f852c8eeca7e0c705a001b08a9b2f3714d1cd4e0
-EBUILD dracut-060_pre20240104.ebuild 4450 BLAKE2B 5df7c61ca3f40289c77fdb85cccffeff36ceffdadfa0f469f58860f834fc25c18c7b01c23556ee23e8cc119e8e0204440935c606df753a995d5128ba66c0ef09 SHA512 ea2f0135e07ff33162722391b7c20dd8737c3e09c00fe6ca0898b323828c58474135effee7855ec8b3d092ba32ef7cc699a33f79354be8b03d85382b459d3009
-EBUILD dracut-9999.ebuild 4249 BLAKE2B 651c02e56185b4e1fef8baa4920c4587ae50bcbd27451b1f8845ff08e630ddb3f70ed9508315222774bfde955957bb0c8589591de22da586691ac645e62fbf7a SHA512 b0d6c157c25783dd19901537df780a7aa2da421559477d15b4ed648a3cacd7fbe7df4e70b3b97bcd64d8f4b114fad9bbb2b544c0bb35914139bd9b8c965783d3
+EBUILD dracut-059-r7.ebuild 4715 BLAKE2B 119097a741c83262e2041e215f5c8d78d897901b07a1c93deccff48e6f750f44a702b769a88088e332ae1289a1e95cad866fc305c2a6b9e6e3d3b0003de3ccc9 SHA512 e8ccab043299e5c542809ba7154c2bd9712fd055e4dd085c6c325c66b49526423dc576b97ea1849cdc79440fb8e91ff5a86c6d339e48bc0560ea4b68c1fb84a2
+EBUILD dracut-060_pre20231030-r2.ebuild 4532 BLAKE2B 1103591973694d6378c40d178c8b217d5babb1c385256bc7ca8929ab27e2456f7557e5d007590b38dbcf57a1811e4a4a3b5e6045f1664400dd21e0139c25285a SHA512 a0a1dfabc22cbbb62c33a8ff3ca4852fdf793cc54b5d368e07dd4f42fb0bb169aa072c3a0dd429c0ea9c70f5c915592ba736dc61d5c88d35713122fbfa1d4b47
+EBUILD dracut-060_pre20240104.ebuild 4569 BLAKE2B c23a9a4be21f99df8bbcef6cabfcac9041443459c6603928f7d72a99d3202b97c15b06da1144deee1e8ba8e0c853284aac25401d6bf6f3135eac26e6bbbfdbd3 SHA512 1b765fb40427179eddb643f98b680df1ca4b2e5607bf6a5a95bcc71b10680894936ac598f1719a19433cb58181b68b8333f6386ec93c0e2f85a94bff3b278d8c
+EBUILD dracut-9999.ebuild 4368 BLAKE2B be4a4599dd6b5c878a5875e35c98d9a2460c39d2bcc1f352c692e0fc8c1e3a97fe94192b9b439d02d37fc063d0f8d85832250ac1862f517277739022237a8740 SHA512 97b80cbaa29ab4df746466883dee4a97057ffdd3b01cc8c5849e8aeeca560dc7fca5e5130b02def84aea9d2e45bcd0286ced033e188a96f184c29205dfe372c9
 MISC metadata.xml 451 BLAKE2B 34fe004c76ad1ec98a27c53451f51a15689bda1413bb1dae895d4e7be68d810388cbf46d739b04da3b7869835eb70c1b9c03957d60fc6217b12bc028bd011b40 SHA512 51c81f853ab1be8d8dc240d69b1b2c9c69992efa804a394246222466d774bf673f0cb32031d46a56fc2628cd148b0a5c733a8690b78bff70806ca7f563a2855a
diff --git a/sys-kernel/dracut/dracut-059-r7.ebuild b/sys-kernel/dracut/dracut-059-r7.ebuild
index ecfc998585ed..dcfc9969aaa0 100644
--- a/sys-kernel/dracut/dracut-059-r7.ebuild
+++ b/sys-kernel/dracut/dracut-059-r7.ebuild
@@ -159,4 +159,6 @@ pkg_postinst() {
 	optfeature \
 		"Enable rngd service to help generating entropy early during boot" \
 		sys-apps/rng-tools
+	optfeature "automatically generating an initramfs on each kernel installation" \
+		"sys-kernel/installkernel[dracut]"
 }
diff --git a/sys-kernel/dracut/dracut-060_pre20231030-r2.ebuild b/sys-kernel/dracut/dracut-060_pre20231030-r2.ebuild
index 5704feeec8e9..b6aa26833eed 100644
--- a/sys-kernel/dracut/dracut-060_pre20231030-r2.ebuild
+++ b/sys-kernel/dracut/dracut-060_pre20231030-r2.ebuild
@@ -152,4 +152,6 @@ pkg_postinst() {
 	optfeature \
 		"Enable rngd service to help generating entropy early during boot" \
 		sys-apps/rng-tools
+	optfeature "automatically generating an initramfs on each kernel installation" \
+		"sys-kernel/installkernel[dracut]"
 }
diff --git a/sys-kernel/dracut/dracut-060_pre20240104.ebuild b/sys-kernel/dracut/dracut-060_pre20240104.ebuild
index 76367ce16dfe..cca90219d096 100644
--- a/sys-kernel/dracut/dracut-060_pre20240104.ebuild
+++ b/sys-kernel/dracut/dracut-060_pre20240104.ebuild
@@ -153,4 +153,6 @@ pkg_postinst() {
 	optfeature \
 		"Enable rngd service to help generating entropy early during boot" \
 		sys-apps/rng-tools
+	optfeature "automatically generating an initramfs on each kernel installation" \
+		"sys-kernel/installkernel[dracut]"
 }
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 82cac8b44aa2..aef6ae936fdb 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -149,4 +149,6 @@ pkg_postinst() {
 	optfeature \
 		"Enable rngd service to help generating entropy early during boot" \
 		sys-apps/rng-tools
+	optfeature "automatically generating an initramfs on each kernel installation" \
+		"sys-kernel/installkernel[dracut]"
 }
diff --git a/sys-kernel/installkernel/Manifest b/sys-kernel/installkernel/Manifest
index 69d8d5d5bdcf..6e44c3502403 100644
--- a/sys-kernel/installkernel/Manifest
+++ b/sys-kernel/installkernel/Manifest
@@ -1,5 +1,5 @@
 DIST installkernel-12.tar.gz 4385 BLAKE2B 2f55442d76020cfcd42fb83f14ff1f517dcbbd102c338e84f092d56ba513c02644401b3b75ee7c45c8e763eb0e27225bbfe6576bc4e34841694076d935328c9a SHA512 b5620bf7a36081da929645d112a9160f89f1de09c00d3b6093efbe57d8ff1a5ebcd0b65e68491d225f61b7732bce8f76ff8baecd24969715f40dc818e4302de2
-DIST installkernel-19.tar.gz 13966 BLAKE2B cee0ab63ababae533ad51e6bfe217e65cf8e01213e51f79738cf34a09cb4f12a89cbc63480e1e85f29396a51408ca4bcebaeec6759993e7d800b35f84c6087e2 SHA512 a004727a7e54efc7a5925410005255cf963c81b839e872576f70f739e26c265fa8baa4e08895fbbc3d2c1a56742cfcbb8cdf971169ddf69e8a6f70a11acbe9b0
+DIST installkernel-23.tar.gz 14290 BLAKE2B 4384277d07ce0328c7f72c33dc3e08424b356a462609ad543c6ee556d6f7688ac8d819524067e6cf0fe5b3dc9d374f55395dfdb2a356e9e218b40650c74b06ef SHA512 508d95dadc34e813f3d05389ebfeaf78b921480b1e400ae7d9cb724307551acf4b9c6f2ca8d1f714b973295aaa3a5db5512859a480dac507665e883b582a4963
 EBUILD installkernel-12.ebuild 1490 BLAKE2B 88956c7ff428beaf980b47d567fc1baaaee6dfbba3139e3a5b3d178d9119fef8d712862ee07933b8132d00b406419fcd873eb698a22cbe7329675788488db7d7 SHA512 78d9f9958c56bb47902d8cb894bbc9574c96fb2d986b00cb6b7bbe20b2db58db7c41a53f33794b98726870bac9a1b2c4a381bc4609288dcc0a05b87102aaac7d
-EBUILD installkernel-19.ebuild 3280 BLAKE2B 7041829f6743cfe02d8e75e7c14336fd8e6105a00b319b8ad0ed20212405fe840c02cb623e89ebf4ee0326a022d6483f4ef7d079bf9e74367dceafceb6b17b4f SHA512 5a848c3e6755689c8af8b1a2611d795039aa5ed9bdf32fee3bd23fc545755485702523128e551dc873c10472aa0ecfad54ff2f929fe2d6a7c76ee1cd9ce8c99e
-MISC metadata.xml 861 BLAKE2B b5526c0440f51568a5afd3f5c8f8d862b29713d5c8b20fbb3388cadf1bd48bf1897fa7e5c2561ad589a97eac5df7f0c6aa8f38a71226c34b422e70ec81b32a8b SHA512 128b33f9aa08247e1733640449b5ae89be093473d78464d1eea9280e2cfaf22d0b91450660590f2ee6dec8c9987f7b9bf4520ad6492f1feabc89eee308d46061
+EBUILD installkernel-23.ebuild 4468 BLAKE2B bf29ce2134eb1f85216fd4ccee7efce80ad2aa754fa6a4f2826120f887c9cfb22a90f790a01e188c73ea33f4137638b4fd424718e112bed7549add0407bb9ed3 SHA512 aa616f4426c54590812fb11c757444d8d6b73119724c9cbe5d8962241490a3031916fafeb3f95d991a6703d01740a9c6ac9733640f0ea08b5bc882930ba8c931
+MISC metadata.xml 939 BLAKE2B fd8d6a7c19c2a5f6f11e60cdf0a5b9e98f140d80bbab835f5350ac6fb87e786fa5a93e3157e9affd45f381d4eb20c454775d703c8bdf82d2a6161e2ca2420ef9 SHA512 9d1b025cf8c5c0875015e0e9b3cadbec2ab3770aa76c8792adb8b16037dbcdcf3cb75d23d0dcaad7a932138bbdb524c266c1bf1cab09df9541a1acac45d7ca82
diff --git a/sys-kernel/installkernel/installkernel-19.ebuild b/sys-kernel/installkernel/installkernel-23.ebuild
index abbc9f75bb73..333ea4b45568 100644
--- a/sys-kernel/installkernel/installkernel-19.ebuild
+++ b/sys-kernel/installkernel/installkernel-23.ebuild
@@ -15,11 +15,11 @@ 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"
+IUSE="dracut grub systemd systemd-boot uki ukify"
+REQUIRED_USE="systemd-boot? ( systemd )"
 
 RDEPEND="
 	!<=sys-kernel/installkernel-systemd-3
-	>=sys-apps/debianutils-4.9-r1
 	dracut? ( >=sys-kernel/dracut-060_pre20240104 )
 	grub? ( sys-boot/grub )
 	systemd? (
@@ -28,6 +28,12 @@ RDEPEND="
 			sys-apps/systemd-utils[kernel-install(-)]
 		)
 	)
+	systemd-boot? (
+		|| (
+			sys-apps/systemd[boot(-)]
+			sys-apps/systemd-utils[boot(-)]
+		)
+	)
 	ukify? (
 		|| (
 			sys-apps/systemd[ukify(-)]
@@ -59,7 +65,8 @@ src_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
+	doexe hooks/systemd/90-compat.install
+	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 ||
@@ -71,10 +78,12 @@ src_install() {
 	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 systemd-boot; then
+		echo "layout=bls" >> "${T}/install.conf" || die
 	elif use grub; then
 		echo "layout=grub" >> "${T}/install.conf" || die
 	else
-		echo "layout=bls" >> "${T}/install.conf" || die
+		echo "layout=compat" >> "${T}/install.conf" || die
 	fi
 
 	if use dracut; then
@@ -105,13 +114,34 @@ src_install() {
 }
 
 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"
+	# 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
 }
diff --git a/sys-kernel/installkernel/metadata.xml b/sys-kernel/installkernel/metadata.xml
index 65393ba6a433..6fffd1cc0b32 100644
--- a/sys-kernel/installkernel/metadata.xml
+++ b/sys-kernel/installkernel/metadata.xml
@@ -8,7 +8,8 @@
 	<use>
 		<flag name="dracut">Generate an initrd or UKI on each kernel installation</flag>
 		<flag name="grub">Re-generate grub.cfg on each kernel installation</flag>
-		<flag name="systemd">Use systemd's kernel-install to install kernels'</flag>
+		<flag name="systemd">Use systemd's kernel-install to install kernels</flag>
+		<flag name="systemd-boot">Use systemd-boot's native layout by default</flag>
 		<flag name="uki">Install UKIs to ESP/EFI/Linux for EFI stub booting and/or bootloaders with support for auto-discovering UKIs</flag>
 		<flag name="ukify">Build an UKI with systemd's ukify on each kernel installation</flag>
 	</use>