Package split

3 files changed, 324 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7903f2e67c9..989efe14e33a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Tue Apr  7 17:06:41 UTC 2020
 pkgbase = linux-firmware-git
 	pkgdesc = Firmware files for Linux
-	pkgver = 20200320.edf390c
+	pkgver = 20220119.0c6a7b3
 	pkgrel = 1
 	url = https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary
 	arch = any
@@ -12,14 +10,72 @@ 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
+	validpgpkeys = 4CDE8575E547BF835FE15807A31B6BD72486CFD6
 	sha256sums = SKIP
+	sha256sums = 41c73f88ac68a3aef01fd406ce6cdb87555c65e4816dab12df10740875551aa7
+
+pkgname = linux-firmware-whence-git
+	provides = linux-firmware-whence=20220119.0c6a7b3
+	conflicts = linux-firmware-whence
+	conflicts = linux-firmware<=20211216.f682ecb
 
 pkgname = linux-firmware-git
-	provides = linux-firmware=20200320.edf390c
+	depends = linux-firmware-whence
+	provides = linux-firmware=20220119.0c6a7b3
 	conflicts = linux-firmware
 
 pkgname = amd-ucode-git
-	pkgdesc = Microcode update files for AMD CPUs
-	provides = amd-ucode=20200320.edf390c
+	pkgdesc = Microcode update image for AMD CPUs
+	license = custom
+	provides = amd-ucode=20220119.0c6a7b3
 	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
+	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
+	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
+	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
+	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
+	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
+	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
+	conflicts = linux-firmware-bnx2x
+	conflicts = linux-firmware<=20211216.f682ecb
diff --git a/0001-Add-support-for-compressing-firmware-in-copy-firmware.patch b/0001-Add-support-for-compressing-firmware-in-copy-firmware.patch
new file mode 100644
index 000000000000..93d82e4a2c4e
--- /dev/null
+++ b/0001-Add-support-for-compressing-firmware-in-copy-firmware.patch
@@ -0,0 +1,123 @@
+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 fc48979075eb..c5a564f653cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,35 +3,55 @@
 # Contributor: xduugu
 
 pkgbase=linux-firmware-git
-pkgname=(linux-firmware-git amd-ucode-git)
-pkgver=20200320.edf390c
+pkgver=20220119.0c6a7b3
 pkgrel=1
+pkgname=(linux-firmware-whence-git linux-firmware-git amd-ucode-git
+         linux-firmware-{nfp,mellanox,marvell,qcom,liquidio,qlogic,bnx2x}-git
+)
 pkgdesc="Firmware files for Linux"
-makedepends=('git')
-arch=('any')
 url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
 license=('GPL2' 'GPL3' 'custom')
+arch=('any')
+makedepends=('git')
 options=(!strip)
-#branch=master
-source=("${pkgbase}::git+https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git?signed")
-sha256sums=('SKIP')
+#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)
+sha256sums=('SKIP'
+            '41c73f88ac68a3aef01fd406ce6cdb87555c65e4816dab12df10740875551aa7')
 validpgpkeys=('4CDE8575E547BF835FE15807A31B6BD72486CFD6') # Josh Boyer <jwboyer@fedoraproject.org>
 
+_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}
+
+  # add firmware compression support - patch taken from Fedora
+  patch -Np1 -i ../0001-Add-support-for-compressing-firmware-in-copy-firmware.patch
+}
+
 pkgver() {
-  cd "${srcdir}/${pkgbase}"
+  cd ${pkgbase}
 
   # Commit date + short rev
   echo $(TZ=UTC git show -s --pretty=%cd --date=format-local:%Y%m%d HEAD).$(git rev-parse --short HEAD)
 }
 
 build() {
-  cd "${srcdir}"
   mkdir -p kernel/x86/microcode
-  cat "${pkgbase}/amd-ucode/microcode_amd"*.bin > kernel/x86/microcode/AuthenticAMD.bin
+  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
-    touch -d @$SOURCE_DATE_EPOCH kernel/x86/microcode/AuthenticAMD.bin
+  if [[ -n ${SOURCE_DATE_EPOCH} ]]; then
+    touch -d @${SOURCE_DATE_EPOCH} kernel/x86/microcode/AuthenticAMD.bin
   fi
 
   # Reproducibility: strip the inode and device numbers from the cpio archive
@@ -40,28 +60,122 @@ build() {
     bsdtar --null -cf - --format=newc @- > amd-ucode.img
 }
 
-package_linux-firmware-git() {
-  conflicts=('linux-firmware')
-  provides=("linux-firmware=$pkgver")
+package_linux-firmware-whence-git() {
+  conflicts=("${pkgname%-git}" 'linux-firmware<=20211216.f682ecb')
+  provides=("${pkgname%-git}=$pkgver")
+  cd "$pkgbase"
+  install -Dt "${pkgdir}/usr/share/licenses/${pkgname%-git}" -m644 WHENCE
+}
 
-  cd "${srcdir}/${pkgname}"
+package_linux-firmware-git() {
+  conflicts=("${pkgname%-git}")
+  provides=("${pkgname%-git}=$pkgver")
+  depends=('linux-firmware-whence')
 
-  make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware install
+  cd ${pkgbase}
 
-  install -Dt "${pkgdir}/usr/share/licenses/linux-firmware" -m644 LICEN* WHENCE
+  make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware installcompress
 
   # 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/linux-firmware.conf"
+    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"
+  _pick linux-firmware-nfp usr/lib/firmware/netronome
+  _pick linux-firmware-nfp usr/share/licenses/${pkgname%-git}/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%-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-liquidio usr/lib/firmware/liquidio
+  _pick linux-firmware-liquidio usr/share/licenses/${pkgname%-git}/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%-git}/LICENCE.{qla1280,qla2xxx}
+
+  _pick linux-firmware-bnx2x usr/lib/firmware/bnx2x*
 }
 
 package_amd-ucode-git() {
-  conflicts=('amd-ucode')
-  provides=("amd-ucode=$pkgver")
-  pkgdesc='Microcode update files for AMD CPUs'
+  conflicts=("${pkgname%-git}")
+  provides=("${pkgname%-git}=$pkgver")
+  pkgdesc="Microcode update image for AMD CPUs"
+  license=(custom)
+
+  install -Dt "${pkgdir}/boot" -m644 amd-ucode.img
+
+  install -Dt "${pkgdir}/usr/share/licenses/${pkgname%-git}" -m644 ${pkgbase}/LICENSE.amd-ucode
+}
+
+package_linux-firmware-nfp-git() {
+  conflicts=("${pkgname%-git}" 'linux-firmware<=20211216.f682ecb')
+  provides=("${pkgname%-git}=$pkgver")
+  pkgdesc+=" - nfp / Firmware for Netronome Flow Processors"
+  depends=('linux-firmware-whence')
+
+  mv -v linux-firmware-nfp/* "${pkgdir}"
+}
+
+package_linux-firmware-mellanox-git() {
+  conflicts=("${pkgname%-git}" 'linux-firmware<=20211216.f682ecb')
+  provides=("${pkgname%-git}=$pkgver")
+  pkgdesc+=" - mellanox / Firmware for Mellanox Spectrum switches"
+  depends=('linux-firmware-whence')
+
+  mv -v linux-firmware-mellanox/* "${pkgdir}"
+}
+
+package_linux-firmware-marvell-git() {
+  conflicts=("${pkgname%-git}" 'linux-firmware<=20211216.f682ecb')
+  provides=("${pkgname%-git}=$pkgver")
+  pkgdesc+=" - marvell / Firmware for Marvell devices"
+  depends=('linux-firmware-whence')
+
+  mv -v linux-firmware-marvell/* "${pkgdir}"
+}
+
+package_linux-firmware-qcom-git() {
+  conflicts=("${pkgname%-git}" 'linux-firmware<=20211216.f682ecb')
+  provides=("${pkgname%-git}=$pkgver")
+  pkgdesc+=" - qcom / Firmware for Qualcomm SoCs"
+  depends=('linux-firmware-whence')
+
+  mv -v linux-firmware-qcom/* "${pkgdir}"
+}
+
+package_linux-firmware-liquidio-git() {
+  conflicts=("${pkgname%-git}" 'linux-firmware<=20211216.f682ecb')
+  provides=("${pkgname%-git}=$pkgver")
+  pkgdesc+=" - liquidio / Firmware for Cavium LiquidIO server adapters"
+  depends=('linux-firmware-whence')
+
+  mv -v linux-firmware-liquidio/* "${pkgdir}"
+}
+
+package_linux-firmware-qlogic-git() {
+  conflicts=("${pkgname%-git}" 'linux-firmware<=20211216.f682ecb')
+  provides=("${pkgname%-git}=$pkgver")
+  pkgdesc+=" - qlogic / Firmware for QLogic devices"
+  depends=('linux-firmware-whence')
+
+  mv -v linux-firmware-qlogic/* "${pkgdir}"
+}
+
+package_linux-firmware-bnx2x-git() {
+  conflicts=("${pkgname%-git}" 'linux-firmware<=20211216.f682ecb')
+  provides=("${pkgname%-git}=$pkgver")
+  pkgdesc+=" - bnx2x / Firmware for Broadcom NetXtreme II 10Gb ethernet adapters"
+  depends=('linux-firmware-whence')
 
-  install -Dt "${pkgdir}/boot" -m644 "${srcdir}/amd-ucode.img"
-  install -Dm644 "${srcdir}/${pkgbase}/LICENSE.amd-ucode" "${pkgdir}/usr/share/licenses/amd-ucode/LICENSE"
+  mv -v linux-firmware-bnx2x/* "${pkgdir}"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set sw=2 et: