autu: Update to 20230804.7be2766d-1

3 files changed, 41 insertions, 162 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c46d0fba478..f00f59e5bd19 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-firmware-uncompressed
 	pkgdesc = Firmware files for Linux (without module compression)
-	pkgver = 20230117.7e4f0ed
+	pkgver = 20230804.7be2766d
 	pkgrel = 1
 	url = https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary
 	arch = any
@@ -9,11 +9,9 @@ pkgbase = linux-firmware-uncompressed
 	license = custom
 	makedepends = git
 	options = !strip
-	source = git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=20230117?signed
-	source = 0001-Add-support-for-compressing-firmware-in-copy-firmware.patch
+	source = git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=20230804?signed
 	validpgpkeys = 4CDE8575E547BF835FE15807A31B6BD72486CFD6
 	sha256sums = SKIP
-	sha256sums = aa11b2eed9c0be42571b45eb7153908a43290f02a5fc715aefcaa81030a1832f
 
 pkgname = linux-firmware-uncompressed
 	depends = linux-firmware-whence
diff --git a/0001-Add-support-for-compressing-firmware-in-copy-firmware.patch b/0001-Add-support-for-compressing-firmware-in-copy-firmware.patch
deleted file mode 100644
index 17fb733bb746..000000000000
--- a/0001-Add-support-for-compressing-firmware-in-copy-firmware.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 7eec2b56f54c778d5bd6e7aea49ee03e3b76e769 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Fri, 22 Jan 2021 20:36:23 +0000
-Subject: [PATCH v2] Add support for compressing firmware in copy-firmware.sh
-
-As of kernel 5.3 there's initial support for loading compressed firmware.
-At this stage the only supported compression methis is "xz -C crc32" but
-this option brings significant benefits.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
----
-
-v2: quote filename for xz command
-
- Makefile         |  4 ++++
- copy-firmware.sh | 47 +++++++++++++++++++++++++++++++----------------
- 2 files changed, 35 insertions(+), 16 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e1c362f..9a48471 100644
---- a/Makefile
-+++ b/Makefile
-@@ -11,3 +11,7 @@ check:
- install:
- 	mkdir -p $(DESTDIR)$(FIRMWAREDIR)
- 	./copy-firmware.sh $(DESTDIR)$(FIRMWAREDIR)
-+
-+installcompress:
-+	mkdir -p $(DESTDIR)$(FIRMWAREDIR)
-+	./copy-firmware.sh -C $(DESTDIR)$(FIRMWAREDIR)
-diff --git a/copy-firmware.sh b/copy-firmware.sh
-index 9b46b63..0dd2e5c 100755
---- a/copy-firmware.sh
-+++ b/copy-firmware.sh
-@@ -6,6 +6,7 @@
- 
- verbose=:
- prune=no
-+compress=no
- 
- while test $# -gt 0; do
-     case $1 in
-@@ -19,6 +20,11 @@ while test $# -gt 0; do
-             shift
-             ;;
- 
-+        -C | --compress)
-+            compress=yes
-+            shift
-+            ;;
-+
-         *)
-             if test "x$destdir" != "x"; then
-                 echo "ERROR: unknown command-line options: $@"
-@@ -31,40 +37,49 @@ while test $# -gt 0; do
-     esac
- done
- 
-+if test "x$compress" = "xyes"; then
-+    cmpxtn=.xz
-+    grep '^File:' WHENCE | sed -e's/^File: *//g' -e's/"//g' | while read f; do
-+       test -f "$f" || continue
-+       $verbose "compressing $f"
-+       xz -C crc32 "$f"
-+    done
-+fi
-+
- grep '^File:' WHENCE | sed -e's/^File: *//g' -e's/"//g' | while read f; do
--    test -f "$f" || continue
--    $verbose "copying file $f"
--    install -d $destdir/$(dirname "$f")
--    cp -d "$f" $destdir/"$f"
-+    test -f "$f$cmpxtn" || continue
-+    $verbose "copying file $f$cmpxtn"
-+    install -d $destdir/$(dirname "$f$cmpxtn")
-+    cp -d "$f$cmpxtn" $destdir/"$f$cmpxtn"
- done
- 
- grep -E '^Link:' WHENCE | sed -e's/^Link: *//g' -e's/-> //g' | while read f d; do
--    if test -L "$f"; then
--        test -f "$destdir/$f" && continue
--        $verbose "copying link $f"
--        install -d $destdir/$(dirname "$f")
-+    if test -L "$f$cmpxtn"; then
-+        test -f "$destdir/$f$cmpxtn" && continue
-+        $verbose "copying link $f$cmpxtn"
-+        install -d $destdir/$(dirname "$f$cmpxtn")
-         cp -d "$f" $destdir/"$f"
- 
-         if test "x$d" != "x"; then
--            target=`readlink "$f"`
-+            target=`readlink "$f$cmpxtn"`
- 
-             if test "x$target" != "x$d"; then
-                 $verbose "WARNING: inconsistent symlink target: $target != $d"
-             else
-                 if test "x$prune" != "xyes"; then
--                    $verbose "WARNING: unneeded symlink detected: $f"
-+                    $verbose "WARNING: unneeded symlink detected: $f$cmpxtn"
-                 else
--                    $verbose "WARNING: pruning unneeded symlink $f"
--                    rm -f "$f"
-+                    $verbose "WARNING: pruning unneeded symlink $f$cmpxtn"
-+                    rm -f "$f$cmpxtn"
-                 fi
-             fi
-         else
--            $verbose "WARNING: missing target for symlink $f"
-+            $verbose "WARNING: missing target for symlink $f$cmpxtn"
-         fi
-     else
--        $verbose "creating link $f -> $d"
--        install -d $destdir/$(dirname "$f")
--        ln -sf "$d" "$destdir/$f"
-+        $verbose "creating link $f$cmpxtn -> $d$cmpxtn"
-+        install -d $destdir/$(dirname "$f$cmpxtn")
-+        ln -sf "$d$cmpxtn" "$destdir/$f$cmpxtn"
-     fi
- done
- 
--- 
-2.29.2
-
diff --git a/PKGBUILD b/PKGBUILD
index e5204af1ab6e..940eb6a4bf60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,48 @@
-# Maintainer: Jonathon Fernyhough <jonathon+mx2+dev>
+# Maintainer: Chris Severance aur.severach aATt spamgourmet dott com
+# Contriburor: Jonathon Fernyhough <jonathon+mx2+dev>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 
-_pkgbase=linux-firmware
-pkgbase=linux-firmware-uncompressed
-pkgname=(linux-firmware-uncompressed amd-ucode-uncompressed
-         linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x}-uncompressed
+pkgbase=linux-firmware
+pkgname=(linux-firmware-whence linux-firmware amd-ucode
+         linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x}
 )
-_tag=20230117
-pkgver=20230117.7e4f0ed
+_tag=20230804
+pkgver=20230804.7be2766d
 pkgrel=1
-pkgdesc="Firmware files for Linux (without module compression)"
+pkgdesc="Firmware files for Linux"
+pkgdesc+=' (without module compression)'
 url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
 license=('GPL2' 'GPL3' 'custom')
 arch=('any')
 makedepends=('git')
 options=(!strip)
-source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=${_tag}?signed"
-         0001-Add-support-for-compressing-firmware-in-copy-firmware.patch)
-sha256sums=('SKIP'
-            'aa11b2eed9c0be42571b45eb7153908a43290f02a5fc715aefcaa81030a1832f')
+source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=${_tag}?signed")
+sha256sums=('SKIP')
 validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer <jwboyer@fedoraproject.org>
 
+_pkgbase="${pkgbase}"
+pkgbase+='-uncompressed'
+pkgname=("${pkgname[@]/%/-uncompressed}")
+pkgname=("${pkgname[@]:1}") # remove whence
+
 _backports=(
+  f2eb058afc57348cde66852272d6bf11da1eef8f  # fixes for "inception": https://www.amd.com/en/resources/product-security/bulletin/amd-sb-7005.html
 )
 
 prepare() {
-  cd ${_pkgbase}
+  local pkgbase="${_pkgbase}"
+  cd ${pkgbase}
 
   local _c
   for _c in "${_backports[@]}"; do
     git log --oneline -1 "${_c}"
     git cherry-pick -n "${_c}"
   done
-
-  # add firmware compression support - patch taken from Fedora
-  patch -Np1 -i ../0001-Add-support-for-compressing-firmware-in-copy-firmware.patch
 }
 
 pkgver() {
-  cd ${_pkgbase}
+  local pkgbase="${_pkgbase}"
+  cd ${pkgbase}
 
   # Commit date + short rev
   echo $(TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD).$(git rev-parse --short HEAD)
@@ -46,7 +50,8 @@ pkgver() {
 
 build() {
   mkdir -p kernel/x86/microcode
-  cat ${_pkgbase}/amd-ucode/microcode_amd*.bin > kernel/x86/microcode/AuthenticAMD.bin
+  local pkgbase="${_pkgbase}"
+  cat ${pkgbase}/amd-ucode/microcode_amd*.bin > kernel/x86/microcode/AuthenticAMD.bin
 
   # Reproducibility: set the timestamp on the bin file
   if [[ -n ${SOURCE_DATE_EPOCH} ]]; then
@@ -69,30 +74,31 @@ _pick() {
   done
 }
 
-#package_linux-firmware-whence() {
-#  pkgdesc+=" - contains the WHENCE license file which documents the vendor license details"
-#
-#  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 ${_pkgbase}/WHENCE
-#}
+package_linux-firmware-whence-uncompressed() {
+  pkgdesc+=" - contains the WHENCE license file which documents the vendor license details"
+
+  local pkgbase="${_pkgbase}"
+  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 ${pkgbase}/WHENCE
+}
 
 package_linux-firmware-uncompressed() {
   depends=('linux-firmware-whence')
   conflicts=('linux-firmware')
   provides=('linux-firmware')
-  
-  cd ${_pkgbase}
+  local pkgbase="${_pkgbase}"
 
-  make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware install
+  cd ${pkgbase}
 
-  # Trigger a microcode reload for configurations not using early updates
-  echo 'w /sys/devices/system/cpu/microcode/reload - - - - 1' |
-    install -Dm644 /dev/stdin "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+  ZSTD_CLEVEL=19 make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware install #-zst
 
   install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICEN*
 
-  # split
   cd "${pkgdir}"
 
+  # remove arm64 firmware https://bugs.archlinux.org/task/76583
+  rm -f usr/lib/firmware/mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img*
+
+  # split
   _pick linux-firmware-nfp usr/lib/firmware/netronome
   _pick linux-firmware-nfp usr/share/licenses/${pkgname}/LICENCE.Netronome
 
@@ -102,7 +108,7 @@ package_linux-firmware-uncompressed() {
   _pick linux-firmware-marvell usr/share/licenses/${pkgname}/LICENCE.{Marvell,NXP}
 
   _pick linux-firmware-qcom usr/lib/firmware/{qcom,a300_*}
-  _pick linux-firmware-qcom usr/share/licenses/${pkgname}/LICENSE.qcom
+  _pick linux-firmware-qcom usr/share/licenses/${pkgname}/LICENSE.qcom*
 
   _pick linux-firmware-liquidio usr/lib/firmware/liquidio
   _pick linux-firmware-liquidio usr/share/licenses/${pkgname}/LICENCE.cavium_liquidio
@@ -118,10 +124,11 @@ package_amd-ucode-uncompressed() {
   license=(custom)
   conflicts=('amd-ucode')
   provides=('amd-ucode')
+  local pkgbase="${_pkgbase}"
 
   install -Dt "${pkgdir}/boot" -m644 amd-ucode.img
 
-  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 ${_pkgbase}/LICENSE.amd-ucode
+  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 ${pkgbase}/LICENSE.amd-ucode
 }
 
 package_linux-firmware-nfp-uncompressed() {
@@ -149,9 +156,6 @@ package_linux-firmware-marvell-uncompressed() {
   provides=('linux-firmware-marvell')
 
   mv -v linux-firmware-marvell/* "${pkgdir}"
-
-  # remove arm64 firmware #76583
-  rm "${pkgdir}"/usr/lib/firmware/mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img
 }
 
 package_linux-firmware-qcom-uncompressed() {