gentoo auto-resync : 12:04:2025 - 08:44:02

5 files changed, 84 insertions, 76 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 1a03a2612c91..760a308aaf6d 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 938132a2b20c..9302131c1750 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -3,11 +3,11 @@ AUX 35-amd-microcode.install 1321 BLAKE2B 4205a10d0224869245b62707ae830dd290dfd1
 AUX linux-firmware-copy-firmware-r8.patch 2175 BLAKE2B 78851b00d6655c98f2ac63215aa270858a00b34fd2705a40b864aee9f36cf123cc94a3dc5048e59d098429dfd29ca1d5e48821b02c4bbd1894ade37d99c740d7 SHA512 f173fa8d58c4195bf82163e6b9025fed86e7c8800b6a9947a9319142c5f331cdd3e3b26eed51a17ea1355ad1ed02e9c8bb43a4f061a5d4728b7c3e63b8c94657
 AUX linux-firmware-copy-firmware-r9.patch 2301 BLAKE2B 7365a22b1d0c68233e3a880c1e7718193d86edaa1e7e9bb72f07893daddf15341b17e8f5e77cd5411e2c4bcfaf11d48c1322cc0136a4e210c01ea2c6c2c822b6 SHA512 690276c676b6e4d50e48099e6d4681de8fc1741468ddb40006f4297db9516229661212930205e7f3682e6c1d77bae35d66b8fc7a9e3a40a797e832571a6f2067
 AUX linux-firmware-make-amd-ucode-img.bash 2911 BLAKE2B 94586ef124310da2314655ebb517c71e3ac73ca636df3c534d4bd5de4ab175b5aa3d40bffe5c126e292a08cff677542df276660380d3b1f474326c9e456b2ee1 SHA512 21465fe141d5c58bb9a50653788f1084833b0a698aaca4b2dc589bd9129c9f3ee87f179791ef5dd8fda4182a48e378e0f83abbb452422b3462b8e81b57ca43a0
-DIST linux-firmware-20250109.tar.xz 411464912 BLAKE2B c23ed6d5e0b8ff80666e2c7f3727b991a51dae251778e9ee6e2ab23f45996fbc75d724fbe148d39a180d50384034a01f538daa2abb4f4f5939a7e9773a684240 SHA512 d7bc9d19e1c03ec75d62903f3c6e79947a10aea61aec8958dfea44cfbeb6fec73f2db41e750cf007a7e937380c5956ed919ae24b8a0a92df87b1d4c57464809d
 DIST linux-firmware-20250211.tar.xz 431514160 BLAKE2B 65531857e4225dca6f8acbc84f539b2f44c8aac3f0949ee1c6b54596c1232738ee0a98ca5025e0b6fe60862fe2d7d20b708854f917d2da9b708a7a5d6f41ab6b SHA512 84c49837ef50d3b43fa0b5c9835c115dfa17dca62706d0e81bf17d640a26a42abfa2e5575683191474042be22d7613fb3f7f1710e72bea340a49d6cc2fc4892a
 DIST linux-firmware-20250311.tar.xz 434375512 BLAKE2B a12d42dcea9ec2b7e220ab4da6592cabf77095b41f2b0138626e71c62fa7e311da6efca24e3616a811b3489c23e21fe13684a2b93c0ff746f67e50b097f3f42e SHA512 4686c398a712e4f3fb61e07791fafc9950ed0da71f1db78ebe8ac2dc0b031d19ad64a7e98b8b643c20ef99f195db5a3ca337b762b43c631b99b599fb90892a48
-EBUILD linux-firmware-20250109-r1.ebuild 11083 BLAKE2B f7848a70f11faf6b336e6ce49fef9940225f9ecfe8f8a323172107a64a80c303babe45001976c25404cd13afb9cfcc24fb3cc82c3d0f900c4636e05359f18327 SHA512 9b4f46cb5cfe05935a3d48a48bd559b24c2a10e2807b25be3a486b802d221cfbfcd71a33f47d4152b3e9ce6daca2e029f0d022a50a00e7a3bbe37e9db905c4c8
+DIST linux-firmware-20250410.tar.xz 462143576 BLAKE2B 6902b64ff4cd4cc8636c669ddae1823097f5cf7621dab999cd8d6be4a0150491c7e05decf1bcca3db7e3a8dd2a228e66184458d5b2770e9ccc9ffe10b7f79d40 SHA512 7b82312a69cd831e576129a6af5ceb5f96d94e2683788b2462aabfd03a46a18ba06978834822af45acc60ac07e4b1758d51c2b36d3233a8bd806071fa21b08c0
 EBUILD linux-firmware-20250211.ebuild 11021 BLAKE2B b3bc9a3544e732b12ed47d062fecd176469f75c3018500fc0c4e6543b18c08b50ebe44b2798335e6c664a9dc3582c149945be68c34065bd211b2cf8336c94d59 SHA512 3b97eceb1e0d906c53bcea0d6d79b504866d6c9e9510f6006869b2d0df30efdce878a95ac47dd9afda846c37b834e141eaae119126223780a8eed4308428b9b0
 EBUILD linux-firmware-20250311.ebuild 11009 BLAKE2B ee7f7d0670b190181f93165fe2bcb1ce415608bc68ae7fb94c063e9d1b3798cd7df4710369da62f3da9ca1131eadd9cb3b5a42e9e6648a6d4d1fa82ce35f8266 SHA512 12e85da5330e792ffb851ac29840cbda7d9f48796575875ef3ab50b33ae6243c52c3e96e17d2c64ab4997061e2d76bdb832c64255c5414210f1d071b9abb21ea
-EBUILD linux-firmware-99999999.ebuild 10817 BLAKE2B 1a2be1483bae6348522fe5a091bc28f297fbb76d682ad226125321823382952afeaa5b8452671de8a84a660ca412532bb02260b67bfe6942ae169ac2391745b9 SHA512 6d8acfce775aa1290aea4a09d1e2919af6864b07fb6e1545e1199c4a138cfb5ba4c29a25e6d34cbb51526a4822917d12d0f26f95a2ddc2ce23cde72d86d9b69e
-MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
+EBUILD linux-firmware-20250410.ebuild 11080 BLAKE2B 9c4349c515a76b7276ea78fba61b9c1612f2b8c0e9706a1670de2c35c20c64d15ad2ceba3080c10c91d534adb19734e54b84987a861c058e9c1a721e86faaef7 SHA512 7ef24947e11b27818a7439318546e7a089e63c37f24919491c91a417e73e956c862a6cedb3ecbbef619a65f6681d31e814b885f71577bb20b734c3970adacb8b
+EBUILD linux-firmware-99999999.ebuild 11080 BLAKE2B 9c4349c515a76b7276ea78fba61b9c1612f2b8c0e9706a1670de2c35c20c64d15ad2ceba3080c10c91d534adb19734e54b84987a861c058e9c1a721e86faaef7 SHA512 7ef24947e11b27818a7439318546e7a089e63c37f24919491c91a417e73e956c862a6cedb3ecbbef619a65f6681d31e814b885f71577bb20b734c3970adacb8b
+MISC metadata.xml 1187 BLAKE2B ff082e7b8c07aae9f03e42648d0a2bb85b922cf7b51da178586988f61d57a4b4c7517562890de621c67eba4d5fde5ea49d6fa53c83b6192e07cca7e254528bd1 SHA512 1d5b1d4cb8df5c042cb9f36e8992e17c82b5bd6289b347c568abfc4944eb324abea0b9a7c6ac4af415e908c98e33c5d1254b7e0904e890a7ae997ca4b3dcfce8
diff --git a/sys-kernel/linux-firmware/linux-firmware-20250109-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20250410.ebuild
index 70fe12ed9f56..2202b123f02c 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20250109-r1.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20250410.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
-inherit dist-kernel-utils linux-info mount-boot python-any-r1 savedconfig
+inherit dist-kernel-utils eapi9-ver linux-info mount-boot savedconfig
 
 # In case this is a real snapshot, fill in commit below.
 # For normal, tagged releases, leave blank
@@ -20,7 +19,7 @@ else
 		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
 	fi
 
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Linux firmware files"
@@ -30,7 +29,7 @@ LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
 	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
 	unknown-license? ( all-rights-reserved )"
 SLOT="0"
-IUSE="bindist compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable savedconfig unknown-license"
+IUSE="bindist compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable unknown-license"
 REQUIRED_USE="initramfs? ( redistributable )
 	?? ( compress-xz compress-zstd )
 	savedconfig? ( !deduplicate )"
@@ -74,7 +73,7 @@ IDEPEND="
 
 QA_PREBUILT="*"
 PATCHES=(
-	"${FILESDIR}"/${PN}-copy-firmware-r8.patch
+	"${FILESDIR}"/${PN}-copy-firmware-r9.patch
 )
 
 pkg_pretend() {
@@ -121,6 +120,12 @@ src_unpack() {
 src_prepare() {
 	default
 
+	# Stub out this script to avoid errors in the live ebuild
+	cat >check_whence.py<<-EOF
+	#!/bin/sh
+	exit 0
+	EOF
+
 	cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die
 	chmod +x "${T}/make-amd-ucode-img" || die
 
@@ -374,16 +379,12 @@ pkg_postinst() {
 	elog "If you are only interested in particular firmware files, edit the saved"
 	elog "configfile and remove those that you do not want."
 
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ver_test ${ver} -lt 20190514; then
-			elog
-			elog 'Starting with version 20190514, installation of many firmware'
-			elog 'files is controlled by USE flags. Please review your USE flag'
-			elog 'and package.license settings if you are missing some files.'
-			break
-		fi
-	done
+	if ver_replacing -lt 20190514; then
+		elog
+		elog 'Starting with version 20190514, installation of many firmware'
+		elog 'files is controlled by USE flags. Please review your USE flag'
+		elog 'and package.license settings if you are missing some files.'
+	fi
 
 	if use initramfs; then
 		if use dist-kernel; then
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 6c2e381fed9f..2202b123f02c 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
-inherit dist-kernel-utils eapi9-ver linux-info mount-boot python-any-r1 savedconfig
+inherit dist-kernel-utils eapi9-ver linux-info mount-boot savedconfig
 
 # In case this is a real snapshot, fill in commit below.
 # For normal, tagged releases, leave blank
@@ -30,12 +29,13 @@ LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
 	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
 	unknown-license? ( all-rights-reserved )"
 SLOT="0"
-IUSE="compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable savedconfig unknown-license"
+IUSE="bindist compress-xz compress-zstd deduplicate dist-kernel +initramfs +redistributable unknown-license"
 REQUIRED_USE="initramfs? ( redistributable )
 	?? ( compress-xz compress-zstd )
 	savedconfig? ( !deduplicate )"
 
 RESTRICT="binchecks strip test
+	!bindist? ( bindist )
 	unknown-license? ( bindist )"
 
 BDEPEND="initramfs? ( app-alternatives/cpio )
@@ -89,9 +89,6 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-
-	python_setup
-
 	if use compress-xz || use compress-zstd ; then
 		local CONFIG_CHECK
 
@@ -123,6 +120,12 @@ src_unpack() {
 src_prepare() {
 	default
 
+	# Stub out this script to avoid errors in the live ebuild
+	cat >check_whence.py<<-EOF
+	#!/bin/sh
+	exit 0
+	EOF
+
 	cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die
 	chmod +x "${T}/make-amd-ucode-img" || die
 
@@ -138,11 +141,16 @@ src_prepare() {
 
 	# whitelist of misc files
 	local misc_files=(
+		build_packages.py
+		carl9170fw/autogen.sh
+		carl9170fw/genapi.sh
+		contrib/process_linux_firmware.py
 		copy-firmware.sh
-		dedup-firmware.sh
 		check_whence.py
+		dedup-firmware.sh
+		LICEN[CS]E.*
+		README.md
 		WHENCE
-		README
 	)
 
 	# whitelist of images with a free software license
@@ -210,50 +218,6 @@ src_prepare() {
 		mellanox/mlxsw_spectrum-13.2000.1122.mfa2
 	)
 
-	if use !redistributable; then
-		# remove files _not_ in the free_software or unknown_license lists
-		# everything else is confirmed (or assumed) to be redistributable
-		# based on upstream acceptance policy
-		einfo "Removing non-redistributable files ..."
-		local OLDIFS="${IFS}"
-		local IFS=$'\n'
-		set -o pipefail
-		find ! -type d -printf "%P\n" \
-			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
-			| xargs -d '\n' --no-run-if-empty rm -v
-
-		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
-
-		IFS="${OLDIFS}"
-	fi
-
-	restore_config ${PN}.conf
-}
-
-src_install() {
-
-	local FW_OPTIONS=( "-v" "-j1" )
-	git config --global --add safe.directory "${S}" || die
-	local files_to_keep=
-
-	if use savedconfig; then
-		if [[ -s "${S}/${PN}.conf" ]]; then
-			files_to_keep="${T}/files_to_keep.lst"
-			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
-			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
-			FW_OPTIONS+=( "--firmware-list" "${files_to_keep}" )
-		fi
-	fi
-
-	if use compress-xz; then
-		FW_OPTIONS+=( "--xz" )
-	elif use compress-zstd; then
-		FW_OPTIONS+=( "--zstd" )
-	fi
-	FW_OPTIONS+=( "${ED}/lib/firmware" )
-	./copy-firmware.sh "${FW_OPTIONS[@]}" || die
-	use deduplicate && { ./dedup-firmware.sh "${ED}/lib/firmware" || die; }
-
 	# blacklist of images with unknown license
 	local unknown_license=(
 		korg/k1212.dsp
@@ -303,6 +267,50 @@ src_install() {
 		einfo "Removing files with unknown license ..."
 		rm -v "${unknown_license[@]}" || die
 	fi
+
+	if use !redistributable; then
+		# remove files _not_ in the free_software or unknown_license lists
+		# everything else is confirmed (or assumed) to be redistributable
+		# based on upstream acceptance policy
+		einfo "Removing non-redistributable files ..."
+		local OLDIFS="${IFS}"
+		local IFS=$'\n'
+		set -o pipefail
+		find ! -type d -printf "%P\n" \
+			| grep -Fvx -e "${misc_files[*]}" -e "${free_software[*]}" -e "${unknown_license[*]}" \
+			| xargs -d '\n' --no-run-if-empty rm -v
+
+		[[ ${?} -ne 0 ]] && die "Failed to remove non-redistributable files"
+
+		IFS="${OLDIFS}"
+	fi
+
+	restore_config ${PN}.conf
+}
+
+src_install() {
+
+	local FW_OPTIONS=( "-v" "-j1" )
+	local files_to_keep=
+
+	if use savedconfig; then
+		if [[ -s "${S}/${PN}.conf" ]]; then
+			files_to_keep="${T}/files_to_keep.lst"
+			grep -v '^#' "${S}/${PN}.conf" 2>/dev/null > "${files_to_keep}" || die
+			[[ -s "${files_to_keep}" ]] || die "grep failed, empty config file?"
+			FW_OPTIONS+=( "--firmware-list" "${files_to_keep}" )
+		fi
+	fi
+
+	if use compress-xz; then
+		FW_OPTIONS+=( "--xz" )
+	elif use compress-zstd; then
+		FW_OPTIONS+=( "--zstd" )
+	fi
+	FW_OPTIONS+=( "${ED}/lib/firmware" )
+	./copy-firmware.sh "${FW_OPTIONS[@]}" || die
+	use deduplicate && { ./dedup-firmware.sh "${ED}/lib/firmware" || die; }
+
 	pushd "${ED}/lib/firmware" &>/dev/null || die
 
 	# especially use !redistributable will cause some broken symlinks
@@ -347,6 +355,10 @@ src_install() {
 		insinto /boot
 		doins "${S}"/amd-uc.img
 	fi
+
+	dodoc README.md
+	# some licenses require copyright and permission notice to be included
+	use bindist && dodoc WHENCE LICEN[CS]E.*
 }
 
 pkg_preinst() {
@@ -361,7 +373,6 @@ pkg_preinst() {
 
 	# Make sure /boot is available if needed.
 	use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
-
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/linux-firmware/metadata.xml b/sys-kernel/linux-firmware/metadata.xml
index ac0d48943ce9..7f1874af89d4 100644
--- a/sys-kernel/linux-firmware/metadata.xml
+++ b/sys-kernel/linux-firmware/metadata.xml
@@ -9,10 +9,6 @@
 	<email>zerochaos@gentoo.org</email>
 	<name>Rick Farina</name>
 </maintainer>
-<maintainer type="person">
-	<email>mpagano@gentoo.org</email>
-	<name>Mike Pagano</name>
-</maintainer>
 <maintainer type="project">
 	<email>kernel@gentoo.org</email>
 	<name>Gentoo Kernel Project</name>