From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C4D401582EF for ; Sat, 01 Mar 2025 23:28:16 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id ABFBA3431A8 for ; Sat, 01 Mar 2025 23:28:16 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 716D711037D; Sat, 01 Mar 2025 23:28:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 6BEAC11037D for ; Sat, 01 Mar 2025 23:28:03 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22E64343145 for ; Sat, 01 Mar 2025 23:28:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD7B727F3 for ; Sat, 01 Mar 2025 23:28:01 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1740871653.8c318c6e8411c0012a08010606060bd1815c2bf5.conikost@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-copy-firmware-r6.patch X-VCS-Directories: sys-kernel/linux-firmware/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 8c318c6e8411c0012a08010606060bd1815c2bf5 X-VCS-Branch: master Date: Sat, 01 Mar 2025 23:28:01 +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: aa363ecd-5427-42d0-8072-22bbc55b5a7a X-Archives-Hash: 7fd11b4e49a1ff3257a6ce6c6973d56d commit: 8c318c6e8411c0012a08010606060bd1815c2bf5 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Feb 28 07:04:19 2025 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Mar 1 23:27:33 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c318c6e sys-kernel/linux-firmware: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/40806 Signed-off-by: Conrad Kostecki gentoo.org> .../files/linux-firmware-copy-firmware-r6.patch | 47 ---------------------- 1 file changed, 47 deletions(-) diff --git a/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r6.patch b/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r6.patch deleted file mode 100644 index 58d77d4b090d..000000000000 --- a/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r6.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/copy-firmware.sh 2024-10-19 13:21:08.888499335 -0000 -+++ b/copy-firmware.sh 2024-10-19 13:23:16.775386475 -0000 -@@ -46,6 +46,17 @@ while test $# -gt 0; do - shift - ;; - -+ --firmware-list) -+ if [ -n "$2" ]; then -+ FIRMWARE_LIST=`cat $2` -+ shift 2 -+ else -+ echo "ERROR: '--firmware-list' requires a non-empty option argument of firmware files to install" -+ exit 1 -+ fi -+ ;; -+ -+ - *) - if test -n "$destdir"; then - err "unknown command-line options: $*" -@@ -70,6 +81,7 @@ $verbose "Checking that WHENCE file is f - - # shellcheck disable=SC2162 # file/folder name can include escaped symbols - grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g' | while read k f; do -+ [ -n "${FIRMWARE_LIST}" ] && if ! echo "${FIRMWARE_LIST}" | grep -q "${f}"; then continue; fi - install -d "$destdir/$(dirname "$f")" - $verbose "copying/compressing file $f$compext" - if test "$compress" != "cat" && test "$k" = "RawFile"; then -@@ -82,6 +94,7 @@ done - - # shellcheck disable=SC2162 # file/folder name can include escaped symbols - grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read l t; do -+ [ -n "${FIRMWARE_LIST}" ] && if ! echo "${FIRMWARE_LIST}" | grep -q "${t}"; then continue; fi - directory="$destdir/$(dirname "$l")" - install -d "$directory" - target="$(cd "$directory" && realpath -m -s "$t")" -@@ -96,7 +109,9 @@ done - - # Verify no broken symlinks - if test "$(find "$destdir" -xtype l | wc -l)" -ne 0 ; then -- err "Broken symlinks found:\\n$(find "$destdir" -xtype l)" -+ if [ -z "${FIRMWARE_LIST}" ]; then -+ err "Broken symlinks found:\\n$(find "$destdir" -xtype l)" -+ fi - fi - - exit 0