From 133cbd31169b39784596e508b6ff38de8f47e874 Mon Sep 17 00:00:00 2001
From: Dylan Van Assche <me@dylanvanassche.be>
Date: Mon, 15 Aug 2022 16:39:41 +0200
Subject: [PATCH] soc-qcom-sdm845: drop upower subpackage (MR 3361)

UPower config to shut down device on low battery
is usefull for all SDM845 devices.

[ci:skip-build]: built successfully in CI
---
 device/community/soc-qcom-sdm845/APKBUILD | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/device/community/soc-qcom-sdm845/APKBUILD b/device/community/soc-qcom-sdm845/APKBUILD
index 7b7f53c5d..86881161f 100644
--- a/device/community/soc-qcom-sdm845/APKBUILD
+++ b/device/community/soc-qcom-sdm845/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=soc-qcom-sdm845
 pkgdesc="Common package for Qualcomm SDM845 devices"
 pkgver=8
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -12,11 +12,11 @@ depends="
 	swclock-offset
 	msm-modem-uim-selection
 "
+replaces="upower"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-ucm
 	$pkgname-qbootctl
-	$pkgname-upower
 "
 
 _ucm_commit="621c71fd5f5742c60d38766ebb2d1bd3b863a2a4"
@@ -31,6 +31,10 @@ package() {
 	mkdir -p "$pkgdir"
 	install -Dm644 "$srcdir"/90-feedbackd-pmi8998.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-pmi8998.rules
+
+	# Shutdown when battery is critical instead of sleep
+	install -Dm644 "$srcdir"/UPower.conf \
+		"$pkgdir"/etc/UPower/UPower.conf
 }
 
 nonfree_firmware() {
@@ -51,15 +55,6 @@ ucm() {
 	cp -r "$srcdir/alsa-ucm-conf-$_ucm_commit"/ucm2 "$subpkgdir"/usr/share/alsa/
 }
 
-upower() {
-	install_if="$pkgname=$pkgver-r$pkgrel upower"
-	replaces="upower"
-
-	# Shutdown when battery is critical instead of sleep
-	install -Dm644 "$srcdir"/UPower.conf \
-		"$subpkgdir"/etc/UPower/UPower.conf
-}
-
 qbootctl() {
 	pkgdesc="Enable qbootctl mark-boot-successful service"
 	depends="qbootctl"