From 8a36bb744e9b3f6f103ec7cebb9685f73e88a7cf Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Wed, 7 Oct 2020 11:48:37 +0200
Subject: [PATCH] oneplus-oneplus3(t): explicitly install + activate qrtr-ns
 (MR 1640)

qrtr-ns is now part of the Linux kernel (as of version 5.9), so
there is no need to start it in userspace anymore. It does not seem
to be needed (or working) on downstream either.

linux-postmarketos-qcom-msm8996 is the only mainline kernel which
is still on < 5.9. In preparation to make the qrtr dependency optional
for rmtfs, let's explicitly enable qrtr-ns for MSM8996 devices to avoid
causing regressions.
---
 device/testing/device-oneplus-oneplus3/APKBUILD              | 5 ++++-
 .../device-oneplus-oneplus3-nonfree-firmware.post-install    | 4 ++++
 device/testing/device-oneplus-oneplus3t/APKBUILD             | 5 ++++-
 .../device-oneplus-oneplus3t-nonfree-firmware.post-install   | 4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 device/testing/device-oneplus-oneplus3/device-oneplus-oneplus3-nonfree-firmware.post-install
 create mode 100644 device/testing/device-oneplus-oneplus3t/device-oneplus-oneplus3t-nonfree-firmware.post-install

diff --git a/device/testing/device-oneplus-oneplus3/APKBUILD b/device/testing/device-oneplus-oneplus3/APKBUILD
index 9482f98ef..01547ecca 100644
--- a/device/testing/device-oneplus-oneplus3/APKBUILD
+++ b/device/testing/device-oneplus-oneplus3/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-oneplus-oneplus3
 pkgdesc="OnePlus 3"
 pkgver=1
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -33,7 +33,10 @@ nonfree_firmware() {
 		linux-firmware-qca
 		firmware-oneplus-oneplus3-op3
 		msm-modem-rpmsg
+		qrtr
+		qrtr-openrc
 		"
+	install="$subpkgname.post-install"
 	mkdir "$subpkgdir"
 }
 sha512sums="10a1d2ba145d71dc9d97dd471fe5e0a738a23783d9773e2fa1d1b91c5190c3fb535c0babd1ce3c397908769a55be0819b9f8d6a5167eaf11b76ac6e5511ed70f  deviceinfo"
diff --git a/device/testing/device-oneplus-oneplus3/device-oneplus-oneplus3-nonfree-firmware.post-install b/device/testing/device-oneplus-oneplus3/device-oneplus-oneplus3-nonfree-firmware.post-install
new file mode 100644
index 000000000..17e0ca4d0
--- /dev/null
+++ b/device/testing/device-oneplus-oneplus3/device-oneplus-oneplus3-nonfree-firmware.post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# FIXME: qrtr-ns is now part of the Linux kernel, remove this when upgrading to 5.9!
+rc-update add qrtr-ns boot
diff --git a/device/testing/device-oneplus-oneplus3t/APKBUILD b/device/testing/device-oneplus-oneplus3t/APKBUILD
index 9249cf7e0..9063d6868 100644
--- a/device/testing/device-oneplus-oneplus3t/APKBUILD
+++ b/device/testing/device-oneplus-oneplus3t/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-oneplus-oneplus3t
 pkgdesc="OnePlus 3T"
 pkgver=1
-pkgrel=3
+pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -33,7 +33,10 @@ nonfree_firmware() {
 		linux-firmware-qca
 		firmware-oneplus-oneplus3-op3t
 		msm-modem-rpmsg
+		qrtr
+		qrtr-openrc
 		"
+	install="$subpkgname.post-install"
 	mkdir "$subpkgdir"
 }
 sha512sums="5f7e2046491fbf776c0c4b0e8a594f3b312c98e3e927c7f1ed6e5966c074cd9a2cd4bfb0449435004d9164142609d65ba7cb8b867874a7719bac4a7905cc2b95  deviceinfo"
diff --git a/device/testing/device-oneplus-oneplus3t/device-oneplus-oneplus3t-nonfree-firmware.post-install b/device/testing/device-oneplus-oneplus3t/device-oneplus-oneplus3t-nonfree-firmware.post-install
new file mode 100644
index 000000000..17e0ca4d0
--- /dev/null
+++ b/device/testing/device-oneplus-oneplus3t/device-oneplus-oneplus3t-nonfree-firmware.post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# FIXME: qrtr-ns is now part of the Linux kernel, remove this when upgrading to 5.9!
+rc-update add qrtr-ns boot