bq-piccolo: use msm-firmware-loader (MR 3732)

device/testing/device-bq-piccolo/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=device-bq-piccolo
 pkgdesc="BQ Aquaris M5"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -24,7 +24,8 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Video(/Modem) firmware"
-	depends="firmware-qcom-adreno-a420 firmware-bq-piccolo-venus firmware-bq-piccolo-wcnss"
+	depends="firmware-qcom-adreno-a420 msm-firmware-loader
+		 firmware-bq-piccolo-venus firmware-bq-piccolo-wcnss-nv"
 	mkdir "$subpkgdir"
 }
 

device/testing/firmware-bq-piccolo/APKBUILD

@@ -1,45 +1,43 @@
 pkgname=firmware-bq-piccolo
 pkgver=1
-pkgrel=0
-_commit=c7a376fd46f103642ec81a10e1f079bce0df2075
+pkgrel=1
 pkgdesc="Firmware for BQ Aquaris M5"
-url="https://gitlab.com/a_a/firmware-bq-piccolo"
-subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss"
+url="https://gitlab.com/a_a/"
+subpackages="$pkgname-venus $pkgname-wcnss-nv:wcnss_nv"
 arch="aarch64"
 license="proprietary"
-options="!check !strip !archcheck pmb:cross-native !tracedeps"
-source="https://gitlab.com/a_a/firmware-bq-piccolo/-/archive/$_commit/firmware-bq-piccolo-$_commit.tar.gz"
-builddir="$srcdir/$pkgname-$_commit"
+options="!check !strip !archcheck !tracedeps pmb:cross-native"
+makedepends="pil-squasher"
+_repository="firmware-bq-piccolo"
+_commit="c7a376fd46f103642ec81a10e1f079bce0df2075"
+source="$pkgname-$_commit.tar.gz::$url/$_repository/-/archive/$_commit.tar.gz"
+builddir="$srcdir/$_repository-$_commit"
 
 _fwdir="/lib/firmware/postmarketos"
 
+build() {
+	# venus.mbn exists already but seems a bit different
+	pil-squasher venus2.mbn venus.mdt
+}
+
 package() {
 	# parent package is empty
 	mkdir -p "$pkgdir"
 }
 
-modem() {
-	pkgdesc="BQ Aquaris M5 modem firmware"
-	install -Dm644 "$builddir"/modem.* -t "$subpkgdir/$_fwdir"
-	install -Dm644 "$builddir"/mba.* -t "$subpkgdir/$_fwdir"
-}
-
 venus() {
 	pkgdesc="BQ Aquaris M5 video firmware"
-	install -Dm644 "$builddir"/venus.mdt "$builddir"/venus.b* \
-		-t "$subpkgdir/$_fwdir"/qcom/venus-1.8
+
+	# Linux detects squashed (.mbn) vs non-squashed (.mdt + .b*) based on
+	# file contents, so it is fine to install venus.mbn to venus.mdt
+	install -Dm644 "$builddir"/venus2.mbn "$subpkgdir/$_fwdir"/qcom/venus-1.8/venus.mdt
 }
 
-wcnss() {
-	pkgdesc="BQ Aquaris M5 WiFi/BT firmware"
-	_files="WCNSS_cfg.dat WCNSS_qcom_cfg.ini WCNSS_qcom_wlan_nv.bin"
-	install -Dm644 "$builddir"/wcnss.* -t "$subpkgdir/$_fwdir"
-	for file in $_files; do
-		install -Dm644 "$builddir"/wlan/prima/"$file" -t "$subpkgdir/$_fwdir"/wlan/prima
-	done
+wcnss_nv() {
+	pkgdesc="BQ Aquaris M5 WiFi/BT firmware configuration"
+	install -Dm644 "$builddir"/wlan/prima/WCNSS_qcom_wlan_nv.bin -t "$subpkgdir/$_fwdir"/wlan/prima
 }
 
-
 sha512sums="
 451a15cc01efa955c035ade5cdd7ce066eb9816bcc1facd7d0e6649aa746509f235a798e33d92a47c649a3cd05ed886fdcf6d817470789e5af4a7e41f8330c0f  firmware-bq-piccolo-c7a376fd46f103642ec81a10e1f079bce0df2075.tar.gz
 "