main/linux-firmware: updated rpi firmware

1 files changed, 36 insertions, 11 deletions

diff --git a/main/linux-firmware/APKBUILD b/main/linux-firmware/APKBUILD
index febc6fb76b..c4f3ec26ea 100644
--- a/main/linux-firmware/APKBUILD
+++ b/main/linux-firmware/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=linux-firmware
 pkgver=20180615
-pkgrel=1
+pkgrel=2
 pkgdesc="firmware files for linux"
 #url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary"
 url="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
@@ -13,10 +13,27 @@ makedepends=
 install=""
 provides="linux-firmware-any"
 provider_priority=1
-options="!strip !check"
+options="!strip !check !archcheck !tracedeps !spdx"
+
+# raspberry specific bt and wifi firmware
+# brcmfmac43455-sdio version 7.45.154
+# brcmfmac43430-sdio version 7.45.98.38
+_rpi_wifi=86e88fbf0345da49555d0ec34c80b4fbae7d0cd3
+# unknown version
+_rpi_bt=ade2bae1aaaebede09abb8fb546f767a0e4c7804
+_rpi_firmwares="
+        https://github.com/RPi-Distro/firmware-nonfree/raw/$_rpi_wifi/brcm/brcmfmac43430-sdio.bin
+        https://github.com/RPi-Distro/firmware-nonfree/raw/$_rpi_wifi/brcm/brcmfmac43430-sdio.txt
+        https://github.com/RPi-Distro/firmware-nonfree/raw/$_rpi_wifi/brcm/brcmfmac43455-sdio.bin
+        https://github.com/RPi-Distro/firmware-nonfree/raw/$_rpi_wifi/brcm/brcmfmac43455-sdio.clm_blob
+        https://github.com/RPi-Distro/firmware-nonfree/raw/$_rpi_wifi/brcm/brcmfmac43455-sdio.txt
+
+        https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM43430A1.hcd
+        https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM4345C0.hcd
+        "
+
 source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-${pkgver}.tar.gz
-        https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43430-sdio.txt
-        https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43430-sdio.bin
+        $_rpi_firmwares
 "
 
 _giturl="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
@@ -33,10 +50,10 @@ _folders="3com acenic adaptec advansys amd-ucode amdgpu ar3k ath10k ath6k
         r128 radeon rockchip rsi rtl8192e rtl_bt rtl_nic rtlwifi sb16 slicoss sun sxg
         tehuti ti-connectivity ti-keystone tigon ttusb-budget ueagle-atm vicam vxge yam
         yamaha"
-subpackages="$pkgname-other $pkgname-none"
+subpackages="$pkgname-other::noarch $pkgname-none::noarch"
 depends="linux-firmware-other=$pkgver-r$pkgrel"
 for i in $_folders; do
-        subpackages="$pkgname-$i:folder $subpackages"
+        subpackages="$pkgname-$i:_folder:noarch $subpackages"
         depends="$pkgname-$i=$pkgver-r$pkgrel $depends"
 done
 
@@ -59,13 +76,16 @@ snapshot() {
 package() {
         cd "${_builddir}"
         make DESTDIR="${pkgdir}" FIRMWAREDIR="/lib/firmware" install
-        for i in brcmfmac43430-sdio.txt brcmfmac43430-sdio.bin; do
-                install -Dm 644 "$srcdir/$i" "$pkgdir/lib/firmware/brcm/$i"
+
+        local fw; for fw in $_rpi_firmwares; do
+                install -Dm 644 $srcdir/${fw##*/} \
+                    "$pkgdir"/lib/firmware/brcm/"${fw##*/}"
         done
+
         rm -f "${pkgdir}/usr/lib/firmware/{Makefile,README,configure,GPL-3}"
 }
 
-folder() {
+_folder() {
         local folder=${subpkgname##linux-firmware-}
         pkgdesc="firmware files for linux ($folder folder)"
         depends=""
@@ -114,5 +134,10 @@ none() {
 
 
 sha512sums="37572701d6e7be63dfb026f8a23fee345da1e1b191f02cc80d5f323537d544b325d484517966226a6e87d9b3c3741311ad7c6f2b15253b0a88f6875794f8c824  linux-firmware-20180615.tar.gz
-d3c9ae08bbb2323b4737d65a0416702c92eb52f9c395c8da6be00eb2f1d68efcb2dcb88e357adaf2130dafab32378b13d0a56c37bb647af145e5029e23744e08  brcmfmac43430-sdio.txt
-6c60b5c6df7265b9daa5dad6e409ed27fa8f4d3b2e80500d5af73d47dba9d00b2e384f43f086cb3d6b594412463857733bce78af623c573a200308508321bb25  brcmfmac43430-sdio.bin"
+6751470a48e0225731d91ab33464eaeac86da3e10dcf63a85ae0aeea6fa114ab01567fda08604e500c54bb14d38578f6c0b135c7772597d07b5ebda1e662b935  brcmfmac43430-sdio.bin
+bd6417ada7dbb940e75f43d85d9778f362f6c2801b27b4e13043eebfb5f38da4e728bdfe7240304d0ad172ba8ac1a3eff4df40119317093ea19ae23333819024  brcmfmac43430-sdio.txt
+7d3cf1a98c150aee10290edfd9bfb1fc30a7aa2ae23cd7b7f56822758334995bf24a9a0d81ef00fe5670c69940b82def890f404d93d8dc4c330ee21e90dba1fb  brcmfmac43455-sdio.bin
+a32cd00a1b3f6d10d3bc6fa15e6c5ae167e90514e9f9436bd3796f9c7df6135cbaa580c56ad236982ff0ca815e6c04b12495ba370308049c98dfbba808985862  brcmfmac43455-sdio.clm_blob
+901d839f6cb14512902584d75e5c6c1738cb7712ce701d1b57264d64dd084080a293c7326fa347c544b571ea0f8113304ebe048ec907546f07fe42891f357c47  brcmfmac43455-sdio.txt
+a7b37bce092367125e390017bb0329c3b7f8fa891cf30d422ee73ce53d0592d4ff0fc2e2a94a87eefb641d5dd8631fae1cc46664224dea987ca04b68a8af8519  BCM43430A1.hcd
+2e91c6e7f79fa5c33bc103614311656631b4c595e5a25cdbee048aa810244f604b0bbae0e6f4e9294a0c332401f8347549a42424c19a27580b3cdc9f6b9f8e2c  BCM4345C0.hcd"