added a patch to not call `makepkg -Cc`

3 files changed, 33 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 989efe14e33a..0296b738113b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-firmware-git
 	pkgdesc = Firmware files for Linux
-	pkgver = 20220119.0c6a7b3
+	pkgver = 20220124.eb8ea1b
 	pkgrel = 1
 	url = https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary
 	arch = any
@@ -11,71 +11,74 @@ pkgbase = linux-firmware-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 = allow-inplace-rebuild.patch
 	validpgpkeys = 4CDE8575E547BF835FE15807A31B6BD72486CFD6
 	sha256sums = SKIP
 	sha256sums = 41c73f88ac68a3aef01fd406ce6cdb87555c65e4816dab12df10740875551aa7
+	sha256sums = 33a486fc036ec2d2e99799550b61eab395e2dd27b0e02e52e0bd8b9f3810d003
 
 pkgname = linux-firmware-whence-git
-	provides = linux-firmware-whence=20220119.0c6a7b3
+	pkgdesc = Firmware files for Linux - contains the WHENCE license file which documents the vendor license details
+	provides = linux-firmware-whence=20220124.eb8ea1b
 	conflicts = linux-firmware-whence
 	conflicts = linux-firmware<=20211216.f682ecb
 
 pkgname = linux-firmware-git
 	depends = linux-firmware-whence
-	provides = linux-firmware=20220119.0c6a7b3
+	provides = linux-firmware=20220124.eb8ea1b
 	conflicts = linux-firmware
 
 pkgname = amd-ucode-git
 	pkgdesc = Microcode update image for AMD CPUs
 	license = custom
-	provides = amd-ucode=20220119.0c6a7b3
+	provides = amd-ucode=20220124.eb8ea1b
 	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=20220119.0c6a7b3
+	provides = linux-firmware-nfp=20220124.eb8ea1b
 	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=20220119.0c6a7b3
+	provides = linux-firmware-mellanox=20220124.eb8ea1b
 	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=20220119.0c6a7b3
+	provides = linux-firmware-marvell=20220124.eb8ea1b
 	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=20220119.0c6a7b3
+	provides = linux-firmware-qcom=20220124.eb8ea1b
 	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=20220119.0c6a7b3
+	provides = linux-firmware-liquidio=20220124.eb8ea1b
 	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=20220119.0c6a7b3
+	provides = linux-firmware-qlogic=20220124.eb8ea1b
 	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=20220119.0c6a7b3
+	provides = linux-firmware-bnx2x=20220124.eb8ea1b
 	conflicts = linux-firmware-bnx2x
 	conflicts = linux-firmware<=20211216.f682ecb
diff --git a/PKGBUILD b/PKGBUILD
index c5a564f653cf..5efb35e4e3b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: xduugu
 
 pkgbase=linux-firmware-git
-pkgver=20220119.0c6a7b3
+pkgver=20220124.eb8ea1b
 pkgrel=1
 pkgname=(linux-firmware-whence-git linux-firmware-git amd-ucode-git
          linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x}-git
@@ -16,9 +16,11 @@ 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.patch
+         allow-inplace-rebuild.patch)
 sha256sums=('SKIP'
-            '41c73f88ac68a3aef01fd406ce6cdb87555c65e4816dab12df10740875551aa7')
+            '41c73f88ac68a3aef01fd406ce6cdb87555c65e4816dab12df10740875551aa7'
+            '33a486fc036ec2d2e99799550b61eab395e2dd27b0e02e52e0bd8b9f3810d003')
 validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer <jwboyer@fedoraproject.org>
 
 _pick() {
@@ -36,6 +38,7 @@ prepare() {
 
   # add firmware compression support - patch taken from Fedora
   patch -Np1 -i ../0001-Add-support-for-compressing-firmware-in-copy-firmware.patch
+  patch -Np1 -i ../allow-inplace-rebuild.patch
 }
 
 pkgver() {
@@ -63,6 +66,7 @@ build() {
 package_linux-firmware-whence-git() {
   conflicts=("${pkgname%-git}" 'linux-firmware<=20211216.f682ecb')
   provides=("${pkgname%-git}=$pkgver")
+  pkgdesc+=" - contains the WHENCE license file which documents the vendor license details"
   cd "$pkgbase"
   install -Dt "${pkgdir}/usr/share/licenses/${pkgname%-git}" -m644 WHENCE
 }
diff --git a/allow-inplace-rebuild.patch b/allow-inplace-rebuild.patch
new file mode 100644
index 000000000000..8296a08b0db0
--- /dev/null
+++ b/allow-inplace-rebuild.patch
@@ -0,0 +1,12 @@
+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
+