From 29741b496cba9e3809a4687643d160ad93103b44 Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Wed, 10 Jun 2026 16:12:08 -0400
Subject: [PATCH] device-pine64-pinenote: move install variable to global
 variable

Incidently, drop $pkgname-systemd.post-install as it was only necessary
for upgrade from v7-r0 to v8-r0 done before v25.12

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8784>
---
 .../community/device-pine64-pinenote/APKBUILD   | 17 ++++++++---------
 .../device-pine64-pinenote-systemd.post-install | 10 ----------
 2 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 device/community/device-pine64-pinenote/device-pine64-pinenote-systemd.post-install

diff --git a/device/community/device-pine64-pinenote/APKBUILD b/device/community/device-pine64-pinenote/APKBUILD
index 6b7bb6abc..911319d77 100644
--- a/device/community/device-pine64-pinenote/APKBUILD
+++ b/device/community/device-pine64-pinenote/APKBUILD
@@ -56,6 +56,14 @@ subpackages="
 	$pkgname-xournalpp
 	$pkgname-x11
 "
+install="
+	$pkgname-sway-hrdl.post-install
+	$pkgname-sway-hrdl.post-deinstall
+	$pkgname-nonfree-firmware.pre-upgrade
+	$pkgname-nonfree-firmware.pre-install
+	$pkgname-nonfree-firmware-openrc.post-install
+	$pkgname-openrc.post-install
+"
 builddir="$srcdir"/pinenote-dist-$_commit
 _swayconfdir="$srcdir"/pinenote-config-sway-$_swayconfver
 
@@ -125,7 +133,6 @@ package() {
 hrdl() {
 	pkgdesc="Opinionated sway UI by hrdl optimized for the Pinenote"
 	install_if="$pkgname=$pkgver-r$pkgrel postmarketos-ui-sway"
-	install="$subpkgname.post-install $subpkgname.post-deinstall"
 	depends="
 		adwaita-icon-theme
 		bash
@@ -217,7 +224,6 @@ firmware() {
 	pkgdesc="WiFi, Bluetooth and display firmware"
 	depends="linux-firmware-cypress linux-firmware-brcm"
 	replaces="firmware-pine64-pinenote"
-	install="$subpkgname.pre-upgrade $subpkgname.pre-install"
 
 	# waveform firmware is provided locally via /dev/disk/by-label/waveform
 	# extracted using waveform_exctract.sh, then adapted to kernel using wbf_to_custom.py
@@ -238,7 +244,6 @@ firmware() {
 openrc() {
 	# rockchip_ebc sometimes fails to load the initial waveform.
 	# This forces a reload before starting tinydm
-	install="$subpkgname.post-install"
 	install -Dm755 "$srcdir"/tinydm-ebc-workaround-openrc.initd \
 		"$subpkgdir"/etc/init.d/tinydm-ebc
 
@@ -247,11 +252,6 @@ openrc() {
 }
 
 systemd() {
-	# post-install enables tinydm if tinydm-ebc was enabled
-	# enables seamless upgrade 7-r0 to 8-r0
-	# TODO: remove in preparation for v26.06
-	install="$subpkgname.post-install"
-
 	# rockchip_ebc sometimes fails to load the initial waveform.
 	# This forces a reload before starting tinydm
 	install -Dm644 \
@@ -263,7 +263,6 @@ systemd() {
 }
 
 firmware_openrc() {
-	install="$subpkgname.post-install"
 	install -Dm755 "$srcdir"/pinenote-init-waveform.initd \
 		"$subpkgdir"/etc/init.d/pinenote-init-waveform
 
diff --git a/device/community/device-pine64-pinenote/device-pine64-pinenote-systemd.post-install b/device/community/device-pine64-pinenote/device-pine64-pinenote-systemd.post-install
deleted file mode 100644
index 5c14f2988..000000000
--- a/device/community/device-pine64-pinenote/device-pine64-pinenote-systemd.post-install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# reenables tinydm if tinydm-ebc is detected as enabled
-# allow seamless upgrade 7-r0 to 8-r0, as tinydm-ebc was removed
-# in favor of a systemd override for tinydm
-# TODO: remove in preparation for v26.06
-if [ "$(systemctl is-active tinydm-ebc.service 2>/dev/null )" == "active" ]; then
- 	systemctl disable tinydm-ebc.service
- 	systemctl enable tinydm.service
-fi