linux-firmware: remove conflict between -broadcom and rpi-firmware

these files differ between linux-firmware-broadcom and rpi-firmware, but
they should only ever be necessary for raspberry pi users, and the
rpi-firmware version is probably the one that is more likely to work and
work better.
This commit is contained in:
classabbyamp 2023-12-23 16:36:25 -05:00 committed by classabbyamp
parent 60c2efa3c5
commit 7a53ca5eb1
1 changed files with 3 additions and 2 deletions

View File

@ -1,7 +1,7 @@
# Template file for 'linux-firmware' # Template file for 'linux-firmware'
pkgname=linux-firmware pkgname=linux-firmware
version=20231211 version=20231211
revision=1 revision=2
hostmakedepends="rdfind which" hostmakedepends="rdfind which"
depends="linux-firmware-amd>=${version}_${revision} linux-firmware-network>=${version}_${revision}" depends="linux-firmware-amd>=${version}_${revision} linux-firmware-network>=${version}_${revision}"
short_desc="Binary firmware blobs for the Linux kernel" short_desc="Binary firmware blobs for the Linux kernel"
@ -43,13 +43,14 @@ linux-firmware-amd_package() {
linux-firmware-broadcom_package() { linux-firmware-broadcom_package() {
short_desc+=" - Broadcom network blobs" short_desc+=" - Broadcom network blobs"
nostrip=yes nostrip=yes
replaces="rpi-firmware-network>=0"
pkg_install() { pkg_install() {
vmove usr/lib/firmware/brcm vmove usr/lib/firmware/brcm
vmove usr/share/licenses/linux-firmware/LICENCE.broadcom_bcm43xx vmove usr/share/licenses/linux-firmware/LICENCE.broadcom_bcm43xx
# firmware/brcm contains multiple symlinks to ../cypress/ # firmware/brcm contains multiple symlinks to ../cypress/
vmove usr/lib/firmware/cypress vmove usr/lib/firmware/cypress
vmove usr/share/licenses/linux-firmware/LICENCE.cypress vmove usr/share/licenses/linux-firmware/LICENCE.cypress
# provided by rpi-firmware
find "${PKGDESTDIR}"/usr/lib/firmware/brcm -iname '*raspberry*.txt' -delete
} }
} }