From ba6d8a86ce5e85620b431b6895665f20d95a6ae5 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@lucaweiss.eu>
Date: Wed, 3 Jul 2024 15:24:22 +0200
Subject: [PATCH] firmware-fairphone-fp5: package files for hexagonfs (MR 5313)

Package the files to be served by hexagonrpcd.
---
 .../testing/firmware-fairphone-fp5/APKBUILD   | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/device/testing/firmware-fairphone-fp5/APKBUILD b/device/testing/firmware-fairphone-fp5/APKBUILD
index 661d0f07a..440d11486 100644
--- a/device/testing/firmware-fairphone-fp5/APKBUILD
+++ b/device/testing/firmware-fairphone-fp5/APKBUILD
@@ -1,12 +1,13 @@
 pkgname=firmware-fairphone-fp5
 pkgver=20240417
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for Fairphone 5"
 subpackages="
 	$pkgname-adreno
 	$pkgname-adsp
 	$pkgname-bluetooth
 	$pkgname-cdsp
+	$pkgname-hexagonfs
 	$pkgname-ipa
 	$pkgname-modem
 	$pkgname-venus
@@ -17,7 +18,7 @@ arch="aarch64"
 license="proprietary"
 makedepends="pil-squasher"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="73b1f5451539063c161f805efd1717d6e8ee4070"
+_commit="798524050d9f4802450cd4f1bf46ddd105b6ae4f"
 source="https://github.com/FairBlobs/FP5-firmware/archive/$_commit/FP5-firmware-$_commit.tar.gz"
 builddir="$srcdir/FP5-firmware-$_commit"
 
@@ -71,10 +72,24 @@ cdsp() {
 		"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/"
 }
 
+hexagonfs() {
+	pkgdesc="Fairphone 5 hexagonfs files"
+
+	mkdir -p "$subpkgdir"/usr/share/qcom/qcm6490/Fairphone/
+	cp -r "$builddir"/hexagonfs/ \
+		"$subpkgdir"/usr/share/qcom/qcm6490/Fairphone/fairphone5
+
+	# Remove files that we don't need - for now
+	rm -r "$subpkgdir"/usr/share/qcom/qcm6490/Fairphone/fairphone5/acdb/
+	rm -r "$subpkgdir"/usr/share/qcom/qcm6490/Fairphone/fairphone5/dsp/
+
+	find "$subpkgdir/usr/share/qcom/qcm6490/Fairphone/fairphone5/" \
+		-type f -exec chmod 0644 {} \;
+}
+
 ipa() {
 	pkgdesc="Fairphone 5 ipa firmware"
 
-	cd "$builddir"
 	install -Dm644 "$builddir"/yupik_ipa_fws.mbn \
 		"$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/ipa_fws.mbn"
 	ln -s ipa_fws.mbn "$subpkgdir/lib/firmware/qcom/qcm6490/fairphone5/ipa_fws.mdt"
@@ -111,5 +126,5 @@ wpss() {
 }
 
 sha512sums="
-7c21f8ba33e34167555769ded52debb472552e421608b54c33f244edc9f1ff633400ae2bf21bfe8df00e6a138d8ed53b9edf5d6aa5c0cdd63308854881077f7e  FP5-firmware-73b1f5451539063c161f805efd1717d6e8ee4070.tar.gz
+b952aeb6dc953a66514aea00a32cc766c2554e59c9dbbdab723dbf65d5e5e5deeefdc80e88ec59214fdf89d2ffdd6e632e42304ef510431fb4ecc0374f81ba06  FP5-firmware-798524050d9f4802450cd4f1bf46ddd105b6ae4f.tar.gz
 "