From a5eb0304524dcf06ffb37c7158479f267a60bb32 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 6 Mar 2020 19:48:03 +0100
Subject: [PATCH] modem/qrtr: cleanup (!1032)

- Fix version
- Rename init script to qrtr-ns ("nameservice") to clarify which
  service is actually started
- Use supervise-daemon
- Configure and start daemon in one command (no need for qrtr-cfg)
- Remove "before qcom_rmtfs": it should depend on qrtr-ns,
  not the other way around
- Do not activate qrtr daemon by default - this should happen automatically
  if other service files have "need qrtr-ns"
---
 modem/qrtr/APKBUILD          | 13 +++++++------
 modem/qrtr/qrtr-ns.initd     |  9 +++++++++
 modem/qrtr/qrtr.initd        | 11 -----------
 modem/qrtr/qrtr.post-install |  3 ---
 4 files changed, 16 insertions(+), 20 deletions(-)
 create mode 100644 modem/qrtr/qrtr-ns.initd
 delete mode 100644 modem/qrtr/qrtr.initd
 delete mode 100644 modem/qrtr/qrtr.post-install

diff --git a/modem/qrtr/APKBUILD b/modem/qrtr/APKBUILD
index 201c82450..b1bcdbe39 100644
--- a/modem/qrtr/APKBUILD
+++ b/modem/qrtr/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=qrtr
-pkgver=1.1.0.3_git20200302
+pkgver=0.3_git20200302
 _commit="7bd5cf302437755b0d741c9dc1805395a9654597"
 pkgrel=0
 pkgdesc="Userspace reference for net/qrtr in the Linux kernel"
@@ -8,11 +8,10 @@ arch="all"
 license="BSD-3-Clause"
 depends_dev="linux-headers"
 makedepends="$depends_dev"
-install="$pkgname.post-install"
-subpackages="$pkgname-doc $pkgname-dev"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc"
 source="
 	qrtr-$_commit.tar.gz::https://github.com/andersson/qrtr/archive/$_commit.tar.gz
-	qrtr.initd
+	qrtr-ns.initd
 "
 builddir="$srcdir/qrtr-$_commit"
 options="!check"
@@ -23,9 +22,11 @@ build() {
 
 package() {
 	make prefix=/usr DESTDIR="$pkgdir" install
+	rm -r "$pkgdir"/usr/lib/systemd
+
 	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-	install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
+	install -Dm755 "$srcdir"/qrtr-ns.initd "$pkgdir"/etc/init.d/qrtr-ns
 }
 
 sha512sums="054d75190d110b3daa397bcc1c954a2361bd1024b81055e94ea257a4d79f0bc4e789dd7c33f5b649e4fec82480ef0ff6c78a64aaee1c9ff97f30dd4ba9bc1dc8  qrtr-7bd5cf302437755b0d741c9dc1805395a9654597.tar.gz
-fcd9b8e4c4df9236ec778f1ffb231e547e0d65c718e0caf351bee821b1549aecafbfdb21b4c1d1e3d049d541d87b6bf98746414e88e5d70d05131e0496e1ef37  qrtr.initd"
+68c27e5c1c70ffdec0498cd4746208dd571e392ba030cf1a52f4a05394a57e399cf7437a1f27631dd288c7771fb656946aa27d7aec5b23d41fe13c5199ae390a  qrtr-ns.initd"
diff --git a/modem/qrtr/qrtr-ns.initd b/modem/qrtr/qrtr-ns.initd
new file mode 100644
index 000000000..f95b4e029
--- /dev/null
+++ b/modem/qrtr/qrtr-ns.initd
@@ -0,0 +1,9 @@
+#!/sbin/openrc-run
+supervisor=supervise-daemon
+
+name="QRTR"
+description="Qualcomm IPC router name service"
+
+# -f should be in command_args_foreground, but then the order is wrong (1 -f)
+command="/usr/bin/qrtr-ns"
+command_args="-f 1"
diff --git a/modem/qrtr/qrtr.initd b/modem/qrtr/qrtr.initd
deleted file mode 100644
index 48c038b65..000000000
--- a/modem/qrtr/qrtr.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	before qcom_rmtfs
-}
-
-start() {
-	ebegin "Starting QRTR service"
-	/usr/bin/qrtr-cfg 1 && /usr/bin/qrtr-ns
-	eend $?
-}
diff --git a/modem/qrtr/qrtr.post-install b/modem/qrtr/qrtr.post-install
deleted file mode 100644
index 6f2a5cac1..000000000
--- a/modem/qrtr/qrtr.post-install
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update -q add qrtr boot