Github messages for voidlinux
 help / color / mirror / Atom feed
From: pbui <pbui@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] rpi-firmware: provide and replace linux-firmware-broadcom
Date: Sun, 13 Dec 2020 02:20:57 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27117@inbox.vuxu.org> (raw)

[-- 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

             reply	other threads:[~2020-12-13  1:21 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-13  1:20 pbui [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27117@inbox.vuxu.org \
    --to=pbui@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).