main/wcnss-wlan: move install= to global scope

Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7696

main/adsp-audio/APKBUILD

@@ -1,11 +1,12 @@
 maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=adsp-audio
 pkgver=1
-pkgrel=5
+pkgrel=6
 pkgdesc="Init script for enabling the adsp audio subsystem (downstream Android kernels)"
 url="https://gitlab.postmarketos.org/postmarketOS/pmaports"
 arch="noarch"
 license="GPL-3.0-or-later"
+install="$pkgname-openrc.post-install"
 source="$pkgname.initd"
 subpackages="$pkgname-openrc"
 
@@ -13,11 +14,6 @@ package() {
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/adsp-audio
 }
 
-openrc() {
-	install="$subpkgname.post-install"
-	default_openrc
-}
-
 sha512sums="
 1edd94b45d37d82b37e04a4f3ff9f3c116bee088a0f83c7b605a0107a3da4f5c9f7d0c1a50c082eb05914352979114135bde8942be9f6ac4fe3a7041e9190bc3  adsp-audio.initd
 "

main/gesture/APKBUILD

@@ -1,15 +1,16 @@
 maintainer="Craig Comstock <craig@unreasonablefarm.org>"
 pkgname=gesture
 pkgver=0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="handwriting algorithm with implementation for linux touchscreens injecting keys into a tty"
 url="https://gitlab.com/unrznbl/gesture"
 arch="all"
 license="GPL-3.0-only"
 makedepends="linux-headers"
 options="!check"
-source="https://gitlab.com/unrznbl/gesture/-/archive/v$pkgver/gesture-v$pkgver.tar.gz"
+install="$pkgname-openrc.post-install $pkgname-openrc.pre-deinstall"
 subpackages="$pkgname-openrc"
+source="https://gitlab.com/unrznbl/gesture/-/archive/v$pkgver/gesture-v$pkgver.tar.gz"
 builddir="$srcdir/gesture-v$pkgver"
 
 build() {
@@ -21,8 +22,7 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.pre-deinstall"
+	default_openrc
 	mkdir -p "$subpkgdir"
 }
 

main/hexagonfs-firmware-loader/APKBUILD

@@ -1,14 +1,15 @@
 maintainer=""
 pkgname=hexagonfs-firmware-loader
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Prepare the HexagonFS directory from msm-firmware-loader mounts"
 url="https://postmarketos.org/"
-subpackages="$pkgname-openrc $pkgname-systemd"
 arch="aarch64"
 license="MIT"
 options="!check"
 depends="hexagonrpcd msm-firmware-loader"
+install="$pkgname-openrc.post-install"
+subpackages="$pkgname-openrc $pkgname-systemd"
 source="
 	hexagonrpcd.confd
 	https://gitlab.postmarketos.org/postmarketOS/hexagonfs-firmware-loader/-/archive/$pkgver/hexagonfs-firmware-loader-$pkgver.tar.gz
@@ -38,11 +39,6 @@ package() {
 		"$pkgdir/usr/lib/systemd/system/hexagonfs-firmware-loader.service"
 }
 
-openrc() {
-	install="$subpkgname.post-install"
-	default_openrc
-}
-
 sha512sums="
 64c50d1e92cc29b3e8c0e5ee0c14603c5d3b6c9f9671038928cb3093a1276e6004452e55c5f7e3793b72bbc0a7dc48063ed29ba779ece2edea5ac743fa1ec473  hexagonrpcd.confd
 b0d028d5c321b329fd03c2cacde33c4c83ba8a28b57afe2d7ef3cff428cf3aa60c8ee0c975c7a066550a79d37bd1b3dc3967deb518b71099089c5822340de5c5  hexagonfs-firmware-loader-1.1.0.tar.gz

main/hisi-wlan/APKBUILD

@@ -1,11 +1,12 @@
 # Maintainer Ignacy Kuchciński <ignacykuchcinski@gmail.com>
 pkgname=hisi-wlan
 pkgver=2
-pkgrel=2
+pkgrel=3
 pkgdesc="Init script for enabling hisi wlan driver (downstream Android kernels)"
 url="https://gitlab.postmarketos.org/postmarketOS/pmaports"
 arch="noarch"
 license="GPL-3.0-or-later"
+install="$pkgname-openrc.post-install"
 subpackages="$pkgname-openrc"
 source="$pkgname.initd"
 options="!check" # No tests
@@ -14,13 +15,6 @@ package() {
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/hisi-wlan
 }
 
-openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install"
-
-	mkdir -p "$subpkgdir"
-}
-
 sha512sums="
 752c7d7e12e73b8933f36046e878e81fd4717814144dff14289fd4b4b8ae1949aeff14daa078841d07827a5afc158179692dbfe9d508f3c317d4fa1dfa1a720b  hisi-wlan.initd
 "

main/mdss-fb-init-hack/APKBUILD

@@ -1,26 +1,22 @@
 maintainer="Atilla Szollosi <ata2001@airmail.cc>"
 pkgname=mdss-fb-init-hack
 pkgver=0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Workaround for buggy framebuffer driver (mdss-fb)"
 url="https://gitlab.postmarketos.org/postmarketOS/pmaports"
 arch="noarch"
 license="GPL-3.0-or-later"
 depends="msm-fb-refresher"
+install="$pkgname-openrc.post-install"
+subpackages="$pkgname-openrc"
 source="$pkgname.initd $pkgname.sh"
 options="!check" # No tests
-subpackages="$pkgname-openrc"
 
 package() {
 	install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
 	install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/mdss-fb-hack"
 }
 
-openrc() {
-	install="$subpkgname.post-install"
-	default_openrc
-}
-
 sha512sums="
 dcda465ef62cd9d92d5e7c9f17e45982d5428950b1f6248b172408dce33d53eb866000a9290b63d41c61a8050547048f90ff9016d64f39c25f06fb6537ddc401  mdss-fb-init-hack.initd
 22cb037d51a74fd363748c7c0b84f313ac9fce04a32953da00c338befc3af58012a24b7cb92a011fc8fe55722d1ceae7d42173c477297e00094e45d58d2e5b82  mdss-fb-init-hack.sh

main/msm-fb-refresher/APKBUILD

@@ -1,19 +1,20 @@
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=msm-fb-refresher
 pkgver=0.2
-pkgrel=6
+pkgrel=7
 pkgdesc="Display refresher for Qualcomm devices"
 arch="all"
 url="https://github.com/AsteroidOS/msm-fb-refresher"
 license="GPL-3.0-or-later"
 makedepends="linux-headers"
+install="$pkgname-openrc.post-install"
+subpackages="$pkgname-openrc"
 source="
 	$pkgname-$pkgver.tar.gz::https://github.com/AsteroidOS/msm-fb-refresher/archive/v$pkgver.tar.gz
 	msm-fb-refresher.init
 	00-msm-fb-refresher.sh
 	00-msm-fb-refresher.files
 "
-subpackages="$pkgname-openrc"
 
 build() {
 	gcc refresher.c -o refresher.o -c
@@ -35,11 +36,6 @@ package() {
 		"$initfsdir/files/00-msm-fb-refresher.files"
 }
 
-openrc() {
-	install="$subpkgname.post-install"
-	default_openrc
-}
-
 sha512sums="
 5e2920cf86f2e373e2411a89cf3ac6745af042ff7d91ae581f26b72772bc9ab621ea4154bc33ef57dce0c04ba3f88ee3b9f98c2a17b2579df368b0929cf0bfa7  msm-fb-refresher-0.2.tar.gz
 e4dc12848d5615ff758ad3ba4165bef5501c92350f46072d30d9924821bf63ad89fe69e78f248562c8377d537bf8c3cefd275130a97040741bd80ff32a1838a3  msm-fb-refresher.init

main/msm-firmware-loader/APKBUILD

@@ -1,12 +1,13 @@
 maintainer=""
 pkgname=msm-firmware-loader
 pkgver=1.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Set of init services to automatically load firmware from device partitions"
 url="https://postmarketos.org/"
-subpackages="$pkgname-openrc $pkgname-systemd $pkgname-wcnss"
 arch="armhf armv7 aarch64"
 license="MIT"
+install="$pkgname-openrc.post-install"
+subpackages="$pkgname-openrc $pkgname-systemd $pkgname-wcnss"
 source="
 	https://gitlab.postmarketos.org/postmarketOS/msm-firmware-loader/-/archive/$pkgver/msm-firmware-loader-$pkgver.tar.gz
 "
@@ -29,12 +30,6 @@ package() {
 		"$pkgdir/usr/lib/systemd/system/msm-firmware-loader-unpack.service"
 }
 
-openrc() {
-	install="$subpkgname.post-install"
-	depends="openrc"
-	default_openrc
-}
-
 wcnss() {
 	pkgdesc="Use WiFi/BT firmware from stock firmware partition using $pkgname"
 	provides="firmware-qcom-msm8916-wcnss=$pkgver-r$pkgrel"

main/postmarketos-base-ui-cage/APKBUILD

@@ -2,18 +2,11 @@
 maintainer="Vitaliy Ognev <vitaliy.ognev@gmail.com>"
 pkgname=postmarketos-base-ui-cage
 pkgver=3
-pkgrel=2
+pkgrel=3
 pkgdesc="Meta package for shared configuration for cage UIs"
 arch="all"
 url="https://postmarketos.org/"
 license="GPL-3.0-or-later"
-source="
-	cage-ui.desktop
-	cage-ui-session.sh
-	cage-ui-autorotate.sh
-"
-install="$pkgname.post-install $pkgname.post-upgrade"
-options="!check"
 depends="
 	dnsmasq
 	drm_info
@@ -35,7 +28,19 @@ depends="
 	tinydm-openrc
 	jq
 "
+install="
+	$pkgname.post-install
+	$pkgname.post-upgrade
+	$pkgname-openrc.post-install
+	$pkgname-openrc.post-upgrade
+	"
 subpackages="$pkgname-openrc"
+source="
+	cage-ui.desktop
+	cage-ui-session.sh
+	cage-ui-autorotate.sh
+"
+options="!check"
 
 package() {
 	install -Dm755 "$srcdir"/cage-ui-session.sh -t "$pkgdir"/usr/share/cage-ui/
@@ -44,9 +49,7 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }
 

main/postmarketos-base-ui-gnome/APKBUILD

@@ -8,6 +8,15 @@ pkgdesc="Meta package for shared configuration for GNOME-based UIs"
 url="https://postmarketos.org"
 arch="noarch"
 license="GPL-3.0-or-later"
+depends_openrc="
+	apk-polkit-rs-openrc
+	elogind
+	elogind-openrc
+	iio-sensor-proxy-openrc
+	modemmanager-openrc
+	networkmanager-openrc
+	polkit-elogind
+	"
 depends="
 	dnsmasq
 	gcr-ssh-agent
@@ -28,13 +37,14 @@ depends="
 	xdg-user-dirs-gtk
 	xwayland
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
+subpackages="$pkgname-openrc"
 source="
 	00_postmarketos-base-ui-gnome.gschema.override
 	10_postmarketos-green-accent.gschema.override
 	10_mutter-fractional-scaling.gschema.override
 	"
 options="!check"
-subpackages="$pkgname-openrc"
 
 _pmb_recommends="
 	decibels
@@ -71,19 +81,7 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		apk-polkit-rs-openrc
-		elogind
-		elogind-openrc
-		iio-sensor-proxy-openrc
-		modemmanager-openrc
-		networkmanager-openrc
-		openrc
-		polkit-elogind
-	"
-
+	default_openrc
 	mkdir "$subpkgdir"
 }
 

main/postmarketos-base-ui/APKBUILD

@@ -1,7 +1,7 @@
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=postmarketos-base-ui
 pkgver=44
-pkgrel=0
+pkgrel=1
 pkgdesc="Meta package for minimal postmarketOS UI base"
 url="https://postmarketos.org"
 arch="noarch"
@@ -23,6 +23,17 @@ depends="
 	wireplumber
 	xdg-utils
 	"
+install="
+	$pkgname-elogind.post-install
+	$pkgname-openrc-settingsd.post-install
+	$pkgname-openrc-settingsd.post-upgrade
+	$pkgname-openrc.post-install
+	$pkgname-openrc.post-upgrade
+	$pkgname-wifi-iwd-openrc.post-install
+	$pkgname-wifi-iwd-openrc.post-upgrade
+	$pkgname-wifi-wpa_supplicant-openrc.post-install
+	$pkgname-wifi-wpa_supplicant-openrc.post-upgrade
+	"
 subpackages="
 	$pkgname-audio
 	$pkgname-audio-pipewire:audio_pipewire
@@ -142,7 +153,6 @@ bluez_openrc() {
 
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	depends="
 		chrony-openrc
 		dbus-openrc
@@ -156,7 +166,6 @@ openrc() {
 
 elogind() {
 	install_if="$pkgname=$pkgver-r$pkgrel elogind"
-	install="$subpkgname.post-install"
 	depends="!systemd-logind sleep-inhibitor-openrc openrc"
 	replaces="elogind"
 	provides="postmarketos-base-elogind=$pkgver-r$pkgrel"
@@ -166,7 +175,6 @@ elogind() {
 
 openrc_settingsd() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc-settingsd-openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	replaces="openrc-settingsd-openrc"
 	depends="openrc"
 
@@ -225,7 +233,6 @@ wpa_supplicant() {
 
 wpa_supplicant_openrc() {
 	install_if="$pkgname-wifi-wpa_supplicant=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
 
 	depends="wpa_supplicant-openrc openrc"
 	replaces="wpa_supplicant-openrc"
@@ -248,10 +255,7 @@ iwd() {
 
 iwd_openrc() {
 	install_if="$pkgname-wifi-iwd=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-
-	depends="iwd-openrc openrc"
-
+	depends="iwd-openrc"
 	mkdir -p "$subpkgdir"
 }
 

main/postmarketos-base/APKBUILD

@@ -30,7 +30,13 @@ _pmb_recommends="
 	doas
 	doas-sudo-shim
 "
-install="$pkgname.post-install $pkgname.post-upgrade"
+install="
+	$pkgname-nftables-openrc.post-install
+	$pkgname-openrc.post-install
+	$pkgname-openrc.post-upgrade
+	$pkgname.post-install
+	$pkgname.post-upgrade
+	"
 triggers="$pkgname.trigger=/usr/share/deviceinfo"
 subpackages="
 	$pkgname-core
@@ -187,9 +193,7 @@ nftables() {
 
 nftables_openrc() {
 	install_if="$pkgname-openrc=$pkgver-r$pkgrel nftables"
-	depends="nftables-openrc openrc"
-	install="$subpkgname.post-install"
-
+	depends="nftables-openrc"
 	mkdir -p "$subpkgdir"
 }
 
@@ -204,7 +208,6 @@ ssh() {
 openrc() {
 	provides="$pkgname-init"
 	provider_priority=10
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	replaces="
 		busybox-openrc
 		eudev

main/postmarketos-boot-hwtest/APKBUILD

@@ -1,13 +1,13 @@
 maintainer=""
 pkgname=postmarketos-boot-hwtest
 pkgver=0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Boot into a TTY running hwtest"
 url="https://gitlab.com/MartijnBraam/hwtest"
 arch="all"
 license="MIT"
 depends="hwtest ofono dbus-x11"
-install="$pkgname.post-install"
+install="$pkgname.post-install $pkgname-openrc.post-install"
 subpackages="$pkgname-openrc"
 source="launch_hwtest.sh"
 options="!check"
@@ -19,10 +19,7 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install"
-	depends="openrc"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }
 

main/postmarketos-bootsplash/APKBUILD

@@ -1,13 +1,14 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=postmarketos-bootsplash
 pkgver=0.3.1
-pkgrel=0
+pkgrel=1
 pkgdesc="pmOS integration components for pbsplash"
 url="https://postmarketos.org"
 arch="all"
 license="CC-BY-SA-3.0"
 depends="devicepkg-utils pbsplash"
 options="!check" # no testsuite
+install="$pkgname-openrc.post-install"
 subpackages="$pkgname-openrc $pkgname-systemd"
 source="
 	kill-pbsplash
@@ -31,16 +32,8 @@ package() {
 	install -Dm644 "$srcdir"/pmos-logo-text-epaper.svg -t "$pkgdir"/usr/share/pbsplash/
 	install -Dm644 "$srcdir"/postmarketos-bootsplash.files \
 		"$pkgdir"/usr/share/mkinitfs/files/30-postmarketos-bootsplash.files
-}
-
-openrc() {
-	install="$subpkgname.post-install"
-	default_openrc
-}
-
-systemd() {
-	install_if="$pkgname=$pkgver-r$pkgrel systemd"
 
+	# systemd
 	for _service in display-manager emergency getty@ rescue shutdown-splash; do
 		install -Dm644 "$srcdir/kill-pbsplash-override.conf" -t \
 			"$subpkgdir"/usr/lib/systemd/system/"$_service".service.d/
@@ -53,7 +46,6 @@ systemd() {
 		ln -s ../shutdown-splash.service \
 			"$subpkgdir"/usr/lib/systemd/system/"$target".target.wants/
 	done
-
 }
 
 sha512sums="

main/postmarketos-cros-common/APKBUILD

@@ -4,21 +4,22 @@ maintainer="Ingo Reitz <9l@9lo.re>"
 pkgname=postmarketos-cros-common
 pkgdesc="Common package for Chrome OS devices"
 pkgver=2
-pkgrel=6
+pkgrel=7
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64 armv7 x86_64 x86" # there are no cros devices of other arches
 options="!check !archcheck !tracedeps"
-subpackages="
-	$pkgname-gnome
-	$pkgname-sway
-	postmarketos-cros-keymap-openrc:_keymap_openrc
-"
 makedepends="
 	cros-keyboard-map-openrc
 	keyd-openrc
 	postmarketos-ui-sway-logo-key-alt
 "
+install="postmarketos-cros-keymap-openrc.post-install"
+subpackages="
+	$pkgname-gnome
+	$pkgname-sway
+	postmarketos-cros-keymap-openrc:_keymap_openrc
+"
 source="
 	00_postmarketos-cros-common-gnome.gschema.override
 "
@@ -64,7 +65,6 @@ sway() {
 _keymap_openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel cros-keyboard-map openrc"
 	depends="cros-keyboard-map-openrc keyd-openrc"
-	install="postmarketos-cros-keymap-openrc.post-install"
 	mkdir -p "$subpkgdir"
 }
 

main/postmarketos-ui-asteroid/APKBUILD

@@ -2,12 +2,21 @@
 maintainer="Bart Ribbers <bribbers@disroot.org>"
 pkgname=postmarketos-ui-asteroid
 pkgver=2
-pkgrel=1
+pkgrel=2
 pkgdesc="(Wayland) Smartwatch UI from AsteroidOS"
 url="https://wiki.postmarketos.org/wiki/AsteroidOS"
 # armhf blocked by asteroid-launcher
 arch="noarch !armhf"
 license="GPL-3.0-or-later"
+depends_openrc="
+	bluez-openrc
+	connman-openrc
+	dsme-openrc
+	elogind-openrc
+	mce-openrc
+	tinydm-openrc
+	usb-moded-openrc
+	"
 depends="
 	asteroid-launcher
 	dsme
@@ -34,7 +43,12 @@ _pmb_recommends="
 	"
 _pmb_groups="users"
 subpackages="$pkgname-openrc"
-install="$pkgname.post-install $pkgname.post-upgrade"
+install="
+	$pkgname.post-install
+	$pkgname.post-upgrade
+	$pkgname-openrc.post-install
+	$pkgname-openrc.post-upgrade
+	"
 source="
 	asteroid.desktop
 	asteroid-launcher-wrapper.sh
@@ -49,19 +63,8 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		bluez-openrc
-		connman-openrc
-		dsme-openrc
-		elogind
-		elogind-openrc
-		mce-openrc
-		tinydm-openrc
-		usb-moded-openrc
-		"
-
+	default_openrc
+	depends="elogind"
 	mkdir -p "$subpkgdir"
 }
 

main/postmarketos-ui-buffyboard/APKBUILD

@@ -2,11 +2,12 @@
 maintainer="exkc <exkc@exkc.moe>"
 pkgname=postmarketos-ui-buffyboard
 pkgver=2
-pkgrel=2
+pkgrel=3
 pkgdesc="Plain framebuffer console with modern touchscreen keyboard support"
 url="https://gitlab.postmarketos.org/postmarketOS/buffybox"
 arch="all"
 license="GPL-3.0-or-later"
+depends_openrc="networkmanager-openrc"
 depends="
 	dnsmasq
 	buffyboard
@@ -14,6 +15,7 @@ depends="
 	postmarketos-base-ui-audio
 	postmarketos-base-ui-networkmanager
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.pre-deinstall $pkgname-openrc.post-upgrade"
 subpackages="$pkgname-openrc $pkgname-systemd"
 source="buffyboard.init buffyboard.service"
 options="!check" # No tests
@@ -23,17 +25,6 @@ package() {
 	install -Dm644 "$srcdir"/buffyboard.service -t "$pkgdir"/usr/lib/systemd/system
 }
 
-openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade"
-	depends="
-		openrc
-		networkmanager-openrc
-	"
-
-	mkdir -p "$subpkgdir"
-}
-
 sha512sums="
 73f5259eefb08d2c1782e7803c120e2e4c4ec16d362e312dcc730089c66696d2b3caf6c01be3c5154a7f78adf4a4c2ceedb9e35e8b601f5fd35fce25b4c85125  buffyboard.init
 3d5e7295db30310dc20815ad199c82e93e29e546af04631303c1a8749d7648136854dce2dabe97edc06d6d13caedd6a72c33b2079e59ae8817d7a4ad5bbb1f5c  buffyboard.service

main/postmarketos-ui-console/APKBUILD

@@ -2,27 +2,27 @@
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=postmarketos-ui-console
 pkgver=0.1
-pkgrel=10
+pkgrel=11
 pkgdesc="Console environment, with no graphical/touch UI"
 url="https://postmarketos.org/"
 arch="noarch"
 license="GPL-3.0-or-later"
+depends_openrc="networkmanager-openrc"
 depends="
 	dnsmasq
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
 	wireless-tools
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
+subpackages="$pkgname-openrc"
 options="!check pmb:systemd" # No testsuite
-subpackages="$pkgname-openrc:_openrc"
 
 package() {
 	mkdir -p "$pkgdir"
 }
 
-_openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="networkmanager-openrc openrc"
+openrc() {
+	default_openrc
 	mkdir -p "$subpkgdir"
 }

main/postmarketos-ui-cosmic/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Clayton Craft <clayton@craftyguy.net>"
 pkgname=postmarketos-ui-cosmic
 pkgver=2
-pkgrel=3
+pkgrel=4
 pkgdesc="COSMIC Desktop Environment from System76"
 url="https://system76.com/cosmic/"
 # Only tested on these archs.
@@ -11,6 +11,13 @@ url="https://system76.com/cosmic/"
 # packages and build locally.
 arch="x86_64 aarch64 ppc64le loongarch64"
 license="GPL-3.0-or-later"
+_depends="
+	bluez-openrc
+	cosmic-greeter-openrc
+	elogind-openrc
+	networkmanager-openrc
+	seatd-openrc
+	"
 depends="
 	bluez
 	cosmic-session
@@ -42,12 +49,13 @@ _pmb_recommends="
 	snapshot
 	tuned-ppd
 "
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
+subpackages="$pkgname-openrc"
 source="
 	amplification_sink.conf
 	favorites.conf
 	wallpaper.conf
 "
-subpackages="$pkgname-openrc"
 options="!check pmb:drm pmb:systemd"
 replaces="
 	cosmic-applets
@@ -64,23 +72,9 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="
-		$subpkgname.post-install
-		$subpkgname.post-upgrade
-		"
-	depends="
-		bluez-openrc
-		cosmic-greeter-openrc
-		elogind-openrc
-		networkmanager-openrc
-		openrc
-		seatd
-		seatd-openrc
-		"
-	_pmb_recommends="
-		tuned-ppd-openrc
-		"
+	default_openrc
+	depends="seatd"
+	_pmb_recommends="tuned-ppd-openrc"
 	mkdir -p "$subpkgdir"
 }
 

main/postmarketos-ui-fbkeyboard/APKBUILD

@@ -2,11 +2,12 @@
 maintainer="Ferenc Bakonyi <bakonyi.ferenc@gmail.com>"
 pkgname=postmarketos-ui-fbkeyboard
 pkgver=5
-pkgrel=4
+pkgrel=5
 pkgdesc="Plain framebuffer console with touchscreen keyboard support"
 url="https://github.com/bakonyiferenc/fbkeyboard"
 arch="all"
 license="GPL-3.0-or-later"
+depends_openrc="networkmanager-openrc"
 depends="
 	dnsmasq
 	fbkeyboard
@@ -14,6 +15,7 @@ depends="
 	postmarketos-base-ui-audio
 	postmarketos-base-ui-networkmanager
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.pre-deinstall $pkgname-openrc.post-upgrade"
 subpackages="$pkgname-openrc $pkgname-systemd"
 source="fbkeyboard.init fbkeyboard.service"
 options="!check" # No tests
@@ -23,17 +25,6 @@ package() {
 	install -Dm644 "$srcdir"/fbkeyboard.service "$pkgdir"/usr/lib/systemd/system/fbkeyboard.service
 }
 
-openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade"
-	depends="
-		openrc
-		networkmanager-openrc
-	"
-
-	mkdir -p "$subpkgdir"
-}
-
 sha512sums="
 bed2c48abfac7cc9bc16fb16cd3ae3a7048121d2867b961458f0d3a9520e16598c8115a7b00808bded64904956aea445fa31a3106c52bab87cfba3420be309b8  fbkeyboard.init
 5b70d6087a4448673a4f3f1868ee93f67517edcdf02a6aeec7381b9c91e43cf213a96714388b437497026188276f9c55e759c9fb75e3465422188e9cd00724c9  fbkeyboard.service

main/postmarketos-ui-gnome-mobile/APKBUILD

@@ -4,11 +4,12 @@
 maintainer="Newbyte <newbyte@postmarketos.org>"
 pkgname=postmarketos-ui-gnome-mobile
 pkgver=4
-pkgrel=4
+pkgrel=5
 pkgdesc="(Wayland) Gnome Shell patched to adapt better to phones (Experimental)"
 url="https://gnome.org/"
 arch="noarch !armhf !riscv64" # gnome-shell / riscv64: mutter-mobile
 license="GPL-3.0-or-later"
+depends_openrc="gdm-openrc"
 depends="
 	bolt
 	dbus-x11
@@ -35,6 +36,7 @@ depends="
 _pmb_recommends="
 	gnome-mobile-extensions-app
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
 subpackages="$pkgname-openrc"
 options="!check pmb:systemd"
 
@@ -43,10 +45,7 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="gdm-openrc openrc"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }
 

main/postmarketos-ui-gnome/APKBUILD

@@ -4,12 +4,13 @@
 maintainer="Newbyte <newbyte@postmarketos.org>"
 pkgname=postmarketos-ui-gnome
 pkgver=4
-pkgrel=3
+pkgrel=4
 pkgdesc="(Wayland) Gnome Shell"
 url="https://gnome.org/"
 # armhf blocked by gnome-shell -> gjs -> mozjs102
 arch="noarch !armhf"
 license="GPL-3.0-or-later"
+depends_openrc="gdm-openrc"
 depends="
 	!gnome-settings-daemon-mobile
 	!gnome-shell-mobile
@@ -29,6 +30,7 @@ _pmb_recommends="
 	snapshot
 	"
 subpackages="$pkgname-openrc"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
 options="!check pmb:systemd"
 
 package() {
@@ -36,9 +38,6 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="gdm-openrc openrc"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }

main/postmarketos-ui-i3wm/APKBUILD

@@ -2,16 +2,20 @@
 maintainer="Achill Gilgenast <achill@achill.org>"
 pkgname=postmarketos-ui-i3wm
 pkgver=2
-pkgrel=2
+pkgrel=3
 pkgdesc="(X11) Tiling WM (keyboard required)"
 url="https://i3wm.org"
-# riscv64 has very unstable builders
-arch="noarch !riscv64"
+arch="noarch"
 license="GPL-3.0-or-later"
 source="
 	i3-exec
 	i3wm-pmos
 	"
+depends_openrc="
+	elogind-openrc
+	networkmanager-openrc
+	tinydm-openrc
+	"
 depends="
 	dmenu-virtual
 	dnsmasq
@@ -29,31 +33,20 @@ depends="
 	st-virtual
 	xorg-server
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
 subpackages="$pkgname-openrc"
 options="!check"
-
-build() {
-	return 0
-}
+replaces="i3wm"
 
 package() {
-	mkdir -p "$pkgdir"
 	install -D -m644 "$srcdir"/i3wm-pmos \
 		"$pkgdir"/usr/share/i3/config.pmos
-	replaces="i3wm"
 	install -Dm644 "$srcdir"/i3-exec \
 		"$pkgdir"/usr/share/xsessions/i3.desktop
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		elogind-openrc
-		networkmanager-openrc
-		tinydm-openrc
-		"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }
 

main/postmarketos-ui-kodi/APKBUILD

@@ -3,11 +3,16 @@
 maintainer="Bart Ribbers <bribbers@disroot.org>"
 pkgname=postmarketos-ui-kodi
 pkgver=3
-pkgrel=0
+pkgrel=1
 pkgdesc="(GBM) 10-foot UI useful on TV's"
 url="https://kodi.tv"
 arch="all !armhf !loongarch64" # kodi
 license="GPL-3.0-or-later"
+depends_openrc="
+	elogind-openrc
+	networkmanager-openrc
+	kodi-openrc
+	"
 depends="
 	elogind
 	kodi
@@ -19,6 +24,7 @@ depends="
 	postmarketos-base-ui-networkmanager
 	upower
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
 subpackages="$pkgname-openrc $pkgname-systemd"
 source="automount-media.rules kodi.service"
 options="!check pmb:drm pmb:systemd"
@@ -31,14 +37,7 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		elogind-openrc
-		kodi-openrc
-		networkmanager-openrc
-		"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }
 sha512sums="

main/postmarketos-ui-lomiri/APKBUILD

@@ -1,7 +1,7 @@
 maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=postmarketos-ui-lomiri
 pkgver=4
-pkgrel=0
+pkgrel=1
 pkgdesc="(Wayland) The convergent desktop environment (Experimental)"
 url="https://lomiri.com/"
 # ppc64le: Missing lomiri-weather-app
@@ -55,6 +55,7 @@ _pmb_recommends="
 	yaru-icon-theme
 	yaru-theme
 "
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
 subpackages="
 	$pkgname-openrc
 "
@@ -87,18 +88,8 @@ package() {
 	# Disable setup wizard
 	mkdir -p "$pkgdir"/etc/skel/.config/lomiri
 	touch "$pkgdir"/etc/skel/.config/lomiri/wizard-has-run
-}
 
-openrc() {
-	install_if="$pkgname openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		openrc
-		postmarketos-base-ui-bluez-openrc
-		postmarketos-base-ui-elogind
-	"
-
-	# superd is only needed on OpenRC
+	# superd
 	mkdir -p "$subpkgdir"/etc/superd/services/
 	for file in "$srcdir"/*.service; do
 		filename=$(basename $file)
@@ -111,6 +102,17 @@ openrc() {
 	done
 }
 
+openrc() {
+	default_openrc
+	depends="
+		postmarketos-base-ui-bluez-openrc
+		postmarketos-base-ui-elogind
+	"
+
+	# superd is only needed on OpenRC
+	amove etc/superd/services usr/share/superd
+}
+
 sha512sums="
 0d6bd82aa0eb52574d3f60a1fb592d7a3caa805be9b501a68d6cdeeefdbcb53486765f3c3999abdcdadb9deacf754f3e4267cd2deda6ce4c06988775c0c37487  000-gschema.override
 26d677d1b4e1e4d358e947bce880746b6bad6f7c4700f7e675acf126c5125004d4d6b1508810fa39526fa3a0a2e5547c64cd6d41f1dfeec09a6a549dcbdb97c8  lomiri.desktop

main/postmarketos-ui-lxqt/APKBUILD

@@ -2,12 +2,18 @@
 maintainer="Antoni Aloy <aaloytorrens@gmail.com>"
 pkgname=postmarketos-ui-lxqt
 pkgver=0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="(X11) Lightweight Qt Desktop Environment (stylus recommended)"
 url="https://lxqt-project.org/"
 # armhf: lxqt-desktop not available
 arch="noarch !armhf"
 license="GPL-3.0-or-later"
+depends_openrc="
+	brightnessctl-openrc
+	elogind-openrc
+	networkmanager-openrc
+	tinydm-openrc
+	"
 depends="
 	brightnessctl
 	dbus-x11
@@ -46,7 +52,12 @@ _pmb_recommends="
 	screengrab
 	unclutter-xfixes
 	"
-install="$pkgname.post-install $pkgname.post-upgrade"
+install="
+	$pkgname.post-install
+	$pkgname.post-upgrade
+	$pkgname-openrc.post-install
+	$pkgname-openrc.post-upgrade
+	"
 subpackages="$pkgname-openrc"
 source="
 	$pkgname-$pkgver.tar.gz::https://gitlab.com/antoni.aloytorrens/lxqt-tablet/-/archive/$pkgver/lxqt-tablet-$pkgver.tar.gz
@@ -87,16 +98,7 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		brightnessctl-openrc
-		elogind-openrc
-		networkmanager-openrc
-		openrc
-		tinydm-openrc
-		"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }
 

main/postmarketos-ui-mate/APKBUILD

@@ -2,11 +2,17 @@
 maintainer="Jakko <jahau@rocketmail.com>"
 pkgname=postmarketos-ui-mate
 pkgver=9
-pkgrel=2
+pkgrel=3
 pkgdesc="(X11) MATE Desktop Environment, fork of GNOME2 (stylus recommended)"
 url="http://mate-desktop.org/"
 arch="noarch"
 license="GPL-3.0-or-later"
+depends_openrc="
+	bluez-openrc
+	elogind-openrc
+	lightdm-openrc
+	networkmanager-openrc
+	"
 depends="
 	bluez
 	dbus-x11
@@ -35,6 +41,7 @@ _pmb_recommends="
 	mate-tweak
 	network-manager-applet
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
 subpackages="$pkgname-openrc"
 source="
 	10_caja-single-click.gschema.override
@@ -87,15 +94,7 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		bluez-openrc
-		elogind-openrc
-		lightdm-openrc
-		networkmanager-openrc
-		"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }
 

main/postmarketos-ui-mediaberry/APKBUILD

@@ -2,11 +2,12 @@
 maintainer="hexaheximal <hexaheximal@proton.me>"
 pkgname=postmarketos-ui-mediaberry
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="(Wayland) An open platform for streaming boxes and smart TVs (WIP)"
 url="https://mediaberry.org"
 arch="noarch"
 license="GPL-3.0-or-later"
+depends_openrc="tinydm tinydm-openrc"
 depends="
 	dnsmasq
 	pam-rundir
@@ -19,25 +20,15 @@ depends="
 	foot
 	wireless-tools
 	"
-options="!check pmb:drm pmb:systemd-never" # No testsuite
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
+subpackages="$pkgname-openrc"
 source="
 	set-xdg-env.sh
 	start_mediaberry.sh
 	mediaberry.desktop
 "
+options="!check pmb:drm pmb:systemd-never" # No testsuite
 _pmb_groups="seat"
-subpackages="$pkgname-openrc"
-
-openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		tinydm
-		tinydm-openrc
-	"
-	mkdir "$subpkgdir"
-}
-
 
 package() {
 	install -Dm644 "$srcdir"/mediaberry.desktop \
@@ -48,8 +39,13 @@ package() {
 
 	install -Dm755 "$srcdir"/start_mediaberry.sh \
 		"$pkgdir"/usr/bin/start_mediaberry
-
 }
+
+openrc() {
+	default_openrc
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 a711689b74a9b689e4678694fada2fdb5195a88b0a7e68fc1f1d5901bdeef79fe72caf959073a81868c929c94a8fef39f049bc118c7d76b3687770be96805280  set-xdg-env.sh
 277ae85b6f6d5fd6cdc459e3dbe2845c9a8068a3b0a72ab20d2281c5e095d1d4455f1631b0ae4ff8de55f4284b8bccf08faa8981eb0f30751074bc938b02c715  start_mediaberry.sh

main/postmarketos-ui-niri/APKBUILD

@@ -2,12 +2,13 @@
 maintainer="Aster Boese <asterboese@mailbox.org>"
 pkgname=postmarketos-ui-niri
 pkgver=2
-pkgrel=0
+pkgrel=1
 pkgdesc="(Wayland) A scrollable-tiling compositor (DOES NOT RUN WITHOUT HW ACCELERATION!)"
 url="https://postmarketos.org"
 # Blocked by niri
 arch="x86_64 aarch64 ppc64le"
 license="GPL-3.0-or-later"
+depends_openrc="elogind-openrc networkmanager-openrc"
 depends="
 	bluez
 	dnsmasq
@@ -31,6 +32,7 @@ _pmb_recommends="
 	xwayland
 	"
 _pmb_groups="seat"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
 subpackages="$pkgname-openrc $pkgname-systemd"
 source="
 	niri-greet.kdl
@@ -55,16 +57,7 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		bluez-openrc
-		elogind-openrc
-		modemmanager-openrc
-		networkmanager-openrc
-		seatd-openrc
-		"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }
 

main/postmarketos-ui-openbox/APKBUILD

@@ -2,11 +2,16 @@
 maintainer="hexaheximal <hexaheximal@proton.me>"
 pkgname=postmarketos-ui-openbox
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="(X11) A highly configurable and lightweight X11 window manager (keyboard required)"
 url="https://openbox.org/"
 arch="noarch"
 license="GPL-3.0-or-later"
+depends_openrc="
+	tinydm-openrc
+	elogind-openrc
+	networkmanager-openrc
+"
 depends="
 	dmenu-virtual
 	dnsmasq
@@ -22,6 +27,7 @@ depends="
 	xterm
 	xorg-server
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
 subpackages="$pkgname-openrc"
 options="!check"
 
@@ -30,14 +36,6 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		elogind-openrc
-		openrc
-		networkmanager-openrc
-		tinydm-openrc
-	"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }

main/postmarketos-ui-phosh/APKBUILD

@@ -4,11 +4,12 @@
 maintainer="Newbyte <newbyte@postmarketos.org>"
 pkgname=postmarketos-ui-phosh
 pkgver=27
-pkgrel=2
+pkgrel=3
 pkgdesc="(Wayland) Mobile UI using GNOME components and apps"
 url="https://phosh.mobi"
 arch="noarch !armhf"
 license="GPL-3.0-or-later"
+depends_openrc="greetd-openrc"
 depends="
 	!gnome-settings-daemon-mobile
 	!gnome-shell-mobile
@@ -32,7 +33,12 @@ _pmb_recommends="
 	phosh-mobile-settings
 	"
 _pmb_groups="feedbackd"
-install="$pkgname.post-install $pkgname.post-upgrade"
+install="
+	$pkgname.post-install
+	$pkgname.post-upgrade
+	$pkgname-openrc.post-install
+	$pkgname-openrc.post-upgrade
+	"
 source="
 	01_postmarketos-ui-phosh.gschema.override
 	mimeapps.list
@@ -59,9 +65,7 @@ default_osk() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="greetd-openrc"
+	default_openrc
 	replaces="greetd-openrc"
 
 	install -Dm644 "$srcdir"/greetd.confd \

main/postmarketos-ui-plasma-bigscreen/APKBUILD

@@ -2,7 +2,7 @@
 maintainer="Bart Ribbers <bribbers@disroot.org>"
 pkgname=postmarketos-ui-plasma-bigscreen
 pkgver=1
-pkgrel=3
+pkgrel=4
 _commit_configs="a8bd93e279c222be6058ef46b065c11e88aa8400"
 pkgdesc="(Wayland) 10-feet variant of Plasma, made for big screen TVs"
 url="https://wiki.postmarketos.org/wiki/Plasma_Bigscreen"
@@ -10,6 +10,11 @@ url="https://wiki.postmarketos.org/wiki/Plasma_Bigscreen"
 # riscv64: plasma-workspace, qt5-qtbase need rebuild against libcui18n in alpine edge
 arch="!armhf !riscv64"
 license="GPL-3.0-or-later"
+depends_openrc="
+	elogind-openrc
+	networkmanager-openrc
+	tinydm-openrc
+	"
 depends="
 	plasma-bigscreen
 	postmarketos-base-ui-plasma
@@ -21,6 +26,7 @@ _pmb_recommends="
 	nymphcast
 	plank-player
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
 subpackages="$pkgname-openrc"
 source="$pkgname-$_commit_configs.tar.gz::https://invent.kde.org/plasma-bigscreen/bigscreen-image-settings/-/archive/$_commit_configs/bigscreen-image-settings-$_commit_configs.tar.gz
 	qtlogging.ini
@@ -40,15 +46,7 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		elogind-openrc
-		openrc
-		networkmanager-openrc
-		tinydm-openrc
-		"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }
 

main/postmarketos-ui-retroarch/APKBUILD

@@ -2,17 +2,19 @@
 maintainer="Sandelinos <postmarketos@sandelinos.me>"
 pkgname=postmarketos-ui-retroarch
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="RetroArch in KMS mode"
 url="https://www.retroarch.com"
 arch="noarch"
 license="GPL-3.0-or-later"
+depends_openrc="elogind-openrc"
 depends="
 	autologin
 	elogind
 	polkit-elogind
 	retroarch
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
 subpackages="$pkgname-openrc"
 source="
 	retroarch.initd
@@ -25,14 +27,6 @@ package() {
 	install -Dm755 postmarketos-ui-retroarch.sh "$pkgdir/usr/bin/postmarketos-ui-retroarch"
 }
 
-openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="elogind-openrc"
-
-	default_openrc
-}
-
 sha512sums="
 07b2177325734bdb8358265c48f6849ba39e9801b2b1a871d7242259f4d456ff974eed126a6e5775bca87bf5286422db0afd4a2fa0b96a170f18682edd60a0cd  retroarch.initd
 317299beaf517274f5027c59c4903301abfa531043184dab8824d74cab22c4e2cd573b56492195caf9f151f6ad41da1dd3a4a561d986d8e8034b7e459c859983  postmarketos-ui-retroarch.sh

main/postmarketos-ui-shelli/APKBUILD

@@ -2,11 +2,16 @@
 maintainer="Craig Comstock <craig@unreasonablefarm.org>"
 pkgname=postmarketos-ui-shelli
 pkgver=3
-pkgrel=8
+pkgrel=9
 pkgdesc="Plain console with touchscreen gesture support"
 url="https://gitlab.com/unrznbl/shelli"
 arch="all"
 license="GPL-3.0-or-later"
+depends_openrc="
+	networkmanager-openrc
+	ofono-openrc
+	shelli-openrc
+	"
 depends="
 	dnsmasq
 	ofono
@@ -16,6 +21,7 @@ depends="
 	postmarketos-base-ui-networkmanager
 	shelli
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.pre-deinstall $pkgname-openrc.post-upgrade"
 subpackages="$pkgname-openrc"
 options="!check" # No tests
 
@@ -24,13 +30,6 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.pre-deinstall $subpkgname.post-upgrade"
-	depends="
-		networkmanager-openrc
-		ofono-openrc
-		shelli-openrc
-		"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }

main/postmarketos-ui-sway/APKBUILD

@@ -2,12 +2,16 @@
 maintainer="Oliver Smith <ollieparanoid@postmarketos.org>"
 pkgname=postmarketos-ui-sway
 pkgver=3.2
-pkgrel=0
+pkgrel=1
 pkgdesc="(Wayland) Tiling WM, drop-in replacement for i3wm"
 url="https://postmarketos.org"
 arch="noarch"
 license="GPL-3.0-or-later"
-subpackages="$pkgname-openrc $pkgname-logo-key-alt:logo_key_alt"
+depends_openrc="
+	elogind-dev
+	networkmanager-dev
+	tinydm-dev
+	"
 depends="
 	bluez
 	dnsmasq
@@ -33,6 +37,8 @@ _pmb_recommends="
 _pmb_groups="
 	seat
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
+subpackages="$pkgname-openrc $pkgname-logo-key-alt:logo_key_alt"
 source="
 	etc-sway-config
 	etc-sway-config.d-00-logo-key.conf
@@ -51,19 +57,8 @@ logo_key_alt() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		bluez-openrc
-		elogind-openrc
-		modemmanager-openrc
-		networkmanager-openrc
-		openrc
-		seatd-openrc
-		tinydm-openrc
-	"
-
-		mkdir -p "$subpkgdir"
+	default_openrc
+	mkdir -p "$subpkgdir"
 }
 
 sha512sums="

main/postmarketos-ui-sxmo-de-dwm/APKBUILD

@@ -5,11 +5,19 @@
 maintainer="Willow Barraco <contact@willowbarraco.fr>"
 pkgname=postmarketos-ui-sxmo-de-dwm
 pkgver=1.18.0 # Bump this so the file names in bpo are correct
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on dwm"
 url="http://sr.ht/~mil/Sxmo"
 arch="noarch"
 license="AGPL-3.0-only"
+depends_openrc="
+	bluez-openrc
+	iio-sensor-proxy-openrc
+	modemmanager-openrc
+	networkmanager-openrc
+	seatd-openrc
+	tinydm-openrc
+	"
 depends="
 	postmarketos-base-ui
 	postmarketos-base-ui-audio
@@ -21,6 +29,8 @@ depends="
 install="
 	$pkgname.post-install
 	$pkgname.post-upgrade
+	$pkgname-openrc.post-install
+	$pkgname-openrc.post-upgrade
 	"
 _pmb_recommends="
 	w3m
@@ -42,16 +52,6 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		openrc
-		tinydm-openrc
-		modemmanager-openrc
-		networkmanager-openrc
-		bluez-openrc
-		iio-sensor-proxy-openrc
-		"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }

main/postmarketos-ui-sxmo-de-i3/APKBUILD

@@ -5,11 +5,19 @@
 maintainer="Willow Barraco <contact@willowbarraco.fr>"
 pkgname=postmarketos-ui-sxmo-de-i3
 pkgver=1.18.0 # Bump this so the file names in bpo are correct
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on i3"
 url="http://sr.ht/~mil/Sxmo"
 arch="noarch"
 license="AGPL-3.0-only"
+depends_openrc="
+	bluez-openrc
+	iio-sensor-proxy-openrc
+	modemmanager-openrc
+	networkmanager-openrc
+	seatd-openrc
+	tinydm-openrc
+	"
 depends="
 	postmarketos-base-ui
 	postmarketos-base-ui-audio
@@ -21,6 +29,8 @@ depends="
 install="
 	$pkgname.post-install
 	$pkgname.post-upgrade
+	$pkgname-openrc.post-install
+	$pkgname-openrc.post-upgrade
 	"
 _pmb_recommends="
 	w3m
@@ -42,16 +52,6 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		openrc
-		tinydm-openrc
-		modemmanager-openrc
-		networkmanager-openrc
-		bluez-openrc
-		iio-sensor-proxy-openrc
-		"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }

main/postmarketos-ui-sxmo-de-river/APKBUILD

@@ -5,11 +5,19 @@
 maintainer="Willow Barraco <contact@willowbarraco.fr>"
 pkgname=postmarketos-ui-sxmo-de-river
 pkgver=1.18.0 # Bump this so the file names in bpo are correct
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on river"
 url="http://sr.ht/~mil/Sxmo"
 arch="noarch"
 license="AGPL-3.0-only"
+depends_openrc="
+	bluez-openrc
+	iio-sensor-proxy-openrc
+	modemmanager-openrc
+	networkmanager-openrc
+	seatd-openrc
+	tinydm-openrc
+	"
 depends="
 	postmarketos-base-ui
 	postmarketos-base-ui-audio
@@ -21,6 +29,8 @@ depends="
 install="
 	$pkgname.post-install
 	$pkgname.post-upgrade
+	$pkgname-openrc.post-install
+	$pkgname-openrc.post-upgrade
 	"
 _pmb_groups="
 	seat
@@ -45,17 +55,6 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		openrc
-		seatd-openrc
-		tinydm-openrc
-		modemmanager-openrc
-		networkmanager-openrc
-		bluez-openrc
-		iio-sensor-proxy-openrc
-	"
-
+	default_openrc
 	mkdir "$subpkgdir"
 }

main/postmarketos-ui-sxmo-de-sway/APKBUILD

@@ -5,11 +5,19 @@
 maintainer="Willow Barraco <contact@willowbarraco.fr>"
 pkgname=postmarketos-ui-sxmo-de-sway
 pkgver=1.18.0 # Bump this so the file names in bpo are correct
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on sway"
 url="http://sr.ht/~mil/Sxmo"
 arch="noarch"
 license="AGPL-3.0-only"
+depends_openrc="
+	bluez-openrc
+	iio-sensor-proxy-openrc
+	modemmanager-openrc
+	networkmanager-openrc
+	seatd-openrc
+	tinydm-openrc
+	"
 depends="
 	postmarketos-base-ui
 	postmarketos-base-ui-audio
@@ -21,6 +29,8 @@ depends="
 install="
 	$pkgname.post-install
 	$pkgname.post-upgrade
+	$pkgname-openrc.post-install
+	$pkgname-openrc.post-upgrade
 	"
 _pmb_groups="
 	seat
@@ -46,17 +56,6 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		openrc
-		seatd-openrc
-		tinydm-openrc
-		modemmanager-openrc
-		networkmanager-openrc
-		bluez-openrc
-		iio-sensor-proxy-openrc
-	"
-
+	default_openrc
 	mkdir "$subpkgdir"
 }

main/postmarketos-ui-weston/APKBUILD

@@ -2,11 +2,16 @@
 maintainer="Bart Ribbers <bribbers@disroot.org>"
 pkgname=postmarketos-ui-weston
 pkgver=6
-pkgrel=11
+pkgrel=12
 pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)"
 url="https://postmarketos.org"
 arch="noarch"
 license="GPL-3.0-or-later"
+depends_openrc="
+	elogind-openrc
+	lightdm-openrc
+	networkmanager-openrc
+	"
 depends="
 	bluez
 	dnsmasq
@@ -29,6 +34,7 @@ _pmb_recommends="htop
 	weston-xwayland
 	xwayland
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
 subpackages="$pkgname-openrc"
 source="start_weston.sh weston.ini.default"
 options="!check pmb:drm" # Meta package, no test suite
@@ -42,18 +48,10 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		bluez-openrc
-		elogind-openrc
-		lightdm-openrc
-		openrc
-		networkmanager-openrc
-	"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }
+
 sha512sums="
 6c9f4f6eeb179b067f1d08c84f35d6a705043432a92c3733491de3c240d48a85e95173e0b4e2f83b737761212a2aec365b1375c077c330735013c9cf36d4390e  start_weston.sh
 57d2dd91aa6bee6ab73122bf26906de183fceee9f6c28586ac803045344b10c4e3c7e9cd23cada86a585c42221505a2d23572e3d6d1fd757c1ed1c8e1b65644c  weston.ini.default

main/postmarketos-ui-xfce4/APKBUILD

@@ -2,11 +2,18 @@
 maintainer="Jakko <jahau@rocketmail.com>"
 pkgname=postmarketos-ui-xfce4
 pkgver=0.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="(X11) Lightweight desktop (stylus recommended)"
 url="https://gitlab.postmarketos.org/postmarketOS/xfce4-phone"
 arch="noarch"
 license="GPL-3.0-or-later"
+depends_openrc="
+	bluez-openrc
+	brightnessctl-openrc
+	elogind-openrc
+	lightdm-openrc
+	networkmanager-openrc
+	"
 depends="
 	bluez
 	brightnessctl
@@ -42,6 +49,7 @@ _pmb_recommends="
 	xfce4-terminal
 	xfce4-whiskermenu-plugin
 	"
+install="$pkgname-openrc.post-install $pkgname-openrc.post-upgrade"
 subpackages="$pkgname-openrc"
 source="
 	xfce4-phone-$pkgver.tar.gz::https://gitlab.postmarketos.org/postmarketOS/xfce4-phone/-/archive/$pkgver/xfce4-phone-$pkgver.tar.gz
@@ -78,16 +86,7 @@ package() {
 }
 
 openrc() {
-	install_if="$pkgname=$pkgver-r$pkgrel openrc"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	depends="
-		bluez-openrc
-		brightnessctl-openrc
-		elogind-openrc
-		lightdm-openrc
-		networkmanager-openrc
-		"
-
+	default_openrc
 	mkdir -p "$subpkgdir"
 }
 

main/shutdown-clear-rtc-wakealarm/APKBUILD

@@ -1,11 +1,12 @@
 maintainer="Arnav Singh <me@arnavion.dev>"
 pkgname=shutdown-clear-rtc-wakealarm
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Pre-shutdown service to clear RTC wake alarm"
 url="https://wiki.postmarketos.org/wiki/Shutdown-clear-rtc-wakealarm"
 arch="noarch"
 license="MIT"
+install="$pkgname-openrc.post-install"
 subpackages="$pkgname-openrc"
 source="
 	clear-rtc-wakealarm.shutdown.initd
@@ -15,11 +16,6 @@ package() {
 	install -Dm755 "$srcdir"/clear-rtc-wakealarm.shutdown.initd "$pkgdir"/etc/init.d/clear-rtc-wakealarm
 }
 
-openrc() {
-	install="$subpkgname.post-install"
-	default_openrc
-}
-
 sha512sums="
 5e19659b9e8d2ab182ea8658a752d08c950c526546864288c5387a3e28f7973baebcf0d49350bfced1387160f4dde963c6f921f5cd4e3730940b88ae3e443cba  clear-rtc-wakealarm.shutdown.initd
 "

main/ttyescape/APKBUILD

@@ -1,12 +1,14 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=ttyescape
 pkgver=1.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Daemon to allow users to escape to a tty"
 url="https://gitlab.postmarketos.org/postmarketOS/ttyescape"
 arch="noarch"
 license="GPL-2.0"
+depends_openrc="hkdm-openrc"
 depends="hkdm buffyboard terminus-font kbd"
+install="$pkgname-openrc.post-install"
 subpackages="$pkgname-openrc"
 source="
 	https://gitlab.postmarketos.org/postmarketOS/ttyescape/-/archive/$pkgver/ttyescape-$pkgver.tar.gz
@@ -25,12 +27,6 @@ package() {
 		"$pkgdir"/etc/conf.d/ttyescape.conf
 }
 
-openrc() {
-	install="$subpkgname.post-install"
-	depends="hkdm-openrc openrc"
-	default_openrc
-}
-
 sha512sums="
 b196cad01d490ac759fc72d58382ffe621b1f33f2ec9794a7937b41bfb9a0f200939d20cd027a2c48d44d095cd8570f332c995ab015d459387d63c7788fd8298  ttyescape-1.0.1.tar.gz
 ac06c2ae2b3b8404d6ed79a046b175abbeb2360033edcaa22c21e1a61c68913e58013e9200ee5b786eee9020a2c78d1bda09c72d87ea0998bf6eeb71da015a2f  etc-conf-d-ttyescape.conf

main/wcnss-wlan/APKBUILD

@@ -1,12 +1,13 @@
 # Maintainer Attila Szollosi <ata2001@airmail.cc>
 pkgname=wcnss-wlan
 pkgver=2
-pkgrel=2
+pkgrel=3
 pkgdesc="Init script for enabling wcnss wlan driver (downstream Android kernels)"
 url="https://gitlab.postmarketos.org/postmarketOS/pmaports"
 arch="noarch"
 license="GPL-3.0-or-later"
 source="$pkgname.initd"
+install="$pkgname-openrc.post-install"
 subpackages="$pkgname-openrc"
 options="!check" # No tests
 
@@ -14,11 +15,6 @@ package() {
 	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/wcnss-wlan
 }
 
-openrc() {
-	install="$subpkgname.post-install"
-	default_openrc
-}
-
 sha512sums="
 8bf30e5cdf71dc3e2f4ec5b426abd87036dd8748207ec133c3898c966fa33770f18f852f64a9011f20780c411364fd573a1fa7adba8f4491326026f8d85dd018  wcnss-wlan.initd
 "