copy change of amd-ucode from official repos

also add public key file

3 files changed, 88 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abd4c695d3fe..5173ee4724cd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-firmware-git
 	pkgdesc = Firmware files for Linux
-	pkgver = 20231215.c156e6be
+	pkgver = 20240220.97b693d2
 	pkgrel = 1
 	url = https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary
 	arch = any
@@ -16,66 +16,17 @@ pkgbase = linux-firmware-git
 
 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=20231215.c156e6be
+	provides = linux-firmware-whence=20240220.97b693d2
 	conflicts = linux-firmware-whence
 	conflicts = linux-firmware<=20211216.f682ecb
 
 pkgname = linux-firmware-git
 	depends = linux-firmware-whence
-	provides = linux-firmware=20231215.c156e6be
+	provides = linux-firmware=20240220.97b693d2
 	conflicts = linux-firmware
 
 pkgname = amd-ucode-git
 	pkgdesc = Microcode update image for AMD CPUs
 	license = custom
-	provides = amd-ucode=20231215.c156e6be
+	provides = amd-ucode=20240220.97b693d2
 	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=20231215.c156e6be
-	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=20231215.c156e6be
-	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=20231215.c156e6be
-	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=20231215.c156e6be
-	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=20231215.c156e6be
-	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=20231215.c156e6be
-	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=20231215.c156e6be
-	conflicts = linux-firmware-bnx2x
-	conflicts = linux-firmware<=20211216.f682ecb
diff --git a/PKGBUILD b/PKGBUILD
index 3d6cb71ebd1f..a98ac3ff6be2 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=20231215.c156e6be
+pkgver=20240220.97b693d2
 pkgrel=1
 pkgdesc="Firmware files for Linux"
 url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
@@ -81,6 +81,8 @@ package_linux-firmware-git() {
   rm usr/lib/firmware/mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img.zst
 
   # split
+  _pick amd-ucode usr/lib/firmware/amd-ucode
+
   _pick linux-firmware-nfp usr/lib/firmware/netronome
   _pick linux-firmware-nfp usr/share/licenses/${pkgname%-git}/LICENCE.Netronome
 
@@ -107,6 +109,8 @@ package_amd-ucode-git() {
   pkgdesc="Microcode update image for AMD CPUs"
   license=(custom)
 
+  mv -v amd-ucode/* "${pkgdir}"
+
   install -Dt "${pkgdir}/boot" -m644 amd-ucode.img
 
   install -Dt "${pkgdir}/usr/share/licenses/${pkgname%-git}" -m644 ${pkgbase}/LICENSE.amd-ucode
diff --git a/keys/pgp/4CDE8575E547BF835FE15807A31B6BD72486CFD6.asc b/keys/pgp/4CDE8575E547BF835FE15807A31B6BD72486CFD6.asc
new file mode 100644
index 000000000000..3c11a0a65dcc
--- /dev/null
+++ b/keys/pgp/4CDE8575E547BF835FE15807A31B6BD72486CFD6.asc
@@ -0,0 +1,79 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+DmtUgeBWSPWnSoAlIjsYDumNoHd5PpI=
+=Xq/w
+-----END PGP PUBLIC KEY BLOCK-----