Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] rpi-firmware: provide and replace linux-firmware-broadcom
@ 2020-12-13  1:20 pbui
  2020-12-13  1:21 ` pbui
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: pbui @ 2020-12-13  1:20 UTC (permalink / raw)
  To: ml

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

There is a new 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/27117

rpi-firmware: provide and replace linux-firmware-broadcom
As reported by amak79, the blobs provided by linux-firmware-broadcom are
not as up-to-date as those provided by the Raspberry Pi foundation nor
do they supply a blob for the Pi Zero.  Therefore, revert to packaging
the latest wifi blobs from RPi-Distro.

To resolve the conflict with the broadcom drivers, this package now
provides and replaces linux-firmware-broadcom.  This allows for
rpi-firmware and linux-firmware-network to coexist (just without the
non-Raspberry Pi broadcom drivers).  This should satisfy most use cases.

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

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

From 090c132cb334a1bb587a4ac9678088ec862d28a5 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Sat, 12 Dec 2020 20:16:53 -0500
Subject: [PATCH] rpi-firmware: provide and replace linux-firmware-broadcom

As reported by amak79, the blobs provided by linux-firmware-broadcom are
not as up-to-date as those provided by the Raspberry Pi foundation nor
do they supply a blob for the Pi Zero.  Therefore, revert to packaging
the latest wifi blobs from RPi-Distro.

To resolve the conflict with the broadcom drivers, this package now
provides and replaces linux-firmware-broadcom.  This allows for
rpi-firmware and linux-firmware-network to coexist (just without the
non-Raspberry Pi broadcom drivers).  This should satisfy most use cases.
---
 srcpkgs/rpi-firmware/template | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index d3f6b6eecbb..11f107976e3 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -4,10 +4,11 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
 version=20201123
-revision=2
+revision=3
 archs="armv6l* armv7l* aarch64*"
 wrksrc="firmware-${_githash}"
-depends="linux-firmware-broadcom"
+provides="linux-firmware-broadcom"
+replaces="linux-firmware-broadcom"
 short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause, custom:Cypress"
@@ -37,10 +38,22 @@ 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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: rpi-firmware: provide and replace linux-firmware-broadcom
  2020-12-13  1:20 [PR PATCH] rpi-firmware: provide and replace linux-firmware-broadcom pbui
@ 2020-12-13  1:21 ` pbui
  2020-12-13  1:22 ` [PR PATCH] [Updated] " pbui
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: pbui @ 2020-12-13  1:21 UTC (permalink / raw)
  To: ml

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

New comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/27117#issuecomment-743931088

Comment:
@q66 @Piraty I beliee I need to have both **provides** and **replaces**, but please correct me if I am wrong.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] rpi-firmware: provide and replace linux-firmware-broadcom
  2020-12-13  1:20 [PR PATCH] rpi-firmware: provide and replace linux-firmware-broadcom pbui
  2020-12-13  1:21 ` pbui
@ 2020-12-13  1:22 ` pbui
  2020-12-13  1:23 ` pbui
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: pbui @ 2020-12-13  1:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 882 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/27117

rpi-firmware: provide and replace linux-firmware-broadcom
As reported by amak79, the blobs provided by linux-firmware-broadcom are
not as up-to-date as those provided by the Raspberry Pi foundation nor
do they supply a blob for the Pi Zero.  Therefore, revert to packaging
the latest wifi blobs from RPi-Distro.

To resolve the conflict with the broadcom drivers, this package now
provides and replaces linux-firmware-broadcom.  This allows for
rpi-firmware and linux-firmware-network to coexist (just without the
non-Raspberry Pi broadcom drivers).  This should satisfy most use cases.

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

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

From 758c93f2f1d417a92ff2d3b041473818d4815102 Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Sat, 12 Dec 2020 20:16:53 -0500
Subject: [PATCH] rpi-firmware: provide and replace linux-firmware-broadcom

As reported by amak79, the blobs provided by linux-firmware-broadcom are
not as up-to-date as those provided by the Raspberry Pi foundation nor
do they supply a blob for the Pi Zero.  Therefore, revert to packaging
the latest wifi blobs from RPi-Distro.

To resolve the conflict with the broadcom drivers, this package now
provides and replaces linux-firmware-broadcom.  This allows for
rpi-firmware and linux-firmware-network to coexist (just without the
non-Raspberry Pi broadcom drivers).  This should satisfy most use cases.
---
 srcpkgs/rpi-firmware/template | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index d3f6b6eecbb..88d43ff9c83 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -4,10 +4,11 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
 version=20201123
-revision=2
+revision=3
 archs="armv6l* armv7l* aarch64*"
 wrksrc="firmware-${_githash}"
-depends="linux-firmware-broadcom"
+provides="linux-firmware-broadcom"
+replaces="linux-firmware-broadcom>=0"
 short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause, custom:Cypress"
@@ -37,10 +38,22 @@ 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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: rpi-firmware: provide and replace linux-firmware-broadcom
  2020-12-13  1:20 [PR PATCH] rpi-firmware: provide and replace linux-firmware-broadcom pbui
  2020-12-13  1:21 ` pbui
  2020-12-13  1:22 ` [PR PATCH] [Updated] " pbui
@ 2020-12-13  1:23 ` pbui
  2020-12-13  1:38 ` q66
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: pbui @ 2020-12-13  1:23 UTC (permalink / raw)
  To: ml

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

New comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/27117#issuecomment-743931088

Comment:
@q66 @Piraty I believe I need to have both **provides** and **replaces**, but please correct me if I am wrong.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: rpi-firmware: provide and replace linux-firmware-broadcom
  2020-12-13  1:20 [PR PATCH] rpi-firmware: provide and replace linux-firmware-broadcom pbui
                   ` (2 preceding siblings ...)
  2020-12-13  1:23 ` pbui
@ 2020-12-13  1:38 ` q66
  2020-12-13  2:08 ` amak79
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: q66 @ 2020-12-13  1:38 UTC (permalink / raw)
  To: ml

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27117#issuecomment-743932623

Comment:
yeah, but your `provides=` should also contain a version (using `linux-firmware-broadcom-${version}_${revision}` should be okay)

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: rpi-firmware: provide and replace linux-firmware-broadcom
  2020-12-13  1:20 [PR PATCH] rpi-firmware: provide and replace linux-firmware-broadcom pbui
                   ` (3 preceding siblings ...)
  2020-12-13  1:38 ` q66
@ 2020-12-13  2:08 ` amak79
  2020-12-13  2:50 ` [PR PATCH] [Updated] " pbui
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: amak79 @ 2020-12-13  2:08 UTC (permalink / raw)
  To: ml

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

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/27117#issuecomment-743935882

Comment:
Tested and working with RPi Zero W.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] rpi-firmware: provide and replace linux-firmware-broadcom
  2020-12-13  1:20 [PR PATCH] rpi-firmware: provide and replace linux-firmware-broadcom pbui
                   ` (4 preceding siblings ...)
  2020-12-13  2:08 ` amak79
@ 2020-12-13  2:50 ` pbui
  2020-12-13  2:52 ` pbui
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: pbui @ 2020-12-13  2:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 882 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/27117

rpi-firmware: provide and replace linux-firmware-broadcom
As reported by amak79, the blobs provided by linux-firmware-broadcom are
not as up-to-date as those provided by the Raspberry Pi foundation nor
do they supply a blob for the Pi Zero.  Therefore, revert to packaging
the latest wifi blobs from RPi-Distro.

To resolve the conflict with the broadcom drivers, this package now
provides and replaces linux-firmware-broadcom.  This allows for
rpi-firmware and linux-firmware-network to coexist (just without the
non-Raspberry Pi broadcom drivers).  This should satisfy most use cases.

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

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

From 93065ff27f348d5a30c4981a7b417e759e86ecce Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Sat, 12 Dec 2020 20:16:53 -0500
Subject: [PATCH] rpi-firmware: provide and replace linux-firmware-broadcom

As reported by amak79, the blobs provided by linux-firmware-broadcom are
not as up-to-date as those provided by the Raspberry Pi foundation nor
do they supply a blob for the Pi Zero.  Therefore, revert to packaging
the latest wifi blobs from RPi-Distro.

To resolve the conflict with the broadcom drivers, this package now
provides and replaces linux-firmware-broadcom.  This allows for
rpi-firmware and linux-firmware-network to coexist (just without the
non-Raspberry Pi broadcom drivers).  This should satisfy most use cases.
---
 srcpkgs/rpi-firmware/template | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template
index d3f6b6eecbb..c2f3162980d 100644
--- a/srcpkgs/rpi-firmware/template
+++ b/srcpkgs/rpi-firmware/template
@@ -4,10 +4,11 @@ _gitshort="${_githash:0:7}"
 
 pkgname=rpi-firmware
 version=20201123
-revision=2
+revision=3
 archs="armv6l* armv7l* aarch64*"
 wrksrc="firmware-${_githash}"
-depends="linux-firmware-broadcom"
+provides="linux-firmware-broadcom-${version}_${revision}"
+replaces="linux-firmware-broadcom>=0"
 short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause, custom:Cypress"
@@ -37,10 +38,22 @@ 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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: rpi-firmware: provide and replace linux-firmware-broadcom
  2020-12-13  1:20 [PR PATCH] rpi-firmware: provide and replace linux-firmware-broadcom pbui
                   ` (5 preceding siblings ...)
  2020-12-13  2:50 ` [PR PATCH] [Updated] " pbui
@ 2020-12-13  2:52 ` pbui
  2020-12-13  3:12 ` q66
  2020-12-13  3:12 ` [PR PATCH] [Merged]: " q66
  8 siblings, 0 replies; 10+ messages in thread
From: pbui @ 2020-12-13  2:52 UTC (permalink / raw)
  To: ml

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

New comment by pbui on void-packages repository

https://github.com/void-linux/void-packages/pull/27117#issuecomment-743939239

Comment:
OK, I've updated `provides` to include a version and revision.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: rpi-firmware: provide and replace linux-firmware-broadcom
  2020-12-13  1:20 [PR PATCH] rpi-firmware: provide and replace linux-firmware-broadcom pbui
                   ` (6 preceding siblings ...)
  2020-12-13  2:52 ` pbui
@ 2020-12-13  3:12 ` q66
  2020-12-13  3:12 ` [PR PATCH] [Merged]: " q66
  8 siblings, 0 replies; 10+ messages in thread
From: q66 @ 2020-12-13  3:12 UTC (permalink / raw)
  To: ml

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

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27117#issuecomment-743940745

Comment:
lgtm

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Merged]: rpi-firmware: provide and replace linux-firmware-broadcom
  2020-12-13  1:20 [PR PATCH] rpi-firmware: provide and replace linux-firmware-broadcom pbui
                   ` (7 preceding siblings ...)
  2020-12-13  3:12 ` q66
@ 2020-12-13  3:12 ` q66
  8 siblings, 0 replies; 10+ messages in thread
From: q66 @ 2020-12-13  3:12 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

rpi-firmware: provide and replace linux-firmware-broadcom
https://github.com/void-linux/void-packages/pull/27117

Description:
As reported by amak79, the blobs provided by linux-firmware-broadcom are
not as up-to-date as those provided by the Raspberry Pi foundation nor
do they supply a blob for the Pi Zero.  Therefore, revert to packaging
the latest wifi blobs from RPi-Distro.

To resolve the conflict with the broadcom drivers, this package now
provides and replaces linux-firmware-broadcom.  This allows for
rpi-firmware and linux-firmware-network to coexist (just without the
non-Raspberry Pi broadcom drivers).  This should satisfy most use cases.

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2020-12-13  3:12 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-13  1:20 [PR PATCH] rpi-firmware: provide and replace linux-firmware-broadcom pbui
2020-12-13  1:21 ` pbui
2020-12-13  1:22 ` [PR PATCH] [Updated] " pbui
2020-12-13  1:23 ` pbui
2020-12-13  1:38 ` q66
2020-12-13  2:08 ` amak79
2020-12-13  2:50 ` [PR PATCH] [Updated] " pbui
2020-12-13  2:52 ` pbui
2020-12-13  3:12 ` q66
2020-12-13  3:12 ` [PR PATCH] [Merged]: " q66

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).