From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 98A3115807B for ; Sun, 13 Oct 2024 20:01:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDC25E0821; Sun, 13 Oct 2024 20:01:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5290E0821 for ; Sun, 13 Oct 2024 20:01:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E379B3430E7 for ; Sun, 13 Oct 2024 20:01:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53E6814CA for ; Sun, 13 Oct 2024 20:01:23 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1728849088.e67951813207a516a6f87a30d8fe631760fca592.mpagano@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-firmware/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/linux-firmware/linux-firmware-99999999.ebuild X-VCS-Directories: sys-kernel/linux-firmware/ X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: e67951813207a516a6f87a30d8fe631760fca592 X-VCS-Branch: master Date: Sun, 13 Oct 2024 20:01:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 17a8648c-98ab-436a-a733-12be78200406 X-Archives-Hash: 1b3e7763f67564cdef0a83393611d4d1 commit: e67951813207a516a6f87a30d8fe631760fca592 Author: Emil Velikov gmail com> AuthorDate: Sun Oct 13 13:05:59 2024 +0000 Commit: Mike Pagano gentoo 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38975 Signed-off-by: Mike Pagano 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