Add a change from official repo

make the patch match the source,
make a path match other paths

3 files changed, 18 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3845bbb3fc0..bb431680d3ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-firmware-git
 	pkgdesc = Firmware files for Linux
-	pkgver = 20220531.eaee2da
+	pkgver = 20221214.f3c283e
 	pkgrel = 1
 	url = https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary
 	arch = any
@@ -16,71 +16,71 @@ pkgbase = linux-firmware-git
 	validpgpkeys = 4CDE8575E547BF835FE15807A31B6BD72486CFD6
 	sha256sums = SKIP
 	sha256sums = 41c73f88ac68a3aef01fd406ce6cdb87555c65e4816dab12df10740875551aa7
-	sha256sums = 0e1840112f4c439da51860437181a5ec3673546744d41716238dc1b357fc2880
+	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=20220531.eaee2da
+	provides = linux-firmware-whence=20221214.f3c283e
 	conflicts = linux-firmware-whence
 	conflicts = linux-firmware<=20211216.f682ecb
 
 pkgname = linux-firmware-git
 	depends = linux-firmware-whence
-	provides = linux-firmware=20220531.eaee2da
+	provides = linux-firmware=20221214.f3c283e
 	conflicts = linux-firmware
 
 pkgname = amd-ucode-git
 	pkgdesc = Microcode update image for AMD CPUs
 	license = custom
-	provides = amd-ucode=20220531.eaee2da
+	provides = amd-ucode=20221214.f3c283e
 	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=20220531.eaee2da
+	provides = linux-firmware-nfp=20221214.f3c283e
 	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=20220531.eaee2da
+	provides = linux-firmware-mellanox=20221214.f3c283e
 	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=20220531.eaee2da
+	provides = linux-firmware-marvell=20221214.f3c283e
 	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=20220531.eaee2da
+	provides = linux-firmware-qcom=20221214.f3c283e
 	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=20220531.eaee2da
+	provides = linux-firmware-liquidio=20221214.f3c283e
 	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=20220531.eaee2da
+	provides = linux-firmware-qlogic=20221214.f3c283e
 	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=20220531.eaee2da
+	provides = linux-firmware-bnx2x=20221214.f3c283e
 	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
index ba24592903b2..6ed40db17215 100644
--- a/0001-Add-support-for-compressing-firmware-in-copy-firmware-modified.patch
+++ b/0001-Add-support-for-compressing-firmware-in-copy-firmware-modified.patch
@@ -22,7 +22,7 @@ index e1c362f..9a48471 100644
 +++ b/Makefile
 @@ -11,3 +11,7 @@ check:
  install:
- 	mkdir -p $(DESTDIR)$(FIRMWAREDIR)
+ 	install -d $(DESTDIR)$(FIRMWAREDIR)
  	./copy-firmware.sh $(DESTDIR)$(FIRMWAREDIR)
 +
 +installcompress:
diff --git a/PKGBUILD b/PKGBUILD
index 7d68733d1a08..cb172fde68e5 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=20220531.eaee2da
+pkgver=20221214.f3c283e
 pkgrel=1
 pkgdesc="Firmware files for Linux"
 url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
@@ -21,7 +21,7 @@ source=("${pkgbase}::git+https://git.kernel.org/pub/scm/linux/kernel/git/firmwar
          allow-inplace-rebuild.patch)
 sha256sums=('SKIP'
             '41c73f88ac68a3aef01fd406ce6cdb87555c65e4816dab12df10740875551aa7'
-            '0e1840112f4c439da51860437181a5ec3673546744d41716238dc1b357fc2880'
+            'b3b94f7671c632e8d353e7fb9a3eb967b795b3b2f28a7c1994f28ed69f0dde9f'
             '33a486fc036ec2d2e99799550b61eab395e2dd27b0e02e52e0bd8b9f3810d003')
 validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer <jwboyer@fedoraproject.org>
 
@@ -70,7 +70,7 @@ package_linux-firmware-whence-git() {
   provides=("${pkgname%-git}=$pkgver")
   pkgdesc+=" - contains the WHENCE license file which documents the vendor license details"
 
-  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${pkgbase}/WHENCE"
+  install -Dt "${pkgdir}/usr/share/licenses/${pkgname%-git}" -m644 ${pkgbase}/WHENCE
 }
 
 package_linux-firmware-git() {
@@ -147,6 +147,8 @@ 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() {