From 1fb8608d6f0b1acf0e34361c105533087a09c710 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Dec 2023 19:51:59 +0000 Subject: gentoo auto-resync : 20:12:2023 - 19:51:59 --- sys-kernel/linux-firmware/Manifest | 1 - .../linux-firmware-remove-rdfind-dep-and-use.patch | 34 ---------------------- 2 files changed, 35 deletions(-) delete mode 100644 sys-kernel/linux-firmware/files/linux-firmware-remove-rdfind-dep-and-use.patch (limited to 'sys-kernel/linux-firmware') diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest index cf0a48da20c1..99c2a785435e 100644 --- a/sys-kernel/linux-firmware/Manifest +++ b/sys-kernel/linux-firmware/Manifest @@ -1,4 +1,3 @@ -AUX linux-firmware-remove-rdfind-dep-and-use.patch 1279 BLAKE2B 620ebc93ecf8e411525f59844ae475077decfe441cc3ef12b5db338b0606c7dcc232cdf4d9f14c2790dd8c9c3cab94d7ef41980dfe857b4af489b37068a3c549 SHA512 7d717ab95dc31ee93de992eb4da02f1feb03e5c5eaae669f0c4105d8eb0985b42689b9b7f94b19b5d4d890619e3d54a75d59bcf6c418c78f96bab42ac774564d DIST linux-firmware-20231030.tar.xz 317290700 BLAKE2B 3f2f7cd177adabba683d98f048d0fb24f6872168e0a7a43b4521fd43970428af881e54093cc247cf394f714a845db2c0d85387d93305dd1b2c08b359c1f0abb8 SHA512 0a747df0ac6fe1577578021d394b94a5db517b368b17d14a3a580bb361f5112b293ee2f9c56f51b0471118fcc3983c037afea702028370b95715bc9d06672191 DIST linux-firmware-20231111.tar.xz 356057052 BLAKE2B f594a14e9d7d824f2d7b3c85dd760ecab2f9a72f67e3904774d6bf99906695d2ca48c17cf4c44ebd0d9adbb98c3353ddb5e39cd48f93499539d02b8fb54b2db4 SHA512 dd8eb7e8a51fe14479e2f4e1081a8a31f13d041ddd6180eaae6fe865dbad303c89aaaed2b9df237923f74f1cf9fe8c2e5492b4de5fce991ddb02bb091c95dc58 DIST linux-firmware-20231211.tar.xz 358100480 BLAKE2B 91b9ef2d244d465e8d62d2c529f3481b1e28a9c30a143ef7d9f2fb3a2a0f9d7e96b64f09f09fcf73c93ffae693774e03134ce97575610b5c728794ff55224265 SHA512 571eb540d7994eec1a94b7eede8dd225a3ad2a7209018e32086b47d5758c9ce5ff751b15c843176a9b50ae6455445a18871c736e291ae745b402c0254a4f63a7 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 -- cgit v1.2.3