From 6fdd2b9f37d1abe9bc3973a2a44931230c57fa97 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 12 Dec 2020 01:23:16 +0100
Subject: [PATCH] linux-firmware: subpackage for broadcom, and remove weird rpi
 one

also properly install the license
---
 ...rmware-network => linux-firmware-broadcom} |  0
 srcpkgs/linux-firmware/template               | 29 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)
 rename srcpkgs/{rpi-firmware-network => linux-firmware-broadcom} (100%)

diff --git a/srcpkgs/rpi-firmware-network b/srcpkgs/linux-firmware-broadcom
similarity index 100%
rename from srcpkgs/rpi-firmware-network
rename to srcpkgs/linux-firmware-broadcom
diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index c13a8c46017..16077a4bb97 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,8 +1,8 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
 version=20200918
-revision=2
-depends="${pkgname}-amd-${version}_${revision} ${pkgname}-network-${version}_${revision}"
+revision=3
+depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="See /usr/share/licenses/${pkgname}"
@@ -12,8 +12,8 @@ checksum=3cbb7f363dc63686b1c6e325ed679f6faa4715f17fa06be11b705456e1d5dcb9
 python_version=3
 nostrip=yes
 
-subpackages="rpi-firmware-network linux-firmware-amd linux-firmware-intel
- linux-firmware-nvidia linux-firmware-network"
+subpackages="linux-firmware-amd linux-firmware-broadcom
+ linux-firmware-intel linux-firmware-nvidia linux-firmware-network"
 
 do_install() {
 	vmkdir usr/lib/firmware
@@ -36,6 +36,16 @@ linux-firmware-amd_package() {
 	}
 }
 
+linux-firmware-broadcom_package() {
+	short_desc+=" - Broadcom network blobs"
+	nostrip=yes
+	replaces="rpi-firmware-network>=0"
+	pkg_install() {
+		vmove usr/lib/firmware/brcm
+		vmove usr/share/licenses/linux-firmware/LICENCE.broadcom_bcm43xx
+	}
+}
+
 linux-firmware-intel_package() {
 	short_desc+=" - Intel CPU/GPU microcode"
 	nostrip=yes
@@ -56,7 +66,7 @@ linux-firmware-nvidia_package() {
 
 linux-firmware-network_package() {
 	short_desc+=" - network"
-	depends="rpi-firmware-network"
+	depends="linux-firmware-broadcom>=${version}_${revision}"
 	nostrip=yes
 	pkg_install() {
 		vmove usr/lib/firmware/3com
@@ -65,7 +75,6 @@ linux-firmware-network_package() {
 		vmove "usr/lib/firmware/ath*"
 		vmove "usr/lib/firmware/ar*"
 		vmove "usr/lib/firmware/bnx2*"
-		vmove usr/lib/firmware/brcm
 		vmove "usr/lib/firmware/cxgb*"
 		vmove "usr/lib/firmware/htc*"
 		vmove "usr/lib/firmware/iwl*"
@@ -79,11 +88,3 @@ linux-firmware-network_package() {
 		vmove usr/lib/firmware/dpaa2
 	}
 }
-
-rpi-firmware-network_package() {
-	short_desc+=" - Raspberry Pi"
-	nostrip=yes
-	pkg_install() {
-		vmove "usr/lib/firmware/brcm/brcmfmac434??-sdio.*"
-	}
-}