* [PR PATCH] rpi-firmware: update to 20201123.
@ 2020-12-04 15:24 pbui
2020-12-04 15:57 ` ericonr
` (12 more replies)
0 siblings, 13 replies; 14+ messages in thread
From: pbui @ 2020-12-04 15:24 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: rpi-firmware: update to 20201123.
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
@ 2020-12-04 15:57 ` ericonr
2020-12-04 18:38 ` [PR PATCH] [Updated] " pbui
` (11 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2020-12-04 15:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26939#issuecomment-738862664
Comment:
As suggested on IRC, it would be nicee to make a rpi-firmware-network package that's a subpackage of linux-firmware-network.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] rpi-firmware: update to 20201123.
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
2020-12-04 15:57 ` ericonr
@ 2020-12-04 18:38 ` pbui
2020-12-04 18:40 ` pbui
` (10 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: pbui @ 2020-12-04 18:38 UTC (permalink / raw)
To: ml
[-- 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: 5155 bytes --]
From 06fed94171123cbd2e1e4844df92d6fd502c5562 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 | 18 ++++++++++++++++--
srcpkgs/rpi-firmware-network | 1 +
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 120000 srcpkgs/rpi-firmware-network
diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 4b5a6b8e7af..9e335af9039 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>"
@@ -61,7 +61,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*"
@@ -73,5 +72,20 @@ linux-firmware-network_package() {
vmove usr/lib/firmware/ueagle-atm
vmove usr/lib/firmware/ti-connectivity
vmove usr/lib/firmware/dpaa2
+
+ # Move only non-Raspberry Pi related brcm firmware files.
+ # Cannont use vmove since one of the files has a space in it,
+ # so manually create destination folder and move files.
+ mkdir -p ${PKGDESTDIR}/usr/lib/firmware/brcm
+ find ${DESTDIR}/usr/lib/firmware/brcm/* ! -iname 'brcmfmac434??-sdio.*' \
+ | while read f; do mv "$f" ${PKGDESTDIR}/usr/lib/firmware//brcm; done
+ }
+}
+
+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 bec40228c9b9eeccdb77a8d7d78a28a70444b10f 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: rpi-firmware: update to 20201123.
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
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
` (9 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: pbui @ 2020-12-04 18:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New comment by pbui on void-packages repository
https://github.com/void-linux/void-packages/pull/26939#issuecomment-738950401
Comment:
@ericonr OK, I've introduced the rpi-firmware-network subpackage and rpi-firmware now depends on that rather than linux-firmware-network.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: rpi-firmware: update to 20201123.
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
` (2 preceding siblings ...)
2020-12-04 18:40 ` pbui
@ 2020-12-04 18:57 ` ericonr
2020-12-05 1:12 ` sgn
` (8 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: ericonr @ 2020-12-04 18:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26939#issuecomment-738958332
Comment:
LGTM, I can test locally later.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: rpi-firmware: update to 20201123.
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
` (3 preceding siblings ...)
2020-12-04 18:57 ` ericonr
@ 2020-12-05 1:12 ` sgn
2020-12-07 9:08 ` [PR REVIEW] " Piraty
` (7 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: sgn @ 2020-12-05 1:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2119 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/26939#issuecomment-739098547
Comment:
We can simplify the whole mess by carefully reorder `subpackages`:
```diff
diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 9e335af903..c13a8c4601 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -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
@@ -61,6 +65,7 @@ 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*"
@@ -72,13 +77,6 @@ linux-firmware-network_package() {
vmove usr/lib/firmware/ueagle-atm
vmove usr/lib/firmware/ti-connectivity
vmove usr/lib/firmware/dpaa2
-
- # Move only non-Raspberry Pi related brcm firmware files.
- # Cannont use vmove since one of the files has a space in it,
- # so manually create destination folder and move files.
- mkdir -p ${PKGDESTDIR}/usr/lib/firmware/brcm
- find ${DESTDIR}/usr/lib/firmware/brcm/* ! -iname 'brcmfmac434??-sdio.*' \
- | while read f; do mv "$f" ${PKGDESTDIR}/usr/lib/firmware//brcm; done
}
}
```
Not sure if it's better, though.
And, I'm not even sure if `linux-firmware-network` should depend on `rpi-firmware-network` or not.
There's a lot of warning about some `_package` not being used, which is a bug of `xbps-src`.
I'll post a patch for that warning, soon.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] rpi-firmware: update to 20201123.
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
` (4 preceding siblings ...)
2020-12-05 1:12 ` sgn
@ 2020-12-07 9:08 ` Piraty
2020-12-07 9:08 ` Piraty
` (6 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Piraty @ 2020-12-07 9:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/26939#discussion_r537339438
Comment:
I adopt it, thanks your work
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] rpi-firmware: update to 20201123.
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
` (5 preceding siblings ...)
2020-12-07 9:08 ` [PR REVIEW] " Piraty
@ 2020-12-07 9:08 ` Piraty
2020-12-07 13:34 ` [PR PATCH] [Updated] " pbui
` (5 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: Piraty @ 2020-12-07 9:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/26939#discussion_r537339034
Comment:
(superfluous `/`)
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Updated] rpi-firmware: update to 20201123.
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
` (6 preceding siblings ...)
2020-12-07 9:08 ` Piraty
@ 2020-12-07 13:34 ` pbui
2020-12-07 13:36 ` [PR REVIEW] " pbui
` (4 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: pbui @ 2020-12-07 13:34 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] rpi-firmware: update to 20201123.
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
` (7 preceding siblings ...)
2020-12-07 13:34 ` [PR PATCH] [Updated] " pbui
@ 2020-12-07 13:36 ` pbui
2020-12-07 13:37 ` pbui
` (3 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: pbui @ 2020-12-07 13:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New review comment by pbui on void-packages repository
https://github.com/void-linux/void-packages/pull/26939#discussion_r537510883
Comment:
Excellent, do you want me to change the maintainer line in this commit or will you do it later?
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] rpi-firmware: update to 20201123.
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
` (8 preceding siblings ...)
2020-12-07 13:36 ` [PR REVIEW] " pbui
@ 2020-12-07 13:37 ` pbui
2020-12-07 13:37 ` pbui
` (2 subsequent siblings)
12 siblings, 0 replies; 14+ messages in thread
From: pbui @ 2020-12-07 13:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New review comment by pbui on void-packages repository
https://github.com/void-linux/void-packages/pull/26939#discussion_r537511204
Comment:
I've updated the PR to do what @sgn suggested, so this is no longer relevant.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: rpi-firmware: update to 20201123.
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
` (9 preceding siblings ...)
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
12 siblings, 0 replies; 14+ messages in thread
From: pbui @ 2020-12-07 13:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New comment by pbui on void-packages repository
https://github.com/void-linux/void-packages/pull/26939#issuecomment-739923255
Comment:
@sgn I've modified the PR to reflect your suggestion.
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR REVIEW] rpi-firmware: update to 20201123.
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
` (10 preceding siblings ...)
2020-12-07 13:37 ` pbui
@ 2020-12-11 18:47 ` Piraty
2020-12-11 18:51 ` [PR PATCH] [Closed]: " Piraty
12 siblings, 0 replies; 14+ messages in thread
From: Piraty @ 2020-12-11 18:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/26939#discussion_r541154559
Comment:
please do it
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PR PATCH] [Closed]: rpi-firmware: update to 20201123.
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
` (11 preceding siblings ...)
2020-12-11 18:47 ` [PR REVIEW] " Piraty
@ 2020-12-11 18:51 ` Piraty
12 siblings, 0 replies; 14+ messages in thread
From: Piraty @ 2020-12-11 18:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 693 bytes --]
There's a closed pull request on the void-packages repository
rpi-firmware: update to 20201123.
https://github.com/void-linux/void-packages/pull/26939
Description:
- 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.
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-12-11 18:51 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-04 15:24 [PR PATCH] rpi-firmware: update to 20201123 pbui
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
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).