Re: [PR PATCH] [Updated] rpi-firmware: update to 20201123.

[pbui <pbui@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 848 bytes --]

There is an updated pull request by pbui against master on the void-packages repository

https://github.com/pbui/void-packages rpi-firmware
https://github.com/void-linux/void-packages/pull/26939

rpi-firmware: update to 20201123.
- Orphan package (suggest @Piraty takes it).

- linux-firmware-network now provides the necessary wifi blobs, so
  rpi-firmware no longer includes them and now depends on
  linux-firmware-network.

  Otherwise the two packages conflict with each other and prevents upgrading.

- I've tested on armv6l and armv7l with a RPI2 and RPI3 both builtin and external wireless devices.

@Piraty @sgn Per our discussion on IRC, I dropped the wifi blobs from this package and for now making it depend on linux-firmware-network.

A patch file from https://github.com/void-linux/void-packages/pull/26939.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpi-firmware-26939.patch --]
[-- Type: text/x-diff, Size: 4943 bytes --]

From 98e93528014860ebaca13efb88d1cf4ca78dfe34 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Fri, 4 Dec 2020 13:23:00 -0500
Subject: [PATCH 1/2] linux-firmware: move Raspberry Pi firmware files to
 rpi-firmware-network

Now that linux-firmware-network provides the necessary wifi blobs for
the Raspberry Pi, we can remove them from rpi-firmware and provided them
in a new rpi-firmware-network subpackage.

The linux-firmware-network subpackage is modified so that only the brcm
not related to the Raspberry Pi is included.
---
 srcpkgs/linux-firmware/template | 14 +++++++++++++-
 srcpkgs/rpi-firmware-network    |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/rpi-firmware-network

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 4b5a6b8e7af..c13a8c46017 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
 version=20200918
-revision=1
+revision=2
 depends="${pkgname}-amd-${version}_${revision} ${pkgname}-network-${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -12,6 +12,9 @@ checksum=3cbb7f363dc63686b1c6e325ed679f6faa4715f17fa06be11b705456e1d5dcb9
 python_version=3
 nostrip=yes
 
+subpackages="rpi-firmware-network linux-firmware-amd linux-firmware-intel
+ linux-firmware-nvidia linux-firmware-network"
+
 do_install() {
 	vmkdir usr/lib/firmware
 	vmkdir usr/share/licenses/${pkgname}
@@ -53,6 +56,7 @@ linux-firmware-nvidia_package() {
 
 linux-firmware-network_package() {
 	short_desc+=" - network"
+	depends="rpi-firmware-network"
 	nostrip=yes
 	pkg_install() {
 		vmove usr/lib/firmware/3com
@@ -75,3 +79,11 @@ 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.*"
+	}
+}
diff --git a/srcpkgs/rpi-firmware-network b/srcpkgs/rpi-firmware-network
new file mode 120000
index 00000000000..9a0010a89de
--- /dev/null
+++ b/srcpkgs/rpi-firmware-network
@@ -0,0 +1 @@
+linux-firmware
\ No newline at end of file

From 708b877a17ca99951e75b4208184ff1cdf8f7e5b Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Fri, 4 Dec 2020 10:19:40 -0500
Subject: [PATCH 2/2] rpi-firmware: update to 20201123.

- Orphan package.

- rpi-firmware-network (subpackage of linux-firmware) now provides the
  necessary wifi blobs, so rpi-firmware no longer includes them and now
  depends on rpi-firmware-network.
---
 srcpkgs/rpi-firmware/template | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index 30cb0f7f2f8..00bcc12d11a 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -1,18 +1,19 @@
 # Template file for 'rpi-firmware'
-_githash="f293685f683c48b1872beeb38c2f7da1f46141a0"
+_githash="8f13114b9ea29bd004151d4a8afa500b2df721be"
 _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
-version=20200819
-revision=2
+version=20201123
+revision=1
 archs="armv6l* armv7l* aarch64*"
 wrksrc="firmware-${_githash}"
+depends="rpi-firmware-network"
 short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})"
-maintainer="Peter Bui <pbui@github.bx612.space>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause, custom:Cypress"
 homepage="https://github.com/raspberrypi/firmware"
 distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz"
-checksum=dd825e8ccbd524182f7e06c5301f2ed2f8a68200e80cf61b1095271dcfbe0e55
+checksum=f9be0cc177aae7dddaa0a2967d090ea33a95be9dd519d2eee3bc740af8ffb19e
 
 conf_files="/boot/cmdline.txt /boot/config.txt"
 nostrip=yes
@@ -36,22 +37,10 @@ do_install() {
 	$XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/LICENCE.cypress
 	vlicense LICENCE.cypress
 
-	# Firmware for rpi3 b and zero wifi chip
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43430-sdio.${f}
-		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-
 	# Firmware for rpi3 b and zero bluetooth chip
 	$XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM43430A1.hcd
 	vinstall BCM43430A1.hcd 0644 usr/lib/firmware/brcm
 
-	# Firmware for rpi3 b+ wifi chip
-	for f in bin txt clm_blob; do
-		$XBPS_FETCH_CMD https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43455-sdio.${f}
-		vinstall brcmfmac43455-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-
 	# Firmware for rpi3 b+ bluetooth chip
 	$XBPS_FETCH_CMD https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C0.hcd
 	vinstall BCM4345C0.hcd 0644 usr/lib/firmware/brcm