From cdb5b2873e42f5f9e299f9febeea62d045e5a612 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Fri, 28 Jun 2024 16:12:45 +0200
Subject: [PATCH] firmware-fairphone-fp4: package files for hexagonfs (MR 5290)

Package the files to be served by hexagonrpcd.
---
 .../community/firmware-fairphone-fp4/APKBUILD | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/device/community/firmware-fairphone-fp4/APKBUILD b/device/community/firmware-fairphone-fp4/APKBUILD
index ba05ae51e..13a779265 100644
--- a/device/community/firmware-fairphone-fp4/APKBUILD
+++ b/device/community/firmware-fairphone-fp4/APKBUILD
@@ -1,12 +1,13 @@
 pkgname=firmware-fairphone-fp4
 pkgver=20240313
-pkgrel=0
+pkgrel=1
 pkgdesc="Firmware for Fairphone 4"
 subpackages="
 	$pkgname-adreno
 	$pkgname-adsp
 	$pkgname-bluetooth
 	$pkgname-cdsp
+	$pkgname-hexagonfs
 	$pkgname-ipa
 	$pkgname-modem
 	$pkgname-venus
@@ -16,8 +17,8 @@ url="https://github.com/FairBlobs/FP4-firmware"
 arch="aarch64"
 license="proprietary"
 makedepends="pil-squasher"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="d95bd920afa9084cefe0f69be931a5421e544154"
+options="!check !strip !archcheck !tracedeps textrels pmb:cross-native"
+_commit="222756885ff5eb24ee89684ef8cfe860a45a54ec"
 source="https://github.com/FairBlobs/FP4-firmware/archive/$_commit/FP4-firmware-$_commit.tar.gz"
 builddir="$srcdir/FP4-firmware-$_commit"
 
@@ -68,10 +69,24 @@ cdsp() {
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/"
 }
 
+hexagonfs() {
+	pkgdesc="Fairphone 4 hexagonfs files"
+
+	mkdir -p "$subpkgdir"/usr/share/qcom/sm7225/Fairphone/
+	cp -r "$builddir"/hexagonfs/ \
+		"$subpkgdir"/usr/share/qcom/sm7225/Fairphone/fairphone4
+
+	# Remove files that we don't need - for now
+	rm -r "$subpkgdir"/usr/share/qcom/sm7225/Fairphone/fairphone4/acdb/
+	rm -r "$subpkgdir"/usr/share/qcom/sm7225/Fairphone/fairphone4/dsp/
+
+	find "$subpkgdir/usr/share/qcom/sm7225/Fairphone/fairphone4/" \
+		-type f -exec chmod 0644 {} \;
+}
+
 ipa() {
 	pkgdesc="Fairphone 4 ipa firmware"
 
-	cd "$builddir"
 	install -Dm644 "$builddir"/lagoon_ipa_fws.mbn \
 		"$subpkgdir/lib/firmware/qcom/sm7225/fairphone4/ipa_fws.mbn"
 }
@@ -105,5 +120,5 @@ wlan() {
 }
 
 sha512sums="
-3839431922c6250fa76c563183387edbc1370f34d833d5d7c6c08f0d921c0498c93ff376af5d43fecf78d4ac6aff3b90e41345310181826b0a21507dbfba778c  FP4-firmware-d95bd920afa9084cefe0f69be931a5421e544154.tar.gz
+b6836a8770c089615698ec26d397530c75086457c309d7220265da1203f2b06c4021d5a872244ad1e5a4a19d0d8192c13ae2051538e24d1df5292480daa6309d  FP4-firmware-222756885ff5eb24ee89684ef8cfe860a45a54ec.tar.gz
 "