From b3b42d63179bf44b78cebc3adcbc8ba08a793d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= 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 6d4a5ffbb45..d41e016a118 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 " @@ -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 } }