From f8882cb4f2c68a2392f1f5b529cda7fb6e6b7ece Mon Sep 17 00:00:00 2001
From: chalkin <chalkin@yeah.net>
Date: Mon, 2 Sep 2024 12:32:04 +0800
Subject: [PATCH] firmware-lenovo-q706f: add hexagonfs subpackages (MR 5506)

---
 device/testing/firmware-lenovo-q706f/APKBUILD | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/device/testing/firmware-lenovo-q706f/APKBUILD b/device/testing/firmware-lenovo-q706f/APKBUILD
index c193fbb1d..1875ac160 100644
--- a/device/testing/firmware-lenovo-q706f/APKBUILD
+++ b/device/testing/firmware-lenovo-q706f/APKBUILD
@@ -1,12 +1,13 @@
 pkgname=firmware-lenovo-q706f
 pkgver=20240726
-pkgrel=1
+pkgrel=2
 pkgdesc="Firmware for Lenovo Xiaoxin Pad Pro 12.6 (Lenovo Tab P12 Pro)"
 subpackages="
 	$pkgname-adreno
 	$pkgname-adsp
 	$pkgname-cdsp
 	$pkgname-cirrus
+	$pkgname-hexagonfs
 	$pkgname-slpi
 	$pkgname-venus
 	"
@@ -14,8 +15,8 @@ url="https://github.com/silime/lenovo-sm8250-q706f-firmware"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="24f7bcfbe457e5de21a2600be4619303503d3695"
-source="https://github.com/silime/lenovo-sm8250-q706f-firmware/archive/$_commit.zip"
+_commit="1be73450f1aaa6896c59fc1768a4fc98abe7cbda"
+source="$pkgname.zip::https://github.com/silime/lenovo-sm8250-q706f-firmware/archive/$_commit.zip"
 builddir="$srcdir/lenovo-sm8250-q706f-firmware-$_commit"
 
 package() {
@@ -53,6 +54,21 @@ cirrus() {
 		"$subpkgdir/lib/firmware/cirrus/"
 }
 
+hexagonfs() {
+	pkgdesc="Lenovo q706f hexagonfs files"
+
+	mkdir -p "$subpkgdir"/usr/share/qcom/sm8250/Lenovo
+	cp -r "$builddir"/hexagonfs/ \
+		"$subpkgdir"/usr/share/qcom/sm8250/Lenovo/q706f
+
+	# Remove files that we don't need - for now
+	rm -r "$subpkgdir"/usr/share/qcom/sm8250/Lenovo/q706f/acdb/
+	rm -r "$subpkgdir"/usr/share/qcom/sm8250/Lenovo/q706f/dsp/
+
+	find "$subpkgdir/usr/share/qcom/sm8250/Lenovo/q706f/" \
+		-type f -exec chmod 0644 {} \;
+}
+
 slpi() {
 	pkgdesc="Lenovo q706f slpi firmware"
 
@@ -68,5 +84,5 @@ venus() {
 }
 
 sha512sums="
-8590482902de2239e0d2edac36a548ccc51204a8c8173ed865f1f0697435eb70b1de8680e8fa2b7bb2274ad0876ab42e64d25682cfab171f45eb4c9f5819ed2c  24f7bcfbe457e5de21a2600be4619303503d3695.zip
+7bf6f56c92dd743828c32dfc51e0f8ce44fe81a5d8388097d5b7801cae7b1679c12052283b55423058547e76944e7de917d734c114f0f520f4fb065875fac3db  firmware-lenovo-q706f.zip
 "