[PR PATCH] linux-firmware: move cypress firmware to linux-firmware-broadcom.

[PR PATCH] linux-firmware: move cypress firmware to linux-firmware-broadcom.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1961 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages firmware
https://github.com/void-linux/void-packages/pull/29887

linux-firmware: move cypress firmware to linux-firmware-broadcom.
Many people, including those using our linux package, will only have
linux-firmware-network installed, not linux-firmware; therefore, many
symlinks from the linux-firmware-broadcom package (pulled in by
linux-firmware-network) would be broken, because the cypress files were
in linux-firmware.

Reported by Stas over email.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29887.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firmware-29887.patch --]
[-- Type: text/x-diff, Size: 1527 bytes --]

From 7111f855e7e8513e982ee3b97d831e3538853b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Tue, 30 Mar 2021 13:48:34 -0300
Subject: [PATCH] linux-firmware: move cypress firmware to
 linux-firmware-broadcom.

Many people, including those using our linux package, will only have
linux-firmware-network installed, not linux-firmware; therefore, many
symlinks from the linux-firmware-broadcom package (pulled in by
linux-firmware-network) would be broken, because the cypress files were
in linux-firmware.

Reported by Stas over email.
---
 srcpkgs/linux-firmware/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 6d4a5ffbb45c..d41e016a1187 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
 version=20210315
-revision=1
+revision=2
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -45,6 +45,9 @@ linux-firmware-broadcom_package() {
 	pkg_install() {
 		vmove usr/lib/firmware/brcm
 		vmove usr/share/licenses/linux-firmware/LICENCE.broadcom_bcm43xx
+		# firmware/brcm contains multiple symlinks to ../cypress/
+		vmove usr/lib/firmware/cypress
+		vmove usr/share/licenses/linux-firmware/LICENCE.cypress
 	}
 }
 

Re: [PR PATCH] [Merged]: linux-firmware: move cypress firmware to linux-firmware-broadcom.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1809 bytes --]

There's a merged pull request on the void-packages repository

linux-firmware: move cypress firmware to linux-firmware-broadcom.
https://github.com/void-linux/void-packages/pull/29887

Description:
Many people, including those using our linux package, will only have
linux-firmware-network installed, not linux-firmware; therefore, many
symlinks from the linux-firmware-broadcom package (pulled in by
linux-firmware-network) would be broken, because the cypress files were
in linux-firmware.

Reported by Stas over email.

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

Re: linux-firmware: move cypress firmware to linux-firmware-broadcom.

[illtown]

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

New comment by illtown on void-packages repository

https://github.com/void-linux/void-packages/pull/29887#issuecomment-811056749

Comment:
Thanks Erico for the fix.
Unfortunately my bcm4356 wifi chip doesn't like new binary (keeps throwing scan errors constantly), so I had to stick with the older one.
Though this might be my niche device's (gpd pocket) issue and not the driver's.

Anyway, here is the minimal fix for the curious:
remove `/usr/lib/firmware/brcm/brcmfmac4356-pcie.clm_blob`
replace `/usr/lib/firmware/brcm/brcmfmac4356-pcie.bin` with older one (md5: 347c9ee3ffb0e8ad95b71f7b435bca30)

Re: linux-firmware: move cypress firmware to linux-firmware-broadcom.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29887#issuecomment-811076633

Comment:
@illtown you might want to report this to kernel devs, I think :/