gentoo auto-resync : 17:10:2024 - 04:04:26

3 files changed, 42 insertions, 39 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 4e64ce2e24e0..8ad9dba6a5af 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 7f2ca5983e8c..dcc47e7931b7 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -8,5 +8,5 @@ DIST linux-firmware-20240909.tar.xz 383099276 BLAKE2B 3769ca5501db43a6d1ca54ac11
 EBUILD linux-firmware-20240709-r2.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
 EBUILD linux-firmware-20240811-r1.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
 EBUILD linux-firmware-20240909-r1.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
-EBUILD linux-firmware-99999999.ebuild 11572 BLAKE2B 810a799dbe48d366903beb55969db04f3f555606d6698504f495cd169be6ece8ce3760214f9de6ce78c3ade6326c774928f621983a855103c2f989e0c779d828 SHA512 d3fd2abc6bb60f8499f0e23dd62acaf8999d31f464e0826fb97818ad1a82b5f3d890a641ee3932d69f3e79f6ec3dc33e867b1cc2cf486b11f236722c15323fb8
+EBUILD linux-firmware-99999999.ebuild 11700 BLAKE2B e4bcbcc4915906dbe393ee70e2f6f7536580e8fb46e24e225e49a08bd2fe0e7a2278d6f4fe99daa46bc48c404ee498d46982f049a66010b4bf5ecd265434b21e SHA512 f0fbd28f19ac2af621befb66f8a1e6aae567c1342ff3b3aac92ccafd94b7581f138399a855e90cfe1605b3953ff0e32ecf16309a5cd8cf58f3d35c9dca4e6af6
 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index 7f691121d842..0f7f36f72df9 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -124,9 +124,10 @@ src_prepare() {
 		| xargs --null --no-run-if-empty chmod 0644 \
 		|| die
 
-	chmod +x copy-firmware.sh || die
-	chmod +x dedup-firmware.sh || die
-	chmod +x check_whence.py || die
+	chmod +x "${S}"/{copy-firmware.sh,dedup-firmware.sh,check_whence.py,build_packages.py} || die
+	chmod +x "${S}"/{carl9170fw/autogen.sh,carl9170fw/genapi.sh} || die
+	chmod +x "${S}"/contrib/process_linux_firmware.py || die
+
 	cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die
 	chmod +x "${T}/make-amd-ucode-img" || die
 
@@ -214,6 +215,40 @@ 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" )
+	git config --global --add safe.directory "${S}" || die
+
+	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
@@ -263,41 +298,6 @@ src_prepare() {
 		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" )
-	git config --global --add safe.directory "${S}" || die
-
-	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
@@ -379,6 +379,7 @@ pkg_preinst() {
 
 	# Make sure /boot is available if needed.
 	use initramfs && ! use dist-kernel && mount-boot_pkg_preinst
+
 }
 
 pkg_postinst() {
@@ -404,6 +405,8 @@ pkg_postinst() {
 			mount-boot_pkg_postinst
 		fi
 	fi
+
+
 }
 
 pkg_prerm() {