From 2a2c456e5e20c5bb63698cefc3d0bd9720631a73 Mon Sep 17 00:00:00 2001 From: Peter Bui Date: Fri, 4 Dec 2020 13:23:00 -0500 Subject: [PATCH] linux-firmware: move Raspberry Pi firmware files to rpi-firmware-network Now that linux-firmware-network provides the necessary wifi blobs for the Raspberry Pi, we can remove them from rpi-firmware and provided them in a new rpi-firmware-network subpackage. The linux-firmware-network subpackage is modified so that only the brcm not related to the Raspberry Pi is included. --- srcpkgs/linux-firmware/template | 14 +++++++++++++- srcpkgs/rpi-firmware-network | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/rpi-firmware-network diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template index 4b5a6b8e7af..c13a8c46017 100644 --- a/srcpkgs/linux-firmware/template +++ b/srcpkgs/linux-firmware/template @@ -1,7 +1,7 @@ # Template file for 'linux-firmware' pkgname=linux-firmware version=20200918 -revision=1 +revision=2 depends="${pkgname}-amd-${version}_${revision} ${pkgname}-network-${version}_${revision}" short_desc="Binary firmware blobs for the Linux kernel" maintainer="Orphaned " @@ -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 @@ -75,3 +79,11 @@ linux-firmware-network_package() { vmove usr/lib/firmware/dpaa2 } } + +rpi-firmware-network_package() { + short_desc+=" - Raspberry Pi" + nostrip=yes + pkg_install() { + vmove "usr/lib/firmware/brcm/brcmfmac434??-sdio.*" + } +} diff --git a/srcpkgs/rpi-firmware-network b/srcpkgs/rpi-firmware-network new file mode 120000 index 00000000000..9a0010a89de --- /dev/null +++ b/srcpkgs/rpi-firmware-network @@ -0,0 +1 @@ +linux-firmware \ No newline at end of file