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 (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 26F8D158015 for ; Wed, 20 Dec 2023 14:16:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BF2A2BC01F; Wed, 20 Dec 2023 14:16:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 469902BC01F for ; Wed, 20 Dec 2023 14:16:48 +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 1533F3408DD for ; Wed, 20 Dec 2023 14:16:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E8B5131D for ; Wed, 20 Dec 2023 14:16:45 +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: <1703081789.2db2bb82b270c2d5ac1d53cbc3ed34212918a473.mpagano@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-firmware/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/linux-firmware/files/linux-firmware-remove-rdfind-dep-and-use.patch X-VCS-Directories: sys-kernel/linux-firmware/files/ X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 2db2bb82b270c2d5ac1d53cbc3ed34212918a473 X-VCS-Branch: master Date: Wed, 20 Dec 2023 14:16:45 +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: c0f28615-ac48-4ee8-bc13-4e4ab9cfd35b X-Archives-Hash: a3e5233fd67c411d9e0771f4d1b56655 commit: 2db2bb82b270c2d5ac1d53cbc3ed34212918a473 Author: Mike Pagano gentoo org> AuthorDate: Wed Dec 20 14:16:29 2023 +0000 Commit: Mike Pagano gentoo org> CommitDate: Wed Dec 20 14:16:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2db2bb82 sys-kernel/linux-firmware: Remove unused patch Signed-off-by: Mike Pagano gentoo.org> .../linux-firmware-remove-rdfind-dep-and-use.patch | 34 ---------------------- 1 file changed, 34 deletions(-) diff --git a/sys-kernel/linux-firmware/files/linux-firmware-remove-rdfind-dep-and-use.patch b/sys-kernel/linux-firmware/files/linux-firmware-remove-rdfind-dep-and-use.patch deleted file mode 100644 index 83646a073224..000000000000 --- a/sys-kernel/linux-firmware/files/linux-firmware-remove-rdfind-dep-and-use.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/copy-firmware.sh 2023-11-25 18:07:49.362441380 -0500 -+++ b/copy-firmware.sh 2023-11-25 18:19:03.612907595 -0500 -@@ -69,7 +69,7 @@ if [ -z "$destdir" ]; then - exit 1 - fi - --if ! which rdfind 2>/dev/null >/dev/null; then -+if [ -n "$LINUX_FIRMWARE_DO_DEDUPE" ] && ! which rdfind 2>/dev/null >/dev/null; then - echo "ERROR: rdfind is not installed" - exit 1 - fi -@@ -87,13 +87,15 @@ grep -E '^(RawFile|File):' WHENCE | sed - fi - done - --$verbose "Finding duplicate files" --rdfind -makesymlinks true -makeresultsfile false "$destdir" >/dev/null --find "$destdir" -type l | while read -r l; do -- target="$(realpath "$l")" -- $verbose "Correcting path for $l" -- ln -fs "$(realpath --relative-to="$(dirname "$(realpath -s "$l")")" "$target")" "$l" --done -+if [ -n "$LINUX_FIRMWARE_DO_DEDUPE" ]; then -+ $verbose "Finding duplicate files" -+ rdfind -makesymlinks true -makeresultsfile false "$destdir" >/dev/null -+ find "$destdir" -type l | while read -r l; do -+ target="$(realpath "$l")" -+ $verbose "Correcting path for $l" -+ ln -fs "$(realpath --relative-to="$(dirname "$(realpath -s "$l")")" "$target")" "$l" -+ done -+fi - - # shellcheck disable=SC2162 # file/folder name can include escaped symbols - grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do