[gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-firmware/

["Mike Pagano" <mpagano@gentoo.org>]

commit:     e67951813207a516a6f87a30d8fe631760fca592
Author:     Emil Velikov <emil.l.velikov <AT> gmail <DOT> com>
AuthorDate: Sun Oct 13 13:05:59 2024 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 19:51:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6795181

sys-kernel/linux-firmware: add python to makedeps, add separate dedup stage

Recently upstream has started running check_whence.py prior to the
installation process, to ensure the WHENCE metadata is in the correct
format.

In addition, the de-duplication stage is no longer forced onto everyone.
So anyone interested, can run the separate target.

Both of those are done by yours truly, so direct any rotten
tomatoes^W^Wpraise towards me ;-)

Signed-off-by: Emil Velikov <emil.l.velikov <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38975
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 sys-kernel/linux-firmware/linux-firmware-99999999.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
index d96b4b85e55b..a158105aa496 100644
--- a/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-99999999.ebuild
@@ -40,6 +40,7 @@ RESTRICT="binchecks strip test
 BDEPEND="initramfs? ( app-alternatives/cpio )
 	compress-xz? ( app-arch/xz-utils )
 	compress-zstd? ( app-arch/zstd )
+	python
 	deduplicate? ( app-misc/rdfind )"
 
 #add anything else that collides to this
@@ -120,6 +121,7 @@ src_prepare() {
 		|| die
 
 	chmod +x copy-firmware.sh || die
+	chmod +x dedup-firmware.sh || die
 	cp "${FILESDIR}/${PN}-make-amd-ucode-img.bash" "${T}/make-amd-ucode-img" || die
 	chmod +x "${T}/make-amd-ucode-img" || die
 
@@ -136,6 +138,7 @@ src_prepare() {
 	# whitelist of misc files
 	local misc_files=(
 		copy-firmware.sh
+		dedup-firmware.sh
 		WHENCE
 		README
 	)
@@ -284,9 +287,9 @@ src_install() {
 	elif use compress-zstd; then
 		FW_OPTIONS+=( "--zstd" )
 	fi
-	! use deduplicate && FW_OPTIONS+=( "--ignore-duplicates" )
 	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