From 2d5a9d7d0aca863c1b133b342092e0d9ccd447ee Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Wed, 28 Jun 2023 08:27:06 +0200
Subject: [PATCH] device-pine64-pinebookpro: add elogind subpackage (MR 4202)

Move the elogind configuration and post-install call of "loginctl
reload" into an extra subpackage with install_if=elogind.

Fix for:
  Executing device-pine64-pinebookpro-16-r0.post-install
   * service nvme-powersave added to runlevel boot
   * service sysfsconf added to runlevel default
  lib/apk/exec/device-pine64-pinebookpro-16-r0.post-install: line 5: loginctl: not found
  ERROR: device-pine64-pinebookpro-16-r0.post-install: script exited with error 127

Make the post-install scripts more robust while at it, by adding
"exit 0" at the end.
---
 .../community/device-pine64-pinebookpro/APKBUILD | 16 ++++++++++++----
 ...evice-pine64-pinebookpro-elogind.post-install |  5 +++++
 ...evice-pine64-pinebookpro-elogind.post-upgrade |  1 +
 .../device-pine64-pinebookpro.post-install       |  3 ++-
 4 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 device/community/device-pine64-pinebookpro/device-pine64-pinebookpro-elogind.post-install
 create mode 120000 device/community/device-pine64-pinebookpro/device-pine64-pinebookpro-elogind.post-upgrade

diff --git a/device/community/device-pine64-pinebookpro/APKBUILD b/device/community/device-pine64-pinebookpro/APKBUILD
index 78a9ffc87..704ddd56d 100644
--- a/device/community/device-pine64-pinebookpro/APKBUILD
+++ b/device/community/device-pine64-pinebookpro/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=16
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -18,8 +18,13 @@ depends="
 	iw
 	"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-install="$pkgname.post-install $pkgname.post-upgrade"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-elogind"
+install="
+	$pkgname.post-install
+	$pkgname.post-upgrade
+	$pkgname-elogind.post-install
+	$pkgname-elogind.post-upgrade
+"
 source="
 	deviceinfo
 	nvme-powersave.initd
@@ -39,9 +44,12 @@ package() {
 
 	install -D -m755 "$srcdir"/wlan-powersave-off.start \
 		"$pkgdir"/etc/local.d/wlan-powersave-off.start
+}
 
+elogind() {
+	install_if="$pkgname=$pkgver-r$pkgrel elogind"
 	install -D -m644 "$srcdir"/enable-s2idle.conf \
-		"$pkgdir"/usr/lib/elogind/sleep.conf.d/enable-s2idle.conf
+		"$subpkgdir"/usr/lib/elogind/sleep.conf.d/enable-s2idle.conf
 }
 
 nonfree_firmware() {
diff --git a/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro-elogind.post-install b/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro-elogind.post-install
new file mode 100644
index 000000000..2d181ee97
--- /dev/null
+++ b/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro-elogind.post-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+loginctl reload
+
+exit 0
diff --git a/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro-elogind.post-upgrade b/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro-elogind.post-upgrade
new file mode 120000
index 000000000..513542f57
--- /dev/null
+++ b/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro-elogind.post-upgrade
@@ -0,0 +1 @@
+device-pine64-pinebookpro-elogind.post-install
\ No newline at end of file
diff --git a/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro.post-install b/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro.post-install
index 2f90cf8a9..964874dbd 100644
--- a/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro.post-install
+++ b/device/community/device-pine64-pinebookpro/device-pine64-pinebookpro.post-install
@@ -2,4 +2,5 @@
 
 rc-update add nvme-powersave boot
 rc-update add sysfsconf default
-loginctl reload
+
+exit 0