From 357287dbe70302f24dd42cfa52ca22edd731f7df Mon Sep 17 00:00:00 2001
From: Jens Reidel <adrian@travitia.xyz>
Date: Sat, 9 Aug 2025 19:18:59 +0200
Subject: [PATCH] community/soc-qcom: make pd-mapper optional

The in-kernel pd-mapper is the preferred choice nowadays and used for
some kernel packages of devices that already/want to depend on soc-qcom.

Signed-off-by: Jens Reidel <adrian@travitia.xyz>
Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6905
---
 device/community/soc-qcom/APKBUILD            | 23 +++++++++++++++----
 .../soc-qcom/soc-qcom-openrc.post-install     |  1 -
 .../soc-qcom-pd-mapper-openrc.post-install    |  2 ++
 .../soc-qcom-pd-mapper-openrc.post-upgrade    |  1 +
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 device/community/soc-qcom/soc-qcom-pd-mapper-openrc.post-install
 create mode 120000 device/community/soc-qcom/soc-qcom-pd-mapper-openrc.post-upgrade

diff --git a/device/community/soc-qcom/APKBUILD b/device/community/soc-qcom/APKBUILD
index ce29b0ed8..697017126 100644
--- a/device/community/soc-qcom/APKBUILD
+++ b/device/community/soc-qcom/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Casey Connolly <kcxt@postmarketos.org>
 pkgname=soc-qcom
 pkgdesc="Common package for Qualcomm devices"
-pkgver=3
-pkgrel=1
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -10,7 +10,6 @@ options="!check !archcheck !tracedeps"
 depends="
 	bootmac
 	msm-modem
-	pd-mapper
 	swclock-offset
 	tqftpserv
 "
@@ -25,6 +24,8 @@ subpackages="
 	$pkgname-modem
 	$pkgname-modem-openrc:modem_openrc
 	$pkgname-openrc
+	$pkgname-pd-mapper:pd_mapper
+	$pkgname-pd-mapper-openrc:pd_mapper_openrc
 	$pkgname-pulseaudio
 	$pkgname-pulseaudio-openrc:pulseaudio_openrc
 	$pkgname-pulseaudio-systemd:pulseaudio_systemd
@@ -97,7 +98,6 @@ openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	depends="
 		openrc
-		pd-mapper-openrc
 		tqftpserv-openrc
 	"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
@@ -105,6 +105,21 @@ openrc() {
 	mkdir "$subpkgdir"
 }
 
+pd_mapper() {
+	pkgdesc="Enable Qualcomm PD mapper service"
+	depends="pd-mapper"
+
+	mkdir "$subpkgdir"
+}
+
+pd_mapper_openrc() {
+	install_if="$pkgname-pd-mapper=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="openrc"
+
+	mkdir "$subpkgdir"
+}
+
 qbootctl() {
 	pkgdesc="Enable qbootctl mark-boot-successful service"
 	depends="qbootctl"
diff --git a/device/community/soc-qcom/soc-qcom-openrc.post-install b/device/community/soc-qcom/soc-qcom-openrc.post-install
index 70b9e0efe..fbdb52e53 100644
--- a/device/community/soc-qcom/soc-qcom-openrc.post-install
+++ b/device/community/soc-qcom/soc-qcom-openrc.post-install
@@ -1,3 +1,2 @@
 #!/bin/sh
 rc-update add tqftpserv boot
-rc-update add pd-mapper boot
diff --git a/device/community/soc-qcom/soc-qcom-pd-mapper-openrc.post-install b/device/community/soc-qcom/soc-qcom-pd-mapper-openrc.post-install
new file mode 100644
index 000000000..23bf3d603
--- /dev/null
+++ b/device/community/soc-qcom/soc-qcom-pd-mapper-openrc.post-install
@@ -0,0 +1,2 @@
+#!/bin/sh
+rc-update add pd-mapper boot
diff --git a/device/community/soc-qcom/soc-qcom-pd-mapper-openrc.post-upgrade b/device/community/soc-qcom/soc-qcom-pd-mapper-openrc.post-upgrade
new file mode 120000
index 000000000..002feeed2
--- /dev/null
+++ b/device/community/soc-qcom/soc-qcom-pd-mapper-openrc.post-upgrade
@@ -0,0 +1 @@
+soc-qcom-pd-mapper-openrc.post-install
\ No newline at end of file