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: update to 20201123.
Date: Fri, 04 Dec 2020 16:24:42 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26939@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 843 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/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: 2630 bytes --]

From 253e8c8481ee30b9698b8b366a4a77b7a400500a 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] rpi-firmware: update to 20201123.

- Orphan package.

- linux-firmware-network now provides the necessary wifi blobs, so
  rpi-firmware no longer includes them and now depends on
  linux-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..5d46a318557 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="linux-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

             reply	other threads:[~2020-12-04 15:24 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-04 15:24 pbui [this message]
2020-12-04 15:57 ` ericonr
2020-12-04 18:38 ` [PR PATCH] [Updated] " pbui
2020-12-04 18:40 ` pbui
2020-12-04 18:57 ` ericonr
2020-12-05  1:12 ` sgn
2020-12-07  9:08 ` [PR REVIEW] " Piraty
2020-12-07  9:08 ` Piraty
2020-12-07 13:34 ` [PR PATCH] [Updated] " pbui
2020-12-07 13:36 ` [PR REVIEW] " pbui
2020-12-07 13:37 ` pbui
2020-12-07 13:37 ` pbui
2020-12-11 18:47 ` [PR REVIEW] " Piraty
2020-12-11 18:51 ` [PR PATCH] [Closed]: " Piraty

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-26939@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).