gentoo auto-resync : 21:10:2024 - 04:04:33

3 files changed, 17 insertions, 6 deletions

diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index b003fcde63b3..196225e5e976 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -2,7 +2,7 @@ AUX 35-amd-microcode-systemd.install 1276 BLAKE2B 02931b234a85400824d61e815e6f65
 AUX 35-amd-microcode.install 1321 BLAKE2B 4205a10d0224869245b62707ae830dd290dfd198dacd2db9702ea4a7e48408e18c398940d15066bf9cd88217b4d35fbd2b63578d2354bc138072f17a0b5cfcc9 SHA512 037c10c4be658022cab76fda45a41bcf4e49d31470444c719bf2eba04a73b24d6a3eab7404c5f194f812f136e8503336768090b82f027717df4712e4725f0cf5
 AUX linux-firmware-check-whence.patch 1414 BLAKE2B ba6e076e4ffe529b4b763445145251a99d5ee1e6f85134dbda973e87ef929e558638d7b1a88add77afbeecfabb84686a692dc37809595c9c01a0824812a9d5de SHA512 a118251e934ae3c3f8be30579c66edfa0859b4271832b3776d12d04d128f593296d03b9cf35d28d46683b04c250f78db269f0b4674c0428ce03d402eef657d76
 AUX linux-firmware-copy-firmware-r4.patch 1538 BLAKE2B 65712bb1b6ba0d4c2a04f2e202a4a9ee272aca364813825f568a6544b7b63537fc44a4304269fd323c9299f8dce4744414f8fe859958d5f9b52d57c9822615b4 SHA512 56694eb4ae6ec13093f1e3f86df9f5494109693f6456ed6d3ad2b2041deae0ce36e2919d256025f7442fcf0e966c0954ce4634c717e4e7cb68fc6d34ae5554f3
-AUX linux-firmware-copy-firmware-r5.patch 1533 BLAKE2B a1f0d7dbfbf2fcdebc8eb9d3b1796fd4cc97b1c55ca5630d3921ef82978e7d97becbbd50de35c3f74888fa95612e1c9898e588ac58e8b9a6a38d5144573e58e5 SHA512 22922b6893c73c774a506cf5b65f7bad007750ca6c17e5acde7467805b99528d27f47d0e9fb1d9f35836d7e91e182fd13ea363892f4a8e350583da26937f8b7a
+AUX linux-firmware-copy-firmware-r6.patch 1843 BLAKE2B 8d848533a3f6b60e3053eb2b7761b87f1a11467c8300e54124442c368b7e83592137537108aab59f2951ca3e316052ee431f685c6549674abba4145eed948dd2 SHA512 b18f6aa4006526ff7b2d0d3d47491aa0f275cca257d491ebfb631b7f7c8869844e5a44f66874d07602d00be2927a01a0e25c1757c8c8af982fed09834d589578
 AUX linux-firmware-make-amd-ucode-img.bash 2911 BLAKE2B 94586ef124310da2314655ebb517c71e3ac73ca636df3c534d4bd5de4ab175b5aa3d40bffe5c126e292a08cff677542df276660380d3b1f474326c9e456b2ee1 SHA512 21465fe141d5c58bb9a50653788f1084833b0a698aaca4b2dc589bd9129c9f3ee87f179791ef5dd8fda4182a48e378e0f83abbb452422b3462b8e81b57ca43a0
 DIST linux-firmware-20240709.tar.xz 376713860 BLAKE2B 33ea1ca0ffafa37b72604386954f05d9eab09dba29c7d28a8b34dabd2c3133b6d4727998b5dad27a8e629877fc63555ee96359a84eb1d133603c3098bac49e72 SHA512 705d092b0ec5002300a91b679e806137e92bf3d4e1edd998e885e8da88297d8791048ee8ad9727546b13fa08aeadab54254eaed8f6f5a9663429eb54746dfb63
 DIST linux-firmware-20240811.tar.xz 379287388 BLAKE2B abcd5eff8e7bd7200079a691e4c09dcc7f349e09eb35c3eae594a7b27eef714767f0eaa92e259b32f4d347f7b6a2ee710332b728546305a01558d732dd947ac6 SHA512 4ea6c24f4bf60eb7ae4cd2993ce4e9dadb03ca7e92f8ccb4778fcebd5c32e16ba8c6095e74b9ed6a111f1b44b983177b52f35a9ad8be7d1dfec2de29a296b8d1
@@ -11,6 +11,6 @@ DIST linux-firmware-20241017.tar.xz 397400292 BLAKE2B b158855a61324e3194274b0d6d
 EBUILD linux-firmware-20240709-r2.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
 EBUILD linux-firmware-20240811-r1.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
 EBUILD linux-firmware-20240909-r1.ebuild 11025 BLAKE2B 8362004307337300997032efa50bbcedf2380c7c1c66915773396b2c5567ccab067d596cf8cdd1c607bcce4e956cd3e1e7b55fbeaa4537bb63d40eac498df997 SHA512 271a506d8b039af9209df63145a4522dc245fbd554a3a95478bf8911e73b28287073c76e549368f3639ed85a65def43b1bd3666b49e645006dba09f57fb7bf36
-EBUILD linux-firmware-20241017.ebuild 11056 BLAKE2B 1265c40e4e8a2cacd9618dd1a1b3bdc1cc60cd628c2f1b295e6c159bd72bf511fd0d9bed49768d9348643dab3224e17ccdeb1f3fec20fcd4a61e69e50b1f90ad SHA512 847498d9f90b0b329bf4ea9256168175666d5620d6d73dca4f5951ea1c809c17e1b53e516ff171c9b9e0b9f60a7c48787cc0cae6d1fd0a76f094a82954a4c955
+EBUILD linux-firmware-20241017-r2.ebuild 11056 BLAKE2B 875e7dc450cc4c9aec854268a19b8de7a769a867e805f59a9a00e52d92cc5e46170012d144c93f41ecd1cd0df6ae15edb913a80fa68dc8ea0b71d97b87e36a33 SHA512 81ad913d35652ae6f564944de1d47fd25f6796099023922ebe7abad65e9498bf43fad33cc756aedaabe4710901bf404fb6756b38838b6ee0d78aa15198382da7
 EBUILD linux-firmware-99999999.ebuild 11375 BLAKE2B aa565e1987a561216363d1166c7d41a3a25d714472c82a0d38c95c44db5d6d4deef3d50a45abd38915aa895fc071b54becd178d09dd23a7f2d80b2ed7d3a80e5 SHA512 829fc5efe1107e7090c1d7fc58248886f672a24c15b4e02944a97b6f948bcc69c4defebbaa42a82b283639b7bf942ee5c45315aa3b1190f582ec1ed75726b937
 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
diff --git a/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r5.patch b/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r6.patch
index 15e6ba0ebeb6..58d77d4b090d 100644
--- a/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r5.patch
+++ b/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r6.patch
@@ -1,5 +1,5 @@
---- a/copy-firmware.sh	2024-10-18 06:39:44.742506779 -0400
-+++ b/copy-firmware.sh	2024-10-18 06:42:04.853498628 -0400
+--- 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
              ;;
@@ -30,7 +30,18 @@
  
  # 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 "${f}"; then continue; fi
++    [ -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
diff --git a/sys-kernel/linux-firmware/linux-firmware-20241017.ebuild b/sys-kernel/linux-firmware/linux-firmware-20241017-r2.ebuild
index 4164fda300c8..04e0082e6dbe 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20241017.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20241017-r2.ebuild
@@ -74,7 +74,7 @@ IDEPEND="
 
 QA_PREBUILT="*"
 PATCHES=(
-	"${FILESDIR}"/${PN}-copy-firmware-r5.patch
+	"${FILESDIR}"/${PN}-copy-firmware-r6.patch
 	"${FILESDIR}"/${PN}-check-whence.patch
 )