From 7a53ca5eb193548599e4223bfec42f8b71078277 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 23 Dec 2023 16:36:25 -0500 Subject: [PATCH] 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. --- srcpkgs/linux-firmware/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template index 786d6d5566d..e84008531b2 100644 --- a/srcpkgs/linux-firmware/template +++ b/srcpkgs/linux-firmware/template @@ -1,7 +1,7 @@ # Template file for 'linux-firmware' pkgname=linux-firmware version=20231211 -revision=1 +revision=2 hostmakedepends="rdfind which" depends="linux-firmware-amd>=${version}_${revision} linux-firmware-network>=${version}_${revision}" short_desc="Binary firmware blobs for the Linux kernel" @@ -43,13 +43,14 @@ linux-firmware-amd_package() { linux-firmware-broadcom_package() { short_desc+=" - Broadcom network blobs" nostrip=yes - replaces="rpi-firmware-network>=0" 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 + # provided by rpi-firmware + find "${PKGDESTDIR}"/usr/lib/firmware/brcm -iname '*raspberry*.txt' -delete } }