From d68bbc98f4364e19edd4ac03ce2cdf8f41b15577 Mon Sep 17 00:00:00 2001
From: Achill Gilgenast <achill@achill.org>
Date: Mon, 24 Nov 2025 23:46:07 +0100
Subject: [PATCH] modem/qcom-diag: subpackage -systemd

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7421>
---
 modem/qcom-diag/APKBUILD              |  7 ++++--
 modem/qcom-diag/systemd-service.patch | 31 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 modem/qcom-diag/systemd-service.patch

diff --git a/modem/qcom-diag/APKBUILD b/modem/qcom-diag/APKBUILD
index 1ceaf9fdb..a8ea9b7e7 100644
--- a/modem/qcom-diag/APKBUILD
+++ b/modem/qcom-diag/APKBUILD
@@ -1,17 +1,18 @@
 # Maintainer: SzczurekYT <szczurek@szczurek.yt>
 pkgname=qcom-diag
 pkgver=0_git20250324
-pkgrel=0
+pkgrel=1
 _commit="29277ef0bcbe22468a3836b796dc525ba6df87f3"
 pkgdesc="Routing of diagnostics related messages between host and various subsystems"
 url="https://github.com/linux-msm/diag"
 arch="all"
 license="BSD-3-Clause"
 makedepends="linux-headers musl-dev eudev-dev qrtr-dev"
-subpackages="$pkgname-doc $pkgname-openrc"
+subpackages="$pkgname-doc $pkgname-openrc $pkgname-systemd"
 source="
 	diag-$_commit.tar.gz::https://github.com/linux-msm/diag/archive/$_commit.tar.gz
 	diag-router.initd
+	systemd-service.patch
 "
 builddir="$srcdir/diag-$_commit"
 options="!check" # No test suite
@@ -24,9 +25,11 @@ package() {
 	make prefix=/usr DESTDIR="$pkgdir" install
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 	install -Dm755 "$srcdir"/diag-router.initd "$pkgdir"/etc/init.d/diag-router
+	install -Dm644 diag-router.service -t "$pkgdir"/usr/lib/systemd/system/
 }
 
 sha512sums="
 19987ed217edc783fcf215b61d969d4d77c3b018db63b70543f925134100345000b434a340cec1b2494da54b66c3b39874924b174d0b4ed8fffe716b6046f6fb  diag-29277ef0bcbe22468a3836b796dc525ba6df87f3.tar.gz
 8417f0280e11a2f3855a3178da9de837202a5219eb7653779699ee7ede7f63a888bce8ff47340a5338e3a010d0c1589e5b8d5fcb627abb990d2697a9137c6606  diag-router.initd
+43069ef4b03b234ddfd9f2522aae3d0d3a073fb5ccb5fb1d9beaf4065307e2b586023283ceca0ff7751a918223b159f3a0fd169e524c57014438e92bfd0717c7  systemd-service.patch
 "
diff --git a/modem/qcom-diag/systemd-service.patch b/modem/qcom-diag/systemd-service.patch
new file mode 100644
index 000000000..1ef05b2c5
--- /dev/null
+++ b/modem/qcom-diag/systemd-service.patch
@@ -0,0 +1,31 @@
+From b3f52a7b1a98bfdf0a3847b186ad81432291b5aa Mon Sep 17 00:00:00 2001
+From: Achill Gilgenast <achill@achill.org>
+Date: Thu, 20 Nov 2025 15:28:42 +0100
+Subject: [PATCH] Add systemd system service
+
+Adapted from downstream in postmarketOS:
+https://gitlab.postmarketos.org/postmarketOS/pmaports/-/blob/master/extra-repos/systemd/systemd-services/system-diag-router.service
+
+Signed-off-by: Achill Gilgenast <achill@achill.org>
+---
+ diag-router.service | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+ create mode 100644 diag-router.service
+
+diff --git a/diag-router.service b/diag-router.service
+new file mode 100644
+index 0000000..2a6c816
+--- /dev/null
++++ b/diag-router.service
+@@ -0,0 +1,11 @@
++[Unit]
++Description=Routing of diagnostics related messages between host and various subsystems
++Before=rmtfs.service
++
++[Service]
++ExecStart=/usr/bin/diag-router
++Restart=always
++RestartSec=1
++
++[Install]
++WantedBy=multi-user.target