From af2446e5b4fcdc856f0fa85ae522d6a9ddf6f0c5 Mon Sep 17 00:00:00 2001
From: Denis <dburkov05@bk.ru>
Date: Tue, 13 Jun 2023 19:58:17 +0500
Subject: [PATCH] xiaomi-pine: Better organization of blobs (MR 4180)

---
 device/testing/firmware-xiaomi-pine/APKBUILD | 33 +++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/device/testing/firmware-xiaomi-pine/APKBUILD b/device/testing/firmware-xiaomi-pine/APKBUILD
index 249671dc6..0af7f760a 100644
--- a/device/testing/firmware-xiaomi-pine/APKBUILD
+++ b/device/testing/firmware-xiaomi-pine/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=firmware-xiaomi-pine
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for Xiaomi Redmi 7A"
 url="https://github.com/dburkov05/firmware-xiaomi-pine"
@@ -8,24 +8,35 @@ depends="wcnss-wlan"
 license="proprietary"
 options="!check !strip !archcheck !spdx !tracedeps pmb:cross-native"
 
-_commit="be929cc62c8d8150f0a4806aa2af059c6fb4e31e"
+_commit="2ac9558477be0fb8547838ea0eb905026f319c23"
 
 source="$pkgname-$_commit.tar.gz::$url/archive/$_commit.tar.gz"
 
+_fwdir="/lib/firmware/postmarketos"
+
 package() {
 	cd "$srcdir/$pkgname-$_commit"
 
-	for _i in $(ls -p | grep -v /); do
-		install -D -m644 "$_i" \
-			"$pkgdir/lib/firmware/postmarketos/$_i"
-	done
+	# ADSP firmware
+	install -Dm0644 adsp/adsp.* -t "$pkgdir/$_fwdir"
 
+	# Camera firmware
+	install -Dm0644 camera/*.fw -t "$pkgdir/$_fwdir"
 
-	for _i in $(ls -p "wlan/prima" | grep -v /); do
-		install -D -m644 "wlan/prima/$_i" \
-			"$pkgdir/lib/firmware/postmarketos/wlan/prima/$_i"
-	done
+	# GPU and video acceleration firmwares
+	install -Dm0644 gpu/a530* -t "$pkgdir/$_fwdir/../qcom"
+	install -Dm0644 gpu/a506_zap.* -t "$pkgdir/$_fwdir"
+
+	install -Dm0644 venus/venus.* -t "$pkgdir/$_fwdir"
+
+	# Modem firmware
+	install -Dm0644 modem/mba.mbn -t "$pkgdir/$_fwdir"
+	install -Dm0644 modem/modem.* -t "$pkgdir/$_fwdir"
+
+	# Wifi/BT firmware
+	install -Dm0644 wcnss/wcnss.* -t "$pkgdir/$_fwdir"
+	cp -r wlan "$pkgdir/$_fwdir"
 }
 sha512sums="
-d5ea67d08e39b55c786137fd5a1ead047810b2a352b8b08c8c0a36f1ee81ad28a4a900868de67efff98fbc195d184f772b2ca6e53efef2319d6c3c1f863350e3  firmware-xiaomi-pine-be929cc62c8d8150f0a4806aa2af059c6fb4e31e.tar.gz
+6781e410c476a294a16530361fad5ebda0847d6aac205c03449981b04cc722c70ce3b7923ff85b43ede759b7678ba26b64b82468bd653137aa2aad8f620d2ed6  firmware-xiaomi-pine-2ac9558477be0fb8547838ea0eb905026f319c23.tar.gz
 "