[Debian-on-mobile-maintainers] Bug#1109869: unblock: rmtfs/1.1-4

[Arnaud Ferraris]

Package: release.debian.org
Severity: normal
X-Debbugs-Cc: rmtfs at packages.debian.org, aferraris at debian.org
Control: affects -1 + src:rmtfs
User: release.debian.org at packages.debian.org
Usertags: unblock

Please unblock package rmtfs

[ Reason ]
Fixes a crash on some platforms (e.g. Qualcomm RB1) during shutdown.

[ Impact ]
None other than fixing the aforementioned crash

[ Tests ]
Manually tested the new version.

[ Risks ]
None, the change is trivial and only affects systemd services ordering.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock rmtfs/1.1-4
-------------- next part --------------
diff -Nru rmtfs-1.1/debian/changelog rmtfs-1.1/debian/changelog
--- rmtfs-1.1/debian/changelog	2025-05-19 12:18:34.000000000 +0200
+++ rmtfs-1.1/debian/changelog	2025-07-25 11:13:29.000000000 +0200
@@ -1,3 +1,12 @@
+rmtfs (1.1-4) unstable; urgency=medium
+
+  [ Robie Basak ]
+  * Fix wifi crash on shutdown.
+    Cherry-picked from upstream: https://github.com/linux-msm/rmtfs/commit/5b214f61b9b82998bf13f4bfd16fe4e2cd29c086
+    Downstream bug: https://github.com/qualcomm-linux/qcom-deb-images/issues/40
+
+ -- Arnaud Ferraris <aferraris at debian.org>  Fri, 25 Jul 2025 11:13:29 +0200
+
 rmtfs (1.1-3) unstable; urgency=medium
 
   * d/control: only build for ARMv7+
diff -Nru rmtfs-1.1/debian/patches/0002-rmtfs.service-Fix-start-stop-ordering-between-rmtfs-.patch rmtfs-1.1/debian/patches/0002-rmtfs.service-Fix-start-stop-ordering-between-rmtfs-.patch
--- rmtfs-1.1/debian/patches/0002-rmtfs.service-Fix-start-stop-ordering-between-rmtfs-.patch	1970-01-01 01:00:00.000000000 +0100
+++ rmtfs-1.1/debian/patches/0002-rmtfs.service-Fix-start-stop-ordering-between-rmtfs-.patch	2025-07-25 11:13:29.000000000 +0200
@@ -0,0 +1,42 @@
+From 5b214f61b9b82998bf13f4bfd16fe4e2cd29c086 Mon Sep 17 00:00:00 2001
+From: Loic Poulain <loic.poulain at oss.qualcomm.com>
+Date: Tue, 10 Jun 2025 14:58:52 +0200
+Subject: [PATCH] rmtfs.service: Fix start/stop ordering between rmtfs and
+ NetworkManager
+
+Since rmtfs typically provides resources for wireless and modem-related
+processors, it's important to ensure that this service starts before
+and stops after NetworkManager.
+
+On platforms like QCOM RB1, this sequencing prevents the Wi-Fi interface(s)
+from being left in a dangling state while NetworkManager attempts to tear
+down the interface(s):
+https://github.com/qualcomm-linux/qcom-deb-images/issues/40#issuecomment-2944265370
+
+The 'Before' dependency directive is ignored if NetworkManager is disabled or absent.
+
+Signed-off-by: Loic Poulain <loic.poulain at oss.qualcomm.com>
+
+Origin: backport, https://github.com/linux-msm/rmtfs/commit/5b214f61b9b82998bf13f4bfd16fe4e2cd29c086
+Bug: https://github.com/linux-msm/rmtfs/pull/24
+Bug-qcom: https://github.com/qualcomm-linux/qcom-deb-images/issues/40
+Last-Update: 2025-07-24
+---
+ rmtfs-dir.service.in | 1 +
+ rmtfs.service.in     | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/rmtfs.service.in b/rmtfs.service.in
+index abd12df..2dc08df 100644
+--- a/rmtfs.service.in
++++ b/rmtfs.service.in
+@@ -1,5 +1,6 @@
+ [Unit]
+ Description=Qualcomm remotefs service
++Before=NetworkManager.service
+ 
+ [Service]
+ ExecStart=RMTFS_PATH/rmtfs -r -P -s
+-- 
+2.48.1
+
diff -Nru rmtfs-1.1/debian/patches/series rmtfs-1.1/debian/patches/series
--- rmtfs-1.1/debian/patches/series	2025-05-19 12:18:34.000000000 +0200
+++ rmtfs-1.1/debian/patches/series	2025-07-25 11:13:29.000000000 +0200
@@ -1 +1,2 @@
 0001-rmtfs.service.in-Remove-dependency-on-qrtr-ns.servic.patch
+0002-rmtfs.service-Fix-start-stop-ordering-between-rmtfs-.patch