From 4a900621c0f5fbcec32427177634d338596ff644 Mon Sep 17 00:00:00 2001
From: Christian Glombek <lorbus@fedoraproject.org>
Date: Sun, 15 Mar 2026 19:06:33 +0100
Subject: [PATCH] sm2850: move hexagonrpcd to common, update to v0.4.0

---
 {sm8250 => common}/hexagonrpc/10-fastrpc.rules              | 0
 {sm8250 => common}/hexagonrpc/hexagonrpc.spec               | 6 ++++--
 .../hexagonrpc/hexagonrpcd-adsp-rootpd.service              | 4 +---
 .../hexagonrpc/hexagonrpcd-adsp-sensorspd.service           | 4 +---
 {sm8250 => common}/hexagonrpc/hexagonrpcd-sdsp.service      | 4 +---
 {sm8250 => common}/hexagonrpc/sysusers.conf                 | 0
 6 files changed, 7 insertions(+), 11 deletions(-)
 rename {sm8250 => common}/hexagonrpc/10-fastrpc.rules (100%)
 rename {sm8250 => common}/hexagonrpc/hexagonrpc.spec (96%)
 rename {sm8250 => common}/hexagonrpc/hexagonrpcd-adsp-rootpd.service (50%)
 rename {sm8250 => common}/hexagonrpc/hexagonrpcd-adsp-sensorspd.service (61%)
 rename {sm8250 => common}/hexagonrpc/hexagonrpcd-sdsp.service (50%)
 rename {sm8250 => common}/hexagonrpc/sysusers.conf (100%)

diff --git a/sm8250/hexagonrpc/10-fastrpc.rules b/common/hexagonrpc/10-fastrpc.rules
similarity index 100%
rename from sm8250/hexagonrpc/10-fastrpc.rules
rename to common/hexagonrpc/10-fastrpc.rules
diff --git a/sm8250/hexagonrpc/hexagonrpc.spec b/common/hexagonrpc/hexagonrpc.spec
similarity index 96%
rename from sm8250/hexagonrpc/hexagonrpc.spec
rename to common/hexagonrpc/hexagonrpc.spec
index b1fd7af..9f744ca 100644
--- a/sm8250/hexagonrpc/hexagonrpc.spec
+++ b/common/hexagonrpc/hexagonrpc.spec
@@ -1,6 +1,6 @@
 Name:       hexagonrpc
-Version:    0.3.2
-Release:    %autorelease
+Version:    0.4.0
+Release:    1
 Summary:    FastRPC ioctl wrapper and a reverse tunnel
 
 License:    GPLv3+
@@ -85,8 +85,10 @@ install -D -m 644 %{SOURCE5} %{buildroot}%{_udevrulesdir}/10-fastrpc.rules
 %{_unitdir}/*.service
 %{_bindir}/hexagonrpcd
 %{_libexecdir}/hexagonrpc
+%{_libdir}/libhexagonrpc.so.*
 %{_sysusersdir}/fastrpc.conf
 %{_udevrulesdir}/10-fastrpc.rules
+%{_mandir}/man1/hexagonrpcd.1*
 
 %files devel
 %{_includedir}/libhexagonrpc
diff --git a/sm8250/hexagonrpc/hexagonrpcd-adsp-rootpd.service b/common/hexagonrpc/hexagonrpcd-adsp-rootpd.service
similarity index 50%
rename from sm8250/hexagonrpc/hexagonrpcd-adsp-rootpd.service
rename to common/hexagonrpc/hexagonrpcd-adsp-rootpd.service
index 7888fe3..8399c21 100644
--- a/sm8250/hexagonrpc/hexagonrpcd-adsp-rootpd.service
+++ b/common/hexagonrpc/hexagonrpcd-adsp-rootpd.service
@@ -1,11 +1,9 @@
 [Unit]
 Description=Daemon to support Qualcomm Hexagon ADSP virtual filesystem for RootPD
-ConditionPathExists=/usr/share/hexagonrpcd/hexagonrpcd-adsp-rootpd.conf
 ConditionPathExists=/dev/fastrpc-adsp
 
 [Service]
-EnvironmentFile=/usr/share/hexagonrpcd/hexagonrpcd-adsp-rootpd.conf
-ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-adsp -d adsp -R ${hexagonrpcd_fw_dir}
+ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-adsp -d adsp
 Restart=always
 RestartSec=3
 User=fastrpc
diff --git a/sm8250/hexagonrpc/hexagonrpcd-adsp-sensorspd.service b/common/hexagonrpc/hexagonrpcd-adsp-sensorspd.service
similarity index 61%
rename from sm8250/hexagonrpc/hexagonrpcd-adsp-sensorspd.service
rename to common/hexagonrpc/hexagonrpcd-adsp-sensorspd.service
index 716d472..2315f83 100644
--- a/sm8250/hexagonrpc/hexagonrpcd-adsp-sensorspd.service
+++ b/common/hexagonrpc/hexagonrpcd-adsp-sensorspd.service
@@ -2,14 +2,12 @@
 Description=Daemon to support Qualcomm Hexagon ADSP virtual filesystem for SensorPD
 Conflicts=suspend.target
 Before=suspend.target
-ConditionPathExists=/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
 # This service shouldn't be run on devices with an SDSP
 ConditionPathExists=!/dev/fastrpc-sdsp
 ConditionPathExists=/dev/fastrpc-adsp
 
 [Service]
-EnvironmentFile=/usr/share/hexagonrpcd/hexagonrpcd-adsp-sensorspd.conf
-ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-adsp -d adsp -s -R ${hexagonrpcd_fw_dir}
+ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-adsp -d adsp -s
 Restart=always
 RestartSec=3
 User=fastrpc
diff --git a/sm8250/hexagonrpc/hexagonrpcd-sdsp.service b/common/hexagonrpc/hexagonrpcd-sdsp.service
similarity index 50%
rename from sm8250/hexagonrpc/hexagonrpcd-sdsp.service
rename to common/hexagonrpc/hexagonrpcd-sdsp.service
index ce92a03..0d27592 100644
--- a/sm8250/hexagonrpc/hexagonrpcd-sdsp.service
+++ b/common/hexagonrpc/hexagonrpcd-sdsp.service
@@ -1,11 +1,9 @@
 [Unit]
 Description=Daemon to support Qualcomm Hexagon SDSP virtual filesystem
-ConditionPathExists=/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 ConditionPathExists=/dev/fastrpc-sdsp
 
 [Service]
-EnvironmentFile=/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
-ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-sdsp -d sdsp -s -R ${hexagonrpcd_fw_dir}
+ExecStart=/usr/bin/hexagonrpcd -f /dev/fastrpc-sdsp -d sdsp -s
 Restart=always
 RestartSec=3
 User=fastrpc
diff --git a/sm8250/hexagonrpc/sysusers.conf b/common/hexagonrpc/sysusers.conf
similarity index 100%
rename from sm8250/hexagonrpc/sysusers.conf
rename to common/hexagonrpc/sysusers.conf