gentoo auto-resync : 30:06:2024 - 08:00:50

6 files changed, 64 insertions, 28 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index f202c9416781..69a012d2ea88 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index ea69ae02292b..80928da44404 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -5,8 +5,8 @@ AUX linux-firmware-make-amd-ucode-img.bash 2911 BLAKE2B 94586ef124310da2314655eb
 DIST linux-firmware-20240410.tar.xz 371871028 BLAKE2B 0201c38421bbbbeaa77590aeb71806111c20236d42c414b58a2f567889b3fe5136cc9fbfb20275d735ba5cb55fa6d01242014d6c94f75bd6e1bcf263e6661803 SHA512 fe6681e57ac3dfc29cdc0d6aec44a5aca5be6fc747e2ecd9334caaa55f1a713906d695cf56819f55dd6273f0bffef07de3d086020ad435b74119fe629ba31b32
 DIST linux-firmware-20240513.tar.xz 371738300 BLAKE2B 9c73ee40c0e01b23a79fc3e13809a04837169c3ab1a72e19c99243e3586dab71f60ce15a936c64bdb16c77209692a285bf2439be88a05f010afe763bc67457b5 SHA512 681a63a71b89048e1b905d48f239bc6f8e6331b648b042d48c936292fd77dd542ff8b57c92ee8c0d6b3fbf9d74cce6588b6606a92db240ac8756d456a2136128
 DIST linux-firmware-20240610.tar.xz 375519640 BLAKE2B 242dbd9d85eabeb8eeebbba86ae80633c412553f0eaac393b2792b99b0f0a8567db68d9c18e92be35809af9a3bf2cebd620c30d6fc518a312b19e8c8756316f9 SHA512 608d8fc12172e8461b66e9917f61ecb86e1c6b6fc260382e7382d61bbf08c1b0cc819207e93ac979a336b463b740c5ad7a7577b823caadb1c61606b7e070ddaf
-EBUILD linux-firmware-20240410.ebuild 11405 BLAKE2B 3864629836ffa560e23abb7f756ea7e3c87f66a1d82ea91317e9eaa21faf9c747f8ac97db014e3fd344ede613cac159aa914ad79b66beebfceb69c66bed8ab9d SHA512 1488329a8530f2681a7413b2c1512ccdf1af3b8584c3f0b6487f35b7062041e32aa50bdf8431c2ca0ecab82b9e1f9e26c434dc72eff6afe0225141f826e24b56
-EBUILD linux-firmware-20240513.ebuild 11405 BLAKE2B 3864629836ffa560e23abb7f756ea7e3c87f66a1d82ea91317e9eaa21faf9c747f8ac97db014e3fd344ede613cac159aa914ad79b66beebfceb69c66bed8ab9d SHA512 1488329a8530f2681a7413b2c1512ccdf1af3b8584c3f0b6487f35b7062041e32aa50bdf8431c2ca0ecab82b9e1f9e26c434dc72eff6afe0225141f826e24b56
-EBUILD linux-firmware-20240610-r1.ebuild 11298 BLAKE2B b369953b0ce80d5bf79d2063e595aea7b62ce258efb6a96b7f015dc2504b665f4d4ccd868285e2b5671db515b6fa68760774bb9a38e0d443a0b19f5437634bf5 SHA512 d4ff0d9dbecacc08f7f2a9214bd6788dc8eb76f2e414750ee5a2f896f92e71b34bea170806b15e45066d46495e2117a45efb4e2b6b0bf114a52a6fa89b531a26
-EBUILD linux-firmware-99999999.ebuild 11453 BLAKE2B 91e370c1465cb2b90f767ea426f2246f588f77b40dd6ac39eee4cf9249ace39c552f979927ca1f21c72ab3e453496494cd98a874dde11c276c8d5524f554f5e0 SHA512 b0074980f664e18bc0e1c9e2516570e27d93b76ed02729e2dff96d555f5ceca104d9f75d65e115b6a25758ab16f0affbcd133594b0da6d5b34919568852ced14
+EBUILD linux-firmware-20240410.ebuild 11701 BLAKE2B badc3af8bec613910d4595d9c19bd981b9d7bec7b668a6b620c93fe5327e4ea6e5dee74b9288d090be0e61c80e920cc7f19b4c7630da191781e35917610d3e48 SHA512 d82b20e52adacec96ac1a748e53d757d45ebac37e84ab152ad4285ee202d79d2befec4d7a2695a3119366683e6d143ce8b1311197afb180ee14f3e922d03121e
+EBUILD linux-firmware-20240513.ebuild 11701 BLAKE2B badc3af8bec613910d4595d9c19bd981b9d7bec7b668a6b620c93fe5327e4ea6e5dee74b9288d090be0e61c80e920cc7f19b4c7630da191781e35917610d3e48 SHA512 d82b20e52adacec96ac1a748e53d757d45ebac37e84ab152ad4285ee202d79d2befec4d7a2695a3119366683e6d143ce8b1311197afb180ee14f3e922d03121e
+EBUILD linux-firmware-20240610-r1.ebuild 11594 BLAKE2B b55a6cba54c649fef4ef1f1ef711a6cd5cee7f7b40326293d0ca3a6e6188ab9f87ccd316f67872d51a77e65e16cd080ae8d4890251b3464ab255120a95cb1c9f SHA512 ef5bd4c4853b0eb7c1d09210e5eaaa4a1dd8cd41486edcbe051a16a6b1d672e92231ba615066e8627b2df7bcfa557b45d889278f97cc366ec426bab698833c75
+EBUILD linux-firmware-99999999.ebuild 11749 BLAKE2B 43e35d0dd95cac657a1e466302c79d3ba8e35e7085c4f2a3fbaa44a22069a720783318e1bfc7e434de94e2056c30ae97324b35417f1d0364c77a1ff0af39ebee SHA512 f5e697ce8880c9d69c6fb8d48a9e722475cfd3f4c1bc7737fbf4ae321e6620fc27b82d5108ca09d80389ca37424cd1f8a1b590333c0bcaa869dadbc17a4d29de
 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
diff --git a/sys-kernel/linux-firmware/linux-firmware-20240410.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240410.ebuild
index 1bb6954d00c8..b8bbed17f1a6 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20240410.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20240410.ebuild
@@ -69,7 +69,15 @@ QA_PREBUILT="*"
 PATCHES=( "${FILESDIR}"/${PN}-copy-firmware-r4.patch )
 
 pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
+	if use initramfs; then
+		if [[ -z ${ROOT} ]] && use dist-kernel; then
+			# Check, but don't die because we can fix the problem and then
+			# emerge --config ... to re-run installation.
+			nonfatal mount-boot_check_status
+		else
+			mount-boot_pkg_pretend
+		fi
+	fi
 }
 
 pkg_setup() {
@@ -379,7 +387,7 @@ pkg_preinst() {
 	fi
 
 	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
+	use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
 }
 
 pkg_postinst() {
@@ -397,21 +405,22 @@ pkg_postinst() {
 		fi
 	done
 
-	# Don't forget to umount /boot if it was previously mounted by us.
 	if use initramfs; then
 		if [[ -z ${ROOT} ]] && use dist-kernel; then
 			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+		else
+			# Don't forget to umount /boot if it was previously mounted by us.
+			mount-boot_pkg_postinst
 		fi
-		mount-boot_pkg_postinst
 	fi
 }
 
 pkg_prerm() {
 	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
-	use initramfs && mount-boot_pkg_prerm
+	use initramfs && ! use dist-kernel && mount-boot_pkg_prerm
 }
 
 pkg_postrm() {
 	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
+	use initramfs && ! use dist-kernel && mount-boot_pkg_postrm
 }
diff --git a/sys-kernel/linux-firmware/linux-firmware-20240513.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240513.ebuild
index 1bb6954d00c8..b8bbed17f1a6 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20240513.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20240513.ebuild
@@ -69,7 +69,15 @@ QA_PREBUILT="*"
 PATCHES=( "${FILESDIR}"/${PN}-copy-firmware-r4.patch )
 
 pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
+	if use initramfs; then
+		if [[ -z ${ROOT} ]] && use dist-kernel; then
+			# Check, but don't die because we can fix the problem and then
+			# emerge --config ... to re-run installation.
+			nonfatal mount-boot_check_status
+		else
+			mount-boot_pkg_pretend
+		fi
+	fi
 }
 
 pkg_setup() {
@@ -379,7 +387,7 @@ pkg_preinst() {
 	fi
 
 	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
+	use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
 }
 
 pkg_postinst() {
@@ -397,21 +405,22 @@ pkg_postinst() {
 		fi
 	done
 
-	# Don't forget to umount /boot if it was previously mounted by us.
 	if use initramfs; then
 		if [[ -z ${ROOT} ]] && use dist-kernel; then
 			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+		else
+			# Don't forget to umount /boot if it was previously mounted by us.
+			mount-boot_pkg_postinst
 		fi
-		mount-boot_pkg_postinst
 	fi
 }
 
 pkg_prerm() {
 	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
-	use initramfs && mount-boot_pkg_prerm
+	use initramfs && ! use dist-kernel && mount-boot_pkg_prerm
 }
 
 pkg_postrm() {
 	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
+	use initramfs && ! use dist-kernel && mount-boot_pkg_postrm
 }
diff --git a/sys-kernel/linux-firmware/linux-firmware-20240610-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240610-r1.ebuild
index 32bd327957ea..9385d0d0c96e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20240610-r1.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20240610-r1.ebuild
@@ -69,7 +69,15 @@ QA_PREBUILT="*"
 PATCHES=( "${FILESDIR}"/${PN}-copy-firmware-r4.patch )
 
 pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
+	if use initramfs; then
+		if [[ -z ${ROOT} ]] && use dist-kernel; then
+			# Check, but don't die because we can fix the problem and then
+			# emerge --config ... to re-run installation.
+			nonfatal mount-boot_check_status
+		else
+			mount-boot_pkg_pretend
+		fi
+	fi
 }
 
 pkg_setup() {
@@ -374,7 +382,7 @@ pkg_preinst() {
 	fi
 
 	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
+	use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
 }
 
 pkg_postinst() {
@@ -392,21 +400,22 @@ pkg_postinst() {
 		fi
 	done
 
-	# Don't forget to umount /boot if it was previously mounted by us.
 	if use initramfs; then
 		if [[ -z ${ROOT} ]] && use dist-kernel; then
 			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+		else
+			# Don't forget to umount /boot if it was previously mounted by us.
+			mount-boot_pkg_postinst
 		fi
-		mount-boot_pkg_postinst
 	fi
 }
 
 pkg_prerm() {
 	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
-	use initramfs && mount-boot_pkg_prerm
+	use initramfs && ! use dist-kernel && mount-boot_pkg_prerm
 }
 
 pkg_postrm() {
 	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
+	use initramfs && ! use dist-kernel && mount-boot_pkg_postrm
 }
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 26c21e80395e..cbf74c22e3a1 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -84,7 +84,15 @@ pkg_setup() {
 }
 
 pkg_pretend() {
-	use initramfs && mount-boot_pkg_pretend
+	if use initramfs; then
+		if [[ -z ${ROOT} ]] && use dist-kernel; then
+			# Check, but don't die because we can fix the problem and then
+			# emerge --config ... to re-run installation.
+			nonfatal mount-boot_check_status
+		else
+			mount-boot_pkg_pretend
+		fi
+	fi
 }
 
 src_unpack() {
@@ -375,7 +383,7 @@ pkg_preinst() {
 	fi
 
 	# Make sure /boot is available if needed.
-	use initramfs && mount-boot_pkg_preinst
+	use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
 }
 
 pkg_postinst() {
@@ -393,21 +401,22 @@ pkg_postinst() {
 		fi
 	done
 
-	# Don't forget to umount /boot if it was previously mounted by us.
 	if use initramfs; then
 		if [[ -z ${ROOT} ]] && use dist-kernel; then
 			dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}"
+		else
+			# Don't forget to umount /boot if it was previously mounted by us.
+			mount-boot_pkg_postinst
 		fi
-		mount-boot_pkg_postinst
 	fi
 }
 
 pkg_prerm() {
 	# Make sure /boot is mounted so that we can remove /boot/amd-uc.img!
-	use initramfs && mount-boot_pkg_prerm
+	use initramfs && ! use dist-kernel && mount-boot_pkg_prerm
 }
 
 pkg_postrm() {
 	# Don't forget to umount /boot if it was previously mounted by us.
-	use initramfs && mount-boot_pkg_postrm
+	use initramfs && ! use dist-kernel && mount-boot_pkg_postrm
 }