rpi-firmware: update to 20201123. #26939
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
As suggested on IRC, it would be nicee to make a rpi-firmware-network package that's a subpackage of linux-firmware-network. |
|
@ericonr OK, I've introduced the rpi-firmware-network subpackage and rpi-firmware now depends on that rather than linux-firmware-network. |
|
LGTM, I can test locally later. |
|
We can simplify the whole mess by carefully reorder 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. There's a lot of warning about some |
sgn
added a commit
to sgn/void-packages
that referenced
this pull request
Dec 5, 2020
As discussing in [1], on template with "subpackages" as multilines will report false positive on some packages will never be built. There're multiple problems here: - expanded "subpackages" will have an empty line if it has a newline inside template - "sed" expression couldn't work with multilines "subpackages" Let's not quote "$subpkgs" and "$subpackages" in "printf" to let the shell do expansion and trim the empty lines for us. And rewrite the "sed" expression to work with multilines "subpackages" [1]: void-linux#26939 (comment)
sgn
added a commit
to sgn/void-packages
that referenced
this pull request
Dec 5, 2020
As discussing in [1], on template with "subpackages" as multilines will report false positive on some packages will never be built. There're multiple problems here: - expanded "subpackages" will have an empty line if it has a newline inside template - "sed" expression couldn't work with multilines "subpackages" Let's not quote "$subpkgs" and "$subpackages" in "printf" to let the shell do expansion and trim the empty lines for us. And rewrite the "sed" expression to work with multilines "subpackages" [1]: void-linux#26939 (comment)
Piraty
requested changes
Dec 7, 2020
| short_desc="Firmware files for the Raspberry Pi (git ${_gitshort})" | ||
| maintainer="Peter Bui <pbui@github.bx612.space>" | ||
| maintainer="Orphaned <orphan@voidlinux.org>" |
There was a problem hiding this comment.
Excellent, do you want me to change the maintainer line in this commit or will you do it later?
sgn
added a commit
to sgn/void-packages
that referenced
this pull request
Dec 7, 2020
As discussing in [1], on template with "subpackages" as multilines will report false positive on some packages will never be built. There're multiple problems here: - expanded "subpackages" will have an empty line if it has a newline inside template - "sed" expression couldn't work with multilines "subpackages" Let's not quote "$subpkgs" and "$subpackages" in "printf" to let the shell do expansion and trim the empty lines for us. And rewrite the "sed" expression to work with multilines "subpackages" [1]: void-linux#26939 (comment)
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.
- 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.
|
@sgn I've modified the PR to reflect your suggestion. |
sgn
approved these changes
Dec 8, 2020
sgn
added a commit
to sgn/void-packages
that referenced
this pull request
Dec 10, 2020
As discussing in [1], on template with "subpackages" as multilines will report false positive on some packages will never be built. There're multiple problems here: - expanded "subpackages" will have an empty line if it has a newline inside template - "sed" expression couldn't work with multilines "subpackages" Let's not quote "$subpkgs" and "$subpackages" in "printf" to let the shell do expansion and trim the empty lines for us. And rewrite the "sed" expression to work with multilines "subpackages" [1]: void-linux#26939 (comment)
sgn
added a commit
to sgn/void-packages
that referenced
this pull request
Dec 10, 2020
As discussing in [1], on template with "subpackages" as multilines will report false positive on some packages will never be built. There're multiple problems here: - expanded "subpackages" will have an empty line if it has a newline inside template - "sed" expression couldn't work with multilines "subpackages" Let's not quote "$subpkgs" and "$subpackages" in "printf" to let the shell do expansion and trim the empty lines for us. And rewrite the "sed" expression to work with multilines "subpackages" [1]: void-linux#26939 (comment)
sgn
added a commit
that referenced
this pull request
Dec 14, 2020
As discussing in [1], on template with "subpackages" as multilines will report false positive on some packages will never be built. There're multiple problems here: - expanded "subpackages" will have an empty line if it has a newline inside template - "sed" expression couldn't work with multilines "subpackages" Let's not quote "$subpkgs" and "$subpackages" in "printf" to let the shell do expansion and trim the empty lines for us. And rewrite the "sed" expression to work with multilines "subpackages" [1]: #26939 (comment)
atweiden
added a commit
to atweiden/voidpkgs
that referenced
this pull request
Dec 19, 2020
As discussing in [1], on template with "subpackages" as multilines will report false positive on some packages will never be built. There're multiple problems here: - expanded "subpackages" will have an empty line if it has a newline inside template - "sed" expression couldn't work with multilines "subpackages" Let's not quote "$subpkgs" and "$subpackages" in "printf" to let the shell do expansion and trim the empty lines for us. And rewrite the "sed" expression to work with multilines "subpackages" [1]: void-linux/void-packages#26939 (comment) void-linux/void-packages@3996821
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.