motorola-osprey: use firmware from harpia (MR 2613)

The files packaged in firmware-motorola-osprey-wcnss-nv and
firmware-motorola-osprey-venus seem completely identical to those
of harpia, so there is no need to package them twice. There are some
differences in modem/wcnss firmware but those are now covered by the
msm-firmware-loader.

device/testing/device-motorola-osprey/APKBUILD

 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-osprey
 pkgver=3
-pkgrel=0
+pkgrel=1
 pkgdesc="Motorola Moto G 3rd gen. (2015)"
 url="https://postmarketos.org"
 arch="aarch64"
@@ -39,7 +39,8 @@ kernel_mainline_modem() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/Wi-Fi/Bluetooth/Video(/Modem) firmware"
-	depends="linux-firmware-qcom msm-firmware-loader firmware-motorola-osprey-wcnss-nv firmware-motorola-osprey-venus"
+	# osprey's wcnss-nv + venus firmware seems identical to harpia's :>
+	depends="linux-firmware-qcom msm-firmware-loader firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus"
 	mkdir "$subpkgdir"
 }
 

device/testing/firmware-motorola-osprey/APKBUILD

-# Maintainer: Martijn Braam <martijn@brixit.nl>
-pkgname=firmware-motorola-osprey
-pkgver=2
-pkgrel=0
-pkgdesc="Firmware for Motorola Moto G 2015"
-url="https://github.com/pmsourcedump/firmware-motorola-osprey"
-subpackages="$pkgname-wcnss-nv:wcnss_nv $pkgname-venus"
-arch="aarch64"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-
-_commit="a47c5a1c2dd806226c61305c9c97135f2734d0c7"
-source="$pkgname-$_commit.tar.gz::https://github.com/pmsourcedump/firmware-motorola-osprey/archive/$_commit.tar.gz"
-
-_fwdir="/lib/firmware/postmarketos"
-
-package() {
-	mkdir -p "$pkgdir"
-}
-
-wcnss_nv() {
-	pkgdesc="Motorola Moto G 2015 Wi-Fi/Bluetooth firmware configuration"
-	replaces="firmware-motorola-osprey-wcnss"
-	cd "$srcdir/firmware-motorola-osprey-$_commit"
-	install -Dm644 wlan/prima/WCNSS_qcom_wlan_nv.bin -t "$subpkgdir/$_fwdir/wlan/prima"
-}
-
-venus() {
-	pkgdesc="Motorola Moto G 2015 video firmware"
-	cd "$srcdir/firmware-motorola-osprey-$_commit"
-	install -Dm644 venus.b* -t "$subpkgdir/$_fwdir/qcom/venus-1.8"
-	install -Dm644 venus.mdt -t "$subpkgdir/$_fwdir/qcom/venus-1.8"
-}
-
-sha512sums="7e8d02baa8864c50b4a8be1f9af830e8b5440eee61a012725ed114d93012f0fb19ec005908832d3c96e0ba54b51a5ec7bcf137bfcc64c63594212f2497604629  firmware-motorola-osprey-a47c5a1c2dd806226c61305c9c97135f2734d0c7.tar.gz"