gentoo auto-resync : 16:02:2024 - 05:36:29

4 files changed, 6 insertions, 7 deletions

diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 226e27772278..81c0ee124b12 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index d7d09c9764bd..7f6cea238cb2 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,10 +1,10 @@
-AUX linux-firmware-copy-firmware-r2.patch 2181 BLAKE2B 98a5ac933fc07a8d2d61c9c0a1bd9065f271fc104cd57641232aa9a2c0cdc2addbe208d9dfdd1f8c86f886e76d487c809fc5635d4af716f5494e9a5c4d695657 SHA512 2019aa1a598b5f3dbcea4e2b041ecd3bcded225aae415960eadd5e728c3b37c3422fd760c8cb89da775980108dfe40be2b5c917980af8580a0b8476ba04e8be8
+AUX linux-firmware-copy-firmware-r3.patch 2210 BLAKE2B 06aa2fa8b9dce583aba07f0b64f05a8efa83d9c0f6fdf0820b28238396ad461a24edc0de7bec114ae235b4cf3c9b1d237db154d846b55c6ed6020d990d11fa41 SHA512 6c77ae4f439cfa53b113806841c55d127943dd57436a7fb6531a2f2103fa956184d312f904f6dd00abb8731907fb60d1ea13e7027d277d41d24fb7030f4c6a17
 AUX linux-firmware-copy-firmware.patch 2112 BLAKE2B 9cd89942838941dc7282c892c8af8c38fdd96dc87f38793ec550c8f871f372ca400515a48681a5e68880b4d9add22b39270cc126b2dc7b33cfa92bdbf12184eb SHA512 e1e46b07955ad44875a94214a1922dd392173039b56cd13903bfe83eb8ab38265f477a2d2c3733273578b733343e37af8b96b1ecf560c1f4b96ad07d614ab212
 DIST linux-firmware-20231211.tar.xz 358100480 BLAKE2B 91b9ef2d244d465e8d62d2c529f3481b1e28a9c30a143ef7d9f2fb3a2a0f9d7e96b64f09f09fcf73c93ffae693774e03134ce97575610b5c728794ff55224265 SHA512 571eb540d7994eec1a94b7eede8dd225a3ad2a7209018e32086b47d5758c9ce5ff751b15c843176a9b50ae6455445a18871c736e291ae745b402c0254a4f63a7
 DIST linux-firmware-20240115.tar.xz 363994604 BLAKE2B 00a0874cfbafe0fe57a841510c71e54e836efad65564b7fa30c334c2bcf909e235129035a6fa4ba090089492fb07beab945be82b3801ce8353fca20fa426ac85 SHA512 65100216a0dbe97ea0cdf3104dd59c95cafe883bd8c2a40f9369acb55d6f7260c1b51f233987d2f89cce93b2a952721a0484a6314cda49455986c597ff2050dd
 EBUILD linux-firmware-20231211.ebuild 11383 BLAKE2B 4bce49693e7e86f69da95cfd9123aa6e63bf39aeb2777408e54e6e9e633e877283244d346cb4c413ce144b6c2147f67433886c3d405078f9cb13bf4f0174c637 SHA512 7e4d282aab026c4de7e07925108967c8d523474dd8d5b88979716d7139a73bbaa0c384ba0ad6509fd661a1749c26165a8a23d8a70821fec3b2aefb0fd2bfe089
 EBUILD linux-firmware-20240115-r1.ebuild 11171 BLAKE2B f5f06b30440354756ac3193f3f8ba090692eeecae651a8883deb9d8c4e4eae227f456c2c470b6d141b1e23c6b89c02d2c6d90f6935b64f6effe4107203b00c9a SHA512 04086abefb4ead764e2d4c517ca0e8e88c8012ea38aaa35c32cd83e63d2edcdd00b8a569fb71629c192d26fe9582cf08379057c03042f3869a687f891d7d743e
-EBUILD linux-firmware-20240115-r2.ebuild 11122 BLAKE2B 115644735d1abe7e725c71b863e1f842cdb953b625015023e81e9c7fcf55b54f23d31b5d3caac2724a05cbbc36a1046f0c00d70db7870bab2fdde4d3e463209a SHA512 91efea99a99397908318b00260479f2453f78828652d35a2e673860b087d13776654a28b1879889158adf17c6d981837f1e6d5fd34c81422afe9d8d57365d985
+EBUILD linux-firmware-20240115-r3.ebuild 11122 BLAKE2B 1238d14554d60a2c7f4ec5120eb431ca21029272e4197a32eb427c1028badeb336f0d05c7b4a382d03e4159adb495c17f47274d65d72c9c4d6bf29fa05d43104 SHA512 61482c08600d805b59f1fe75f78355bda4e446c445104af479136f06f762a8d5dcb6659f2ddfba1bafd3bfdcabab2dee1e547ebd51e1e4f4c8c27c27a7a6b065
 EBUILD linux-firmware-20240115.ebuild 11383 BLAKE2B 4bce49693e7e86f69da95cfd9123aa6e63bf39aeb2777408e54e6e9e633e877283244d346cb4c413ce144b6c2147f67433886c3d405078f9cb13bf4f0174c637 SHA512 7e4d282aab026c4de7e07925108967c8d523474dd8d5b88979716d7139a73bbaa0c384ba0ad6509fd661a1749c26165a8a23d8a70821fec3b2aefb0fd2bfe089
 EBUILD linux-firmware-99999999.ebuild 11247 BLAKE2B 5beb777e773325535aa9b0ca75d20bb2c9dd2ae6aec098947b0eda7b5a9d140c898530ed0e8623168052bbf0a84b795a05718e07c241be946f8904d36dafdfdf SHA512 f5ff962e300cd5f4c2a74e6dd89ec2f9acdfccc836c2d2562246ee8599a8be44760626b7dfa1e193f1c1b8e6f630184cee39a25313f4b5410397e678b7c788a4
 MISC metadata.xml 1289 BLAKE2B 109336d30e5ec5fb5e679cff9b31e6f69c0b4f629e2aaf4d0d7b6c0db78c1ddcbbb0b283f724f2758207324b622c2af9dfe15874ab34b34876e3e4f58cb5ced6 SHA512 9b925b26bb58a39360ab5ff3cdd7d88bd489645e73f101209f0813a0b926b15dae34f28db05ff6419a0a62fab2ac84ae0546b5007ce17ad3611188bf7aeda3e5
diff --git a/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r2.patch b/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r3.patch
index 0c9b5ecfca70..0801b60f5ffa 100644
--- a/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r2.patch
+++ b/sys-kernel/linux-firmware/files/linux-firmware-copy-firmware-r3.patch
@@ -38,12 +38,11 @@ index 6757c6ce..d954230d 100755
          -*)
              if test "$compress" = "cat"; then
                  echo "ERROR: unknown command-line option: $1"
-@@ -85,6 +95,8 @@ fi
-+ echo "destdir is ${destdir}"
+@@ -85,6 +95,7 @@ fi
  # 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
      test -f "$f" || continue
-+	   if ! echo "${FIRMWARE_LIST}" | grep -q "${f}"; then continue; fi
++	   [ -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
@@ -51,7 +50,7 @@ index 6757c6ce..d954230d 100755
  
  # 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
-+	   if ! echo "${FIRMWARE_LIST}" | grep -q "${f}"; then continue; fi
++	   [ -n "${FIRMWARE_LIST}" ]  && if ! echo "${FIRMWARE_LIST}" | grep -q "${f}"; then continue; fi
      if test -L "$f$compext"; then
          test -f "$destdir/$f$compext" && continue
          $verbose "copying link $f$compext"
diff --git a/sys-kernel/linux-firmware/linux-firmware-20240115-r2.ebuild b/sys-kernel/linux-firmware/linux-firmware-20240115-r3.ebuild
index 13f076e3531b..b3fee43ebe5e 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20240115-r2.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20240115-r3.ebuild
@@ -64,7 +64,7 @@ RDEPEND="!savedconfig? (
 	)"
 
 QA_PREBUILT="*"
-PATCHES=( "${FILESDIR}"/${PN}-copy-firmware-r2.patch )
+PATCHES=( "${FILESDIR}"/${PN}-copy-firmware-r3.patch )
 
 pkg_pretend() {
 	use initramfs && mount-boot_pkg_pretend