From 43133df4acbfb903e607218f12966a76140fa144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= <trabarni@gmail.com>
Date: Sat, 9 Mar 2024 12:58:25 +0100
Subject: [PATCH] soc-qcom-sdm660: add rmtfs and qcom-diag to rproc package (MR
 4897)

Add rmtfs and qcom-diag and bootmac to rproc package
to make wifi, modem and bluetooth work.
Add swclock-offset as a dependency.
---
 device/testing/soc-qcom-sdm660/APKBUILD              | 12 ++++++++----
 .../soc-qcom-sdm660-rproc.post-install               |  3 ++-
 .../soc-qcom-sdm660-rproc.post-upgrade               |  1 +
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 120000 device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-upgrade

diff --git a/device/testing/soc-qcom-sdm660/APKBUILD b/device/testing/soc-qcom-sdm660/APKBUILD
index 2bdfd385c..280fa7831 100644
--- a/device/testing/soc-qcom-sdm660/APKBUILD
+++ b/device/testing/soc-qcom-sdm660/APKBUILD
@@ -1,12 +1,13 @@
 # Maintainer: Max Buchholz <max.buchholz@gmx.de>
 pkgname=soc-qcom-sdm660
 pkgdesc="Common package for Qualcomm SDM630/636/660 devices"
-pkgver=1
+pkgver=2
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
 options="!check !archcheck !tracedeps pmb:cross-native"
+depends="swclock-offset"
 subpackages="
 	$pkgname-rproc
 	$pkgname-nonfree-firmware:nonfree_firmware
@@ -19,13 +20,16 @@ package() {
 rproc() {
 	pkgdesc="Modem and Wifi services and configuration"
 	depends="
+		bootmac
 		msm-modem
-		pd-mapper
-		pd-mapper-openrc
+		qcom-diag
+		qcom-diag-openrc
+		rmtfs
+		rmtfs-openrc
 		tqftpserv
 		tqftpserv-openrc
 	"
-	install="$subpkgname.post-install"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-install b/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-install
index 70b9e0efe..c5d11e370 100644
--- a/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-install
+++ b/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-install
@@ -1,3 +1,4 @@
 #!/bin/sh
 rc-update add tqftpserv boot
-rc-update add pd-mapper boot
+rc-update add diag-router boot
+rc-update add rmtfs boot
diff --git a/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-upgrade b/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-upgrade
new file mode 120000
index 000000000..814ad5b9f
--- /dev/null
+++ b/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-upgrade
@@ -0,0 +1 @@
+soc-qcom-sdm660-rproc.post-install
\ No newline at end of file