modem/rmtfs: patch to serve modem_study partition for Fairphone (Gen. 6)

And replace the modem_tng patch with the version that was accepted
upstream.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6962>

modem/rmtfs/0001-Add-modem_tng-alias-for-tunning-partition.patch

@@ -0,0 +1,24 @@
+From 7a5ae7e0a57be3e09e0256b51b9075ee6b860322 Mon Sep 17 00:00:00 2001
+From: bbeaavr <115647151+bbeaavr@users.noreply.github.com>
+Date: Wed, 12 Oct 2022 16:56:51 +0200
+Subject: [PATCH 1/2] Add "modem_tng" alias for tunning partition
+
+---
+ storage.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/storage.c b/storage.c
+index 107b296..140c6bf 100644
+--- a/storage.c
++++ b/storage.c
+@@ -42,6 +42,7 @@ static const struct partition partition_table[] = {
+ 	{ "/boot/modem_fsc", "modem_fsc", "fsc" },
+ 	{ "/boot/modem_fsg", "modem_fsg", "fsg" },
+ 	{ "/boot/modem_tunning", "modem_tunning", "tunning" },
++	{ "/boot/modem_tng", "modem_tng", "tunning" },
+ 	{}
+ };
+ 
+-- 
+2.50.1
+

modem/rmtfs/0001-add-modem_tng-alias-for-tunning-partition.patch

@@ -1,14 +0,0 @@
-Upstream pull request: https://github.com/andersson/rmtfs/pull/17
-
-diff --git a/storage.c b/storage.c
-index 107b296..2c5f2f5 100644
---- a/storage.c
-+++ b/storage.c
-@@ -41,6 +41,7 @@ static const struct partition partition_table[] = {
- 	{ "/boot/modem_fs2", "modem_fs2", "modemst2" },
- 	{ "/boot/modem_fsc", "modem_fsc", "fsc" },
- 	{ "/boot/modem_fsg", "modem_fsg", "fsg" },
-+	{ "/boot/modem_tng", "modem_tng", "tunning" },
- 	{ "/boot/modem_tunning", "modem_tunning", "tunning" },
- 	{}
- };

modem/rmtfs/0002-storage-Add-modem_study-into-partition_table.patch

@@ -0,0 +1,26 @@
+From 8b356782713c54e65a4c950b5486967f28f28a87 Mon Sep 17 00:00:00 2001
+From: Luca Weiss <luca.weiss@fairphone.com>
+Date: Mon, 28 Jul 2025 13:40:48 +0200
+Subject: [PATCH 2/2] storage: Add modem_study into partition_table
+
+The partition /boot/modem_study needs to be served on the Milos/SM7635
+Fairphone (Gen. 6) smartphone.
+---
+ storage.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/storage.c b/storage.c
+index 140c6bf..001464d 100644
+--- a/storage.c
++++ b/storage.c
+@@ -41,6 +41,7 @@ static const struct partition partition_table[] = {
+ 	{ "/boot/modem_fs2", "modem_fs2", "modemst2" },
+ 	{ "/boot/modem_fsc", "modem_fsc", "fsc" },
+ 	{ "/boot/modem_fsg", "modem_fsg", "fsg" },
++	{ "/boot/modem_study", "modem_study", "study" },
+ 	{ "/boot/modem_tunning", "modem_tunning", "tunning" },
+ 	{ "/boot/modem_tng", "modem_tng", "tunning" },
+ 	{}
+-- 
+2.50.1
+

modem/rmtfs/APKBUILD

@@ -2,7 +2,7 @@
 pkgname=rmtfs
 pkgver=0.2_git20220718
 _commit="695d0668ffa6e2a4bf6e676f3c58a444a5d67690"
-pkgrel=2
+pkgrel=3
 pkgdesc="Qualcomm Remote Filesystem Service Implementation"
 url="https://github.com/andersson/rmtfs"
 arch="all"
@@ -14,7 +14,8 @@ source="
 	rmtfs.confd
 	rmtfs.initd
 	udev.rules
-	0001-add-modem_tng-alias-for-tunning-partition.patch
+	0001-Add-modem_tng-alias-for-tunning-partition.patch
+	0002-storage-Add-modem_study-into-partition_table.patch
 "
 builddir="$srcdir/rmtfs-$_commit"
 options="!check"
@@ -36,5 +37,6 @@ sha512sums="
 f27225e88be7906b0987bfc6fff4f2d5fe1be835d6df4299b7f240a9bf48f4d8cc635353e845d61c291e7857b059933cc567e39b03c7c655e3205bbcbacae3d3  rmtfs.confd
 12215677a772a7233f8da1b41f4aa16f5bc8f2e10385882b1cae23d131f47b03524b7cdf519c1354354bbe353bdbefb15e2d9349894916a1cf6dc951a29d7a44  rmtfs.initd
 cb2435c159d81d3a40d30e1355c82a3d560dc2df7d05fee95085bc80e492ac93a728258f2f1b463c04a964979760990c8c9176b22cb585cbec19ab285cd45440  udev.rules
-2c48e3e97838eb2b779075263ef688bc48dde5cc9fc8f055e8ee67cc115228ab59e9466faa89dd817812ee9e3219e8ca331d766e84ad383a1b9706cbbdc2c6fd  0001-add-modem_tng-alias-for-tunning-partition.patch
+a55bbb30e588bd082c85adfc11a8c592708cffc76cc5a56d69d11f3a95bfaf3e49592a0813b1dd4ab03dcbf91773eeec834df4b15be81be842418e64d697bc2d  0001-Add-modem_tng-alias-for-tunning-partition.patch
+60cf74936db55f26559d81a61a7ed1fb27e89a6c8650bb0f43fbb789ba208f52bd9bd3359c52ce4c9a98bc3014c7ce231e8f468b9856eb43449d8561e4f72b44  0002-storage-Add-modem_study-into-partition_table.patch
 "