From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: rpi-firmware: update to 20201123.
Date: Sat, 05 Dec 2020 02:12:49 +0100 [thread overview]
Message-ID: <20201205011249.Er3QEqCSX4gmi1NVuTCzBCb8Ixy6nZpYcnQZg14Sl18@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26939@inbox.vuxu.org>
[-- 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.
next prev parent reply other threads:[~2020-12-05 1:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 15:24 [PR PATCH] " 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 [this message]
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=20201205011249.Er3QEqCSX4gmi1NVuTCzBCb8Ixy6nZpYcnQZg14Sl18@z \
--to=sgn@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).