upgpkg: linux-firmware 20220309.cd01f85-1: sync with tag 20220310

2 files changed, 21 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index de6c348e08a2..72ca3d4763ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-firmware-uncompressed
 	pkgdesc = Firmware files for Linux (without module compression)
-	pkgver = 20220209.6342082
+	pkgver = 20220309.cd01f85
 	pkgrel = 1
 	url = https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary
 	arch = any
@@ -9,7 +9,7 @@ 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=20220209?signed
+	source = git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#tag=20220310?signed
 	source = 0001-Add-support-for-compressing-firmware-in-copy-firmware.patch
 	validpgpkeys = 4CDE8575E547BF835FE15807A31B6BD72486CFD6
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index c5c23ce6c098..36ef9d33223d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@ pkgbase=linux-firmware-uncompressed
 pkgname=(linux-firmware-uncompressed amd-ucode-uncompressed
          linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x}-uncompressed
 )
-_tag=20220209
-pkgver=20220209.6342082
+_tag=20220310
+pkgver=20220309.cd01f85
 pkgrel=1
 pkgdesc="Firmware files for Linux (without module compression)"
 url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
@@ -24,17 +24,6 @@ validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer <jwboyer@
 _backports=(
 )
 
-
-_pick() {
-  local p="$1" f d; shift
-  for f; do
-    d="$srcdir/$p/${f#$pkgdir/}"
-    mkdir -p "$(dirname "$d")"
-    mv "$f" "$d"
-    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
-  done
-}
-
 prepare() {
   cd ${_pkgbase}
 
@@ -60,7 +49,7 @@ build() {
   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 
+  if [[ -n ${SOURCE_DATE_EPOCH} ]]; then
     touch -d @${SOURCE_DATE_EPOCH} kernel/x86/microcode/AuthenticAMD.bin
   fi
 
@@ -70,6 +59,16 @@ build() {
     bsdtar --null -cf - --format=newc @- > amd-ucode.img
 }
 
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
 #package_linux-firmware-whence() {
 #  pkgdesc+=" - contains the WHENCE license file which documents the vendor license details"
 #  cd "$_pkgbase"
@@ -95,21 +94,21 @@ package_linux-firmware-uncompressed() {
   cd "$pkgdir"
   _pick linux-firmware-nfp usr/lib/firmware/netronome
   _pick linux-firmware-nfp usr/share/licenses/${pkgname}/LICENCE.Netronome
-   
+
   _pick linux-firmware-mellanox usr/lib/firmware/mellanox
-  
+
   _pick linux-firmware-marvell usr/lib/firmware/{libertas,mwl8k,mwlwifi,mrvl}
   _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-liquidio usr/lib/firmware/liquidio
   _pick linux-firmware-liquidio usr/share/licenses/${pkgname}/LICENCE.cavium_liquidio
-  
+
   _pick linux-firmware-qlogic usr/lib/firmware/{qlogic,qed,ql2???_*,c{b,t,t2}fw-*}
   _pick linux-firmware-qlogic usr/share/licenses/${pkgname}/LICENCE.{qla1280,qla2xxx}
-  
+
   _pick linux-firmware-bnx2x usr/lib/firmware/bnx2x*
 }