upgpkg: Added changes from the official repos

5 files changed, 28 insertions, 300 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb431680d3ae..dd271b88997b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-firmware-git
 	pkgdesc = Firmware files for Linux
-	pkgver = 20221214.f3c283e
+	pkgver = 20230625.ee91452d
 	pkgrel = 1
 	url = https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary
 	arch = any
@@ -10,77 +10,71 @@ pkgbase = linux-firmware-git
 	makedepends = git
 	options = !strip
 	source = linux-firmware-git::git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git?signed
-	source = 0001-Add-support-for-compressing-firmware-in-copy-firmware.patch
-	source = 0001-Add-support-for-compressing-firmware-in-copy-firmware-modified.patch
-	source = allow-inplace-rebuild.patch
 	validpgpkeys = 4CDE8575E547BF835FE15807A31B6BD72486CFD6
 	sha256sums = SKIP
-	sha256sums = 41c73f88ac68a3aef01fd406ce6cdb87555c65e4816dab12df10740875551aa7
-	sha256sums = b3b94f7671c632e8d353e7fb9a3eb967b795b3b2f28a7c1994f28ed69f0dde9f
-	sha256sums = 33a486fc036ec2d2e99799550b61eab395e2dd27b0e02e52e0bd8b9f3810d003
 
 pkgname = linux-firmware-whence-git
 	pkgdesc = Firmware files for Linux - contains the WHENCE license file which documents the vendor license details
-	provides = linux-firmware-whence=20221214.f3c283e
+	provides = linux-firmware-whence=20230625.ee91452d
 	conflicts = linux-firmware-whence
 	conflicts = linux-firmware<=20211216.f682ecb
 
 pkgname = linux-firmware-git
 	depends = linux-firmware-whence
-	provides = linux-firmware=20221214.f3c283e
+	provides = linux-firmware=20230625.ee91452d
 	conflicts = linux-firmware
 
 pkgname = amd-ucode-git
 	pkgdesc = Microcode update image for AMD CPUs
 	license = custom
-	provides = amd-ucode=20221214.f3c283e
+	provides = amd-ucode=20230625.ee91452d
 	conflicts = amd-ucode
 
 pkgname = linux-firmware-nfp-git
 	pkgdesc = Firmware files for Linux - nfp / Firmware for Netronome Flow Processors
 	depends = linux-firmware-whence
-	provides = linux-firmware-nfp=20221214.f3c283e
+	provides = linux-firmware-nfp=20230625.ee91452d
 	conflicts = linux-firmware-nfp
 	conflicts = linux-firmware<=20211216.f682ecb
 
 pkgname = linux-firmware-mellanox-git
 	pkgdesc = Firmware files for Linux - mellanox / Firmware for Mellanox Spectrum switches
 	depends = linux-firmware-whence
-	provides = linux-firmware-mellanox=20221214.f3c283e
+	provides = linux-firmware-mellanox=20230625.ee91452d
 	conflicts = linux-firmware-mellanox
 	conflicts = linux-firmware<=20211216.f682ecb
 
 pkgname = linux-firmware-marvell-git
 	pkgdesc = Firmware files for Linux - marvell / Firmware for Marvell devices
 	depends = linux-firmware-whence
-	provides = linux-firmware-marvell=20221214.f3c283e
+	provides = linux-firmware-marvell=20230625.ee91452d
 	conflicts = linux-firmware-marvell
 	conflicts = linux-firmware<=20211216.f682ecb
 
 pkgname = linux-firmware-qcom-git
 	pkgdesc = Firmware files for Linux - qcom / Firmware for Qualcomm SoCs
 	depends = linux-firmware-whence
-	provides = linux-firmware-qcom=20221214.f3c283e
+	provides = linux-firmware-qcom=20230625.ee91452d
 	conflicts = linux-firmware-qcom
 	conflicts = linux-firmware<=20211216.f682ecb
 
 pkgname = linux-firmware-liquidio-git
 	pkgdesc = Firmware files for Linux - liquidio / Firmware for Cavium LiquidIO server adapters
 	depends = linux-firmware-whence
-	provides = linux-firmware-liquidio=20221214.f3c283e
+	provides = linux-firmware-liquidio=20230625.ee91452d
 	conflicts = linux-firmware-liquidio
 	conflicts = linux-firmware<=20211216.f682ecb
 
 pkgname = linux-firmware-qlogic-git
 	pkgdesc = Firmware files for Linux - qlogic / Firmware for QLogic devices
 	depends = linux-firmware-whence
-	provides = linux-firmware-qlogic=20221214.f3c283e
+	provides = linux-firmware-qlogic=20230625.ee91452d
 	conflicts = linux-firmware-qlogic
 	conflicts = linux-firmware<=20211216.f682ecb
 
 pkgname = linux-firmware-bnx2x-git
 	pkgdesc = Firmware files for Linux - bnx2x / Firmware for Broadcom NetXtreme II 10Gb ethernet adapters
 	depends = linux-firmware-whence
-	provides = linux-firmware-bnx2x=20221214.f3c283e
+	provides = linux-firmware-bnx2x=20230625.ee91452d
 	conflicts = linux-firmware-bnx2x
 	conflicts = linux-firmware<=20211216.f682ecb
diff --git a/0001-Add-support-for-compressing-firmware-in-copy-firmware-modified.patch b/0001-Add-support-for-compressing-firmware-in-copy-firmware-modified.patch
deleted file mode 100644
index 6ed40db17215..000000000000
--- a/0001-Add-support-for-compressing-firmware-in-copy-firmware-modified.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:
- 	install -d $(DESTDIR)$(FIRMWAREDIR)
- 	./copy-firmware.sh $(DESTDIR)$(FIRMWAREDIR)
-+
-+installcompress:
-+	install -d $(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/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 93d82e4a2c4e..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"
--    mkdir -p $destdir/$(dirname "$f")
--    cp -d "$f" $destdir/"$f"
-+    test -f "$f$cmpxtn" || continue
-+    $verbose "copying file $f$cmpxtn"
-+    mkdir -p $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"
--        mkdir -p $destdir/$(dirname "$f")
-+    if test -L "$f$cmpxtn"; then
-+        test -f "$destdir/$f$cmpxtn" && continue
-+        $verbose "copying link $f$cmpxtn"
-+        mkdir -p $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"
--        mkdir -p $destdir/$(dirname "$f")
--        ln -sf "$d" "$destdir/$f"
-+        $verbose "creating link $f$cmpxtn -> $d$cmpxtn"
-+        mkdir -p $destdir/$(dirname "$f$cmpxtn")
-+        ln -sf "$d$cmpxtn" "$destdir/$f$cmpxtn"
-     fi
- done
- 
--- 
-2.29.2
-
diff --git a/PKGBUILD b/PKGBUILD
index cb172fde68e5..ff322294af04 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=linux-firmware-git
 pkgname=(linux-firmware-whence-git linux-firmware-git amd-ucode-git
          linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x}-git
 )
-pkgver=20221214.f3c283e
+pkgver=20230625.ee91452d
 pkgrel=1
 pkgdesc="Firmware files for Linux"
 url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
@@ -15,24 +15,10 @@ arch=('any')
 makedepends=('git')
 options=(!strip)
 #branch=main
-source=("${pkgbase}::git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git?signed"
-         0001-Add-support-for-compressing-firmware-in-copy-firmware.patch
-         0001-Add-support-for-compressing-firmware-in-copy-firmware-modified.patch
-         allow-inplace-rebuild.patch)
-sha256sums=('SKIP'
-            '41c73f88ac68a3aef01fd406ce6cdb87555c65e4816dab12df10740875551aa7'
-            'b3b94f7671c632e8d353e7fb9a3eb967b795b3b2f28a7c1994f28ed69f0dde9f'
-            '33a486fc036ec2d2e99799550b61eab395e2dd27b0e02e52e0bd8b9f3810d003')
+source=("${pkgbase}::git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git?signed")
+sha256sums=('SKIP')
 validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer <jwboyer@fedoraproject.org>
 
-prepare() {
-  cd ${pkgbase}
-
-  # add firmware compression support - patch taken from Fedora
-  patch -Np1 -i ../0001-Add-support-for-compressing-firmware-in-copy-firmware-modified.patch
-  patch -Np1 -i ../allow-inplace-rebuild.patch
-}
-
 pkgver() {
   cd ${pkgbase}
 
@@ -80,17 +66,25 @@ package_linux-firmware-git() {
 
   cd ${pkgbase}
 
-  make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware installcompress
+  # reverted to xz compression (https://bugs.archlinux.org/task/78892)
+  #ZSTD_CLEVEL=19 make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware install-zst
+  make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware install-xz
 
-  # 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%-git}.conf"
+  # useless without CONFIG_MICROCODE_LATE_LOADING
+  # https://bugs.archlinux.org/task/46591
+  #
+  # # 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%-git}.conf"
 
   install -Dt "${pkgdir}/usr/share/licenses/${pkgname%-git}" -m644 LICEN*
 
-  # split
   cd "${pkgdir}"
 
+  # remove arm64 firmware https://bugs.archlinux.org/task/76583
+  rm usr/lib/firmware/mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img.xz
+
+  # split
   _pick linux-firmware-nfp usr/lib/firmware/netronome
   _pick linux-firmware-nfp usr/share/licenses/${pkgname%-git}/LICENCE.Netronome
 
@@ -100,7 +94,7 @@ package_linux-firmware-git() {
   _pick linux-firmware-marvell usr/share/licenses/${pkgname%-git}/LICENCE.{Marvell,NXP}
 
   _pick linux-firmware-qcom usr/lib/firmware/{qcom,a300_*}
-  _pick linux-firmware-qcom usr/share/licenses/${pkgname%-git}/LICENSE.qcom
+  _pick linux-firmware-qcom usr/share/licenses/${pkgname%-git}/LICENSE.qcom*
 
   _pick linux-firmware-liquidio usr/lib/firmware/liquidio
   _pick linux-firmware-liquidio usr/share/licenses/${pkgname%-git}/LICENCE.cavium_liquidio
@@ -147,8 +141,6 @@ package_linux-firmware-marvell-git() {
   depends=('linux-firmware-whence')
 
   mv -v linux-firmware-marvell/* "${pkgdir}"
-  # remove arm64 firmware #76583
-  rm "${pkgdir}"/usr/lib/firmware/mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img.xz
 }
 
 package_linux-firmware-qcom-git() {
diff --git a/allow-inplace-rebuild.patch b/allow-inplace-rebuild.patch
deleted file mode 100644
index 8296a08b0db0..000000000000
--- a/allow-inplace-rebuild.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Force xz to overwrite existing compressed files.
---- a/copy-firmware.sh	2022-01-30 18:38:18.701300135 +0300
-+++ b/copy-firmware.sh	2022-01-30 18:38:41.371743430 +0300
-@@ -42,7 +42,7 @@
-     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"
-+       xz -fC crc32 "$f"
-     done
- fi
-