main/nokia-weeknd: add openrc subpackage

main/wl1251-cal: add openrc subpackage
soc-qcom-sm8350: move openrc scripts to subpackage
2024-10-04 21:47:30 -04:00 · 2024-10-04 21:47:30 -04:00 · 2024-10-04 21:47:30 -04:00 · 2024-10-04 21:47:30 -04:00 · 2024-10-04 21:47:30 -04:00 · 2024-10-04 21:47:30 -04:00
193 changed files with 733 additions and 274 deletions
@@ -3,7 +3,7 @@
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -39,7 +39,7 @@ depends="
 "
 makedepends="devicepkg-dev"
 replaces="hexagonrpcd-openrc"
-install="$pkgname.post-install $pkgname.post-upgrade"
+subpackages="$pkgname-openrc"
 source="
 	81-libssc-fairphone-fp4.rules
 	90-feedbackd-aw8695.rules
@@ -63,6 +63,13 @@ package() {
 		"$pkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp4.rules
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
@@ -0,0 +1 @@
+device-fairphone-fp4-openrc.post-install
@@ -1 +0,0 @@
-device-fairphone-fp4.post-install
@@ -3,7 +3,7 @@
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
 pkgver=6
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -28,7 +28,10 @@ source="
 	no-hexagonrpcd-on-suspend.sh
 	q6voiced.conf
 "
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
+	"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -55,27 +58,25 @@ nonfree_firmware() {
 		soc-qcom-sdm845-modem
 		soc-qcom-sdm845-nonfree-firmware
 	"
-	# Enable HexagonRPCD by default, but not if the user installed this
-	# package then disabled it.
-	install="
-		device-google-sargo-nonfree-firmware.post-install
-	"
-
-	# The q6voiced configuration can only be used if the ADSP is brought up
-	# via non-free firmware.
-	install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
-
-	# Sensors depend on ADSP firmware and the sensors registry served over FastRPC.
-	install -Dm644 "$srcdir"/hexagonrpcd-adsp-sensorspd.confd \
-		"$subpkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
-
 	# Sensors depend on ADSP firmware and the sensors registry served over FastRPC.
 	install -Dm644 "$srcdir"/81-libssc-google-sargo.rules \
 		"$subpkgdir"/usr/lib/udev/rules.d/81-libssc-google-sargo.rules
+}

+nonfree_firmware_openrc() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+	# Enable HexagonRPCD by default, but not if the user installed this
+	# package then disabled it.
+	install="$subpkgname.post-install"
 	# The FastRPC service is only enabled when non-free firmware is installed.
 	install -Dm755 "$srcdir"/no-hexagonrpcd-on-suspend.sh \
-		"$subpkgdir"/etc/elogind/system-sleep/no-hexagonrpcd-on-suspend.sh
+		"$subpkgdir"/etc/elogind/system-sleep/no-hexagonrpcd-on-suspend.sh	
+	# The q6voiced configuration can only be used if the ADSP is brought up
+	# via non-free firmware.
+	install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
+	# Sensors depend on ADSP firmware and the sensors registry served over FastRPC.
+	install -Dm644 "$srcdir"/hexagonrpcd-adsp-sensorspd.confd \
+		"$subpkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
 }

 sha512sums="
@@ -3,7 +3,7 @@
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
 pkgver=29
-pkgrel=0
+pkgrel=1
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
 arch="armv7"
@@ -22,13 +22,14 @@ depends="
 	wl1251-cal-openrc
 "
 makedepends="devicepkg-dev u-boot-tools kbd kbd-bkeymaps"
-install="$pkgname.pre-upgrade $pkgname.post-install"
+install="$pkgname.pre-upgrade"
 subpackages="
 	$pkgname-x11
 	$pkgname-xkeyboard-config:xkeyboard_config
 	$pkgname-i3wm
 	$pkgname-upower
 	$pkgname-sxmo
+	$pkgname-openrc
 "
 source="
 	10-initfs-keymap.files
@@ -206,6 +207,13 @@ upower() {
 		"$subpkgdir"/etc/UPower/UPower.conf
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 6b475c12eca8563be48c562a1cb4ad8ca6a05d70fc54b21288b2dd7435a80a6f53351aa870db96d5bbecf1b1c5cb00dfe35f5066e6d3fd0ad0369e66aeef5a21  10-initfs-keymap.files
 4656d3b3ced0a86e2d6315c89322899f646a689e9cb64609aa8ad5a676b23d93706d8a37f3be6f6b12c6b1e8501b7d26ecafecf27322333850513a6805c61910  10-initfs-keymap.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Enable acpid
+rc-update add acpid default
+# hwdrivers is required for acpid to 'see' all devices
+rc-update add hwdrivers boot
+# Enable ofono
+rc-update add ofono default
+# Disable swclock because rtc is working
+rc-update -q del swclock boot
+
+exit 0
@@ -5,13 +5,4 @@ for i in $(awk '{if($NF && ($1 !~ /^#/)) print $NF}' /etc/acpi.map); do
        ln -s /etc/acpi/handler.sh /etc/acpi/$i
 done

-# Enable acpid
-rc-update add acpid default
-# hwdrivers is required for acpid to 'see' all devices
-rc-update add hwdrivers boot
-# Enable ofono
-rc-update add ofono default
-# Disable swclock because rtc is working
-rc-update -q del swclock boot
-
 exit 0
@@ -27,8 +27,8 @@ source="
 	81-libssc-oneplus-enchilada.rules
 "
 subpackages="
-	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
 	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
 	$pkgname-pmtest
 "

@@ -4,7 +4,7 @@
 pkgname=device-oneplus-fajita
 pkgdesc="OnePlus 6T"
 pkgver=14
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -26,7 +26,11 @@ source="
 	q6voiced.conf
 	81-libssc-oneplus-fajita.rules
 "
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-pmtest"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
+	$pkgname-pmtest
+	"

 build() {
 	devicepkg_build $startdir $pkgname
@@ -48,12 +52,16 @@ nonfree_firmware() {
 		soc-qcom-sdm845-modem
 	"
 	replaces="hexagonrpcd-openrc"
+
+	install -Dm644 "$srcdir"/81-libssc-oneplus-fajita.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
+}
+
+nonfree_firmware_openrc() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	mkdir "$subpkgdir"

 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
-	install -Dm644 "$srcdir"/81-libssc-oneplus-fajita.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
-	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
+	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp	
 }

 pmtest() {
@@ -0,0 +1 @@
+./device-oneplus-fajita-nonfree-firmware-openrc.post-install
@@ -1 +0,0 @@
-device-oneplus-fajita-nonfree-firmware.post-install
@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinebookpro
 pkgdesc="PINE64 Pinebook Pro"
 pkgver=16
-pkgrel=6
+pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -19,13 +19,7 @@ depends="
 	iw
 	"
 makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-elogind"
-install="
-	$pkgname.post-install
-	$pkgname.post-upgrade
-	$pkgname-elogind.post-install
-	$pkgname-elogind.post-upgrade
-"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-elogind $pkgname-openrc"
 source="
 	deviceinfo
 	modules-initfs
@@ -50,6 +44,7 @@ package() {

 elogind() {
 	install_if="$pkgname=$pkgver-r$pkgrel elogind"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	install -D -m644 "$srcdir"/enable-s2idle.conf \
 		"$subpkgdir"/usr/lib/elogind/sleep.conf.d/enable-s2idle.conf
 }
@@ -59,6 +54,14 @@ nonfree_firmware() {
 	depends="linux-firmware-brcm linux-firmware-rockchip"
 	mkdir "$subpkgdir"
 }
+
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 7b3cd3ff2af954d07e88cca043a9975e74236bb49454bbcff8eaed23d822560ba2200adc88373dc2a0e5f130b8f90fd1c522f7b25171325d8e41e75c4b7bfba5  deviceinfo
 6e3d97855a1f898db46b87ae1eb190d23d841fcb72332fcac4d11cd27c8f7d50eb8fd73007ed0447f106d19ff2e0fc1f34da1baf890e1465135dd692d65df2ba  modules-initfs
@@ -0,0 +1 @@
+device-pine64-pinebookpro-openrc.post-install
@@ -1 +0,0 @@
-device-pine64-pinebookpro.post-install
@@ -3,7 +3,7 @@
 pkgname=device-pine64-pinephonepro
 pkgdesc="PINE64 PinePhone Pro"
 pkgver=4
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -25,13 +25,10 @@ makedepends="
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-gnome
+	$pkgname-openrc
 	$pkgname-sway
 	$pkgname-x11
 	"
-install="
-	$pkgname.post-install
-	$pkgname.post-upgrade
-	"
 source="
 	51_keyboard.gschema.override
 	90-modem-eg25.rules
@@ -123,6 +120,13 @@ gnome() {
 		"$subpkgdir"/usr/share/glib-2.0/schemas
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
+
 sway() {
 	install_if="$pkgname=$pkgver-r$pkgrel sway-virtual"
 	install -Dm644 "$srcdir"/sway-pinephone-keyboard.conf \
@@ -0,0 +1 @@
+./device-pine64-pinephonepro-openrc.post-install
@@ -1 +0,0 @@
-device-pine64-pinephonepro.post-install
@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
 pkgver=11
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -18,6 +18,7 @@ depends="
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
 	$pkgname-kernel-tianma:kernel_tianma
 	$pkgname-kernel-ebbg:kernel_ebbg
 "
@@ -41,7 +42,6 @@ package() {

 nonfree_firmware() {
 	pkgdesc="GPU, venus, modem and sensor firmware"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	depends="
 		firmware-xiaomi-beryllium
 		soc-qcom-sdm845-nonfree-firmware
@@ -51,10 +51,16 @@ nonfree_firmware() {
 	replaces="hexagonrpcd-openrc"
 	mkdir "$subpkgdir"

-	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 	install -Dm644 81-libssc-xiaomi-beryllium.rules \
 		"$subpkgdir"/etc/udev/rules.d/81-libssc-xiaomi-beryllium.rules
+}

+nonfree_firmware_openrc() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	mkdir "$subpkgdir"
+
+	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }

@@ -0,0 +1 @@
+device-xiaomi-beryllium-nonfree-firmware-openrc.post-install
@@ -1 +0,0 @@
-device-xiaomi-beryllium-nonfree-firmware.post-install
@@ -4,7 +4,7 @@
 pkgname=device-xiaomi-scorpio
 pkgdesc="Xiaomi Mi Note 2"
 pkgver=3
-pkgrel=13
+pkgrel=14
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -22,6 +22,7 @@ makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-phosh
 	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
 	"

 source="
@@ -55,13 +56,18 @@ nonfree_firmware() {
 		linux-firmware-qca
 		soc-qcom-msm8996-nonfree-firmware
 		"
-	install="$subpkgname.post-install"
 	mkdir "$subpkgdir"

 	install -Dm644 "$srcdir/30-gpu-firmware.files" -t \
 		"$subpkgdir/usr/share/mkinitfs/files"
 }

+nonfree_firmware_openrc() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+	mkdir "$subpkgdir"
+}
+
 phosh() {
 	install_if="$pkgname=$pkgver-r$pkgrel phosh"
 	install -Dm644 "$srcdir"/phoc.ini \
@@ -3,7 +3,7 @@
 pkgname=soc-qcom-msm8916
 pkgdesc="Common package for Qualcomm MSM8916 devices"
 pkgver=21
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64 armv7"
@@ -15,6 +15,7 @@ subpackages="
 	$pkgname-rproc-none:rproc_none
 	$pkgname-rproc-no-modem:rproc_no_modem
 	$pkgname-rproc-all:rproc_all
+	$pkgname-rproc-all-openrc:rproc_all_openrc
 	soc-samsung-msm8916-modem-workaround:samsung_modem_workaround
 "

@@ -70,11 +71,16 @@ rproc_all() {
 	provider_priority=100

 	depends="msm-modem msm-modem-uim-selection q6voiced"
-	install="$subpkgname.post-install"
 	replaces="soc-qcom-msm8916-modem"

 	mkdir -p "$subpkgdir"/boot
 	echo all > "$subpkgdir"/boot/lk2nd_rproc_mode
+}
+
+rproc_all_openrc() {
+	install_if="$pkgname-rproc-all=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+
 	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
 }

@@ -2,7 +2,7 @@
 pkgname=soc-qcom-msm8953
 pkgdesc="Common package for Qualcomm MSM8953 devices"
 pkgver=10
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -11,6 +11,7 @@ depends="$pkgname-ucm swclock-offset"
 subpackages="
 	$pkgname-gpu
 	$pkgname-modem
+	$pkgname-modem-openrc:modem_openrc
 	$pkgname-ucm
 "

@@ -40,13 +41,21 @@ modem() {
 	depends="
 		msm-modem-uim-selection
 		q6voiced
-		q6voiced-openrc
 		qrtr
 		rmtfs
+	"
+	install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
+}
+
+modem_openrc() {
+	install_if="$pkgname-modem openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="
+		q6voiced-openrc
 		rmtfs-openrc
 	"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
+
+	mkdir "$subpkgdir"
 }

 gpu() {
@@ -0,0 +1 @@
+./soc-qcom-msm8953-modem-openrc.post-install
@@ -1 +0,0 @@
-soc-qcom-msm8953-modem.post-install
@@ -2,14 +2,16 @@
 pkgname=soc-qcom-sc7180
 pkgdesc="Common package for Qualcomm Snapdragon 7cx devices"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
 options="!check !archcheck !tracedeps"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
 	$pkgname-nonfree-firmware-woa:nonfree_firmware_woa
+	$pkgname-nonfree-firmware-woa-openrc:nonfree_firmware_woa_openrc
 	$pkgname-vulkan
 "
 source="00-sc7180-nonstrict-iommu.sh"
@@ -23,7 +25,13 @@ package() {

 nonfree_firmware() {
 	pkgdesc="Modem, WiFi firmware"
-	depends="rmtfs rmtfs-openrc"
+	depends="rmtfs"
+	mkdir "$subpkgdir"
+}
+
+nonfree_firmware_openrc() {
+	depends="rmtfs-openrc"
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 }
@@ -33,14 +41,20 @@ nonfree_firmware_woa() {
 	depends="
 		$pkgname-nonfree-firmware
 		pd-mapper
-		pd-mapper-openrc
 		tqftpserv
-		tqftpserv-openrc
 	"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 }

+nonfree_firmware_woa_openrc() {
+	depends="
+		pd-mapper-openrc
+		tqftpserv-openrc
+	"
+	install_if="$pkgname-nonfree-firmware-woa=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	mkdir "$subpkgdir"
+}

 vulkan() {
 	pkgdesc="Vulkan support for freedreno"
@@ -0,0 +1 @@
+./soc-qcom-sc7180-nonfree-firmware-openrc.post-install
@@ -0,0 +1 @@
+./soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-install
@@ -1 +0,0 @@
-soc-qcom-sc7180-nonfree-firmware-woa.post-install
@@ -1 +0,0 @@
-soc-qcom-sc7180-nonfree-firmware.post-install
@@ -21,12 +21,12 @@ build() {
 package() {
 	make install DESTDIR="$pkgdir"
 	install -Dm755 "$srcdir/calibrate-wl1251" "$pkgdir/usr/bin/calibrate-wl1251"
-	install -Dm755 "$srcdir"/wl1251-cal.initd "$pkgdir"/etc/init.d/wl1251-cal
 }

 openrc() {
 	default_openrc
 	install="$subpkgname.post-install"
+	install -Dm755 "$srcdir"/wl1251-cal.initd "$subpkgdir"/etc/init.d/wl1251-cal
 }

 sha512sums="
@@ -2,13 +2,13 @@

 pkgname=bluetooth-raspberry-pi
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="Service and udev rule for built-in bluetooth on Raspberry Pi zero w, 3B, 3B plus"
 url="https://github.com/RPi-Distro/bluez-firmware"
 arch="armhf aarch64"
 license="MIT"
 depends="bluez bluez-deprecated"
-install="$pkgname.post-install"
+subpackages="$pkgname-openrc"
 source="pi-bluetooth.openrc 50-bluetooth-hci-auto-poweron.rules"
 options="!check !archcheck"

@@ -18,5 +18,12 @@ package() {
 	install -Dm755 pi-bluetooth.openrc "$pkgdir"/etc/init.d/pi-bluetooth
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+
+	default_openrc
+}
+
 sha512sums="34a50554466dd6096cbee9b14fc0d77b268b731cd45981e69394343dad25d6006dbe44bee30700d71b80c593d38699dfc870983ae7d862b9c09afb39c5d3b383  pi-bluetooth.openrc
 511281ae8cbebd4390836ba83049a7fb793121d60ebd6c436bf36330e0aab738a827daf7fd6721cc71681e72b7ddaa581814264cc3bf759f07148fe5b657b981  50-bluetooth-hci-auto-poweron.rules"
@@ -3,7 +3,7 @@
 pkgname=device-ayn-odin
 pkgdesc="AYN Odin"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -31,10 +31,11 @@ source="
 subpackages="
 	$pkgname-kernel-odin:kernel_odin
 	$pkgname-kernel-odin-m2:kernel_odin_m2
+	$pkgname-openrc
 	$pkgname-phosh:_phosh
 	$pkgname-phosh-m2:_phosh_m2
 "
-install="$pkgname.post-install"
+
 replaces="hexagonrpcd-openrc"

 build() {
@@ -59,6 +60,13 @@ kernel_odin_m2() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+
+	mkdir -p "$subpkgdir"
+}
+
 _phosh() {
 	install_if="$pkgname-kernel-odin=$pkgver-r$pkgrel postmarketos-ui-phosh"
 	install -Dm644 "$srcdir"/phoc.ini.odin \
@@ -3,7 +3,7 @@
 pkgname=device-clockworkpi-uconsole-cm4
 pkgdesc="Clockwork Tech ClockworkPi uConsole CM4"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -14,8 +14,10 @@ depends="
 	raspberrypi-bootloader
 "
 makedepends="devicepkg-dev"
-install="$pkgname.post-install $pkgname.post-upgrade"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-openrc
+"
 source="
 	deviceinfo
 	modules-initfs
@@ -40,6 +42,13 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 8239d117839d3e3603c7ab73e598059bb521b81aeec5d6f7d0ec68d00cb9912bbad9fe5a0741e41e7ec94250729042dce91a6efb412c4e30c43a9c0b0a81a5b5  deviceinfo
 bc630857d9b0b6a89b3d9ff794be1133f5d7a681f26cd826ea4315649f8bf6c0c24aafa220093cbb313aa8bd6d46d2621c7aacb62e445a2d60c87e50099b45a5  modules-initfs
@@ -0,0 +1 @@
+./device-clockworkpi-uconsole-cm4-openrc.post-install
@@ -3,15 +3,17 @@
 pkgname=device-cutiepi-tablet
 pkgdesc="CutiePi Tablet"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base raspberrypi-bootloader linux-rpi4"
 makedepends="devicepkg-dev dtc"
-install="$pkgname.post-install $pkgname.post-upgrade"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-openrc
+	"
 source="
 	deviceinfo
 	modules-initfs
@@ -47,6 +49,12 @@ nonfree_firmware() {
 	mkdir -p "$subpkgdir"
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}

 sha512sums="
 2ee0abff944ef734b18f919f6285e468b5a8171399ed55cad1c5f5b436a59f89b4e25e1e6a5f8cef3f9ca44832e23f66f8273756808078e791f28ab02abaa95e  deviceinfo
@@ -0,0 +1 @@
+./device-cutiepi-tablet-openrc.post-install
@@ -1 +0,0 @@
-device-cutiepi-tablet.post-install
@@ -3,7 +3,7 @@
 pkgname=device-fairphone-fp5
 pkgdesc="Fairphone 5"
 pkgver=4
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -30,7 +30,7 @@ depends="
 "
 makedepends="devicepkg-dev"
 replaces="hexagonrpcd-openrc"
-install="$pkgname.post-install $pkgname.post-upgrade"
+subpackages="$pkgname-openrc"
 source="
 	81-libssc-fairphone-fp5.rules
 	deviceinfo
@@ -60,6 +60,13 @@ package() {
 		"$pkgdir"/usr/share/alsa/ucm2/conf.d/qcm6490/Fairphone\ 5.conf
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 2c16ba75e0077b2b1eaefa4c73b287475505a1aeb291ec29316d41cc094277320f9d2aaabfd91eb1dc0f488ab2d61a94faef16e7afe0f1e226779113761b9a37  81-libssc-fairphone-fp5.rules
 3062dc927b0521512782b34b0a12739aa455794bc49c25d423cf584b6f264f2cef8629bcc70b194d0e58712a21f64aa2c3b61336a904fe9173991f42b9c94f89  deviceinfo
@@ -0,0 +1 @@
+./device-fairphone-fp5-openrc.post-install
@@ -1 +0,0 @@
-device-fairphone-fp5.post-install
@@ -2,7 +2,7 @@
 pkgname=device-jolla-sbj
 pkgdesc="Jolla phone"
 pkgver=1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -17,8 +17,10 @@ depends="
 	alsa-ucm-conf
 "
 makedepends="devicepkg-dev"
-install="$pkgname.post-install $pkgname.post-upgrade"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-openrc
+	"
 source="deviceinfo
 	load-wlan-module
 	wcnss-wlan
@@ -64,8 +66,14 @@ package() {
 nonfree_firmware() {
 	pkgdesc="Firmware for Modem and WiFi"
 	depends="firmware-jolla-sbj-modem firmware-jolla-sbj-wlan msm-modem-downstream"
-	mkdir "$subpkgdir"

+	mkdir -p "$subpkgdir"
+}
+
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	
 	install -Dm755 "$srcdir"/load-wlan-module \
 		"$pkgdir"/etc/init.d/load-wlan-module
 	install -Dm644 "$srcdir"/wcnss-wlan \
@@ -0,0 +1 @@
+./device-jolla-sbj-openrc.post-install
@@ -1 +0,0 @@
-device-jolla-sbj.post-install
@@ -3,7 +3,7 @@
 pkgname=device-lenovo-q706f
 pkgdesc="Lenovo Xiaoxin Pad Pro 12.6 (Lenovo Tab P12 Pro)"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -21,7 +21,6 @@ depends="
 "
 makedepends="devicepkg-dev"
 replaces="hexagonrpcd-openrc"
-install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	81-libssc-lenovo-q706f.rules
 	alsa-ucm-conf/q706f.conf
@@ -33,6 +32,8 @@ source="

 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
+	$pkgname-openrc
 "

 build() {
@@ -55,8 +56,6 @@ package() {

 	install -Dm644 "$srcdir"/81-libssc-lenovo-q706f.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-lenovo-q706f.rules
-	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$pkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }

 nonfree_firmware() {
@@ -74,10 +73,24 @@ nonfree_firmware() {
 		pd-mapper
 		tqftpserv
 		"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 }

+nonfree_firmware_openrc() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir "$subpkgdir"
+}
+
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
+}
+
 sha512sums="
 1e0f02d47ea87d467c6e9d824d3b021c97ff29af8fcdf67ac1b75baa2b835f1dcdfc0c9f308a0bdeb3cdf07a8c1e26d66bff8d1337c9cfab1df94c26e9ccfb81  81-libssc-lenovo-q706f.rules
 7c97ffb7ae3e1fa2e62bdb3c504275db2c830cc1e5b57dd409ae14d020a1ff5f5cb922223c5dd776569cff52415afd26cba83b6acd76aef22a79ffdaf18dcfbd  q706f.conf
@@ -0,0 +1 @@
+./device-lenovo-q706f-nonfree-firmware-openrc.post-install
@@ -1 +0,0 @@
-device-lenovo-q706f-nonfree-firmware.post-install
@@ -0,0 +1 @@
+./device-lenovo-q706f-openrc.post-install
@@ -1 +0,0 @@
-device-lenovo-q706f.post-install
@@ -19,9 +19,9 @@ depends="
 	soc-qcom-msm8953
 	soc-qcom-msm8953-modem
 	tqftpserv
-	tqftpserv-openrc
 "
 makedepends="devicepkg-dev"
+subpackages="$pkgname-openrc"
 source="deviceinfo modules-initfs"

 build() {
@@ -32,6 +32,12 @@ package() {
 	devicepkg_package $startdir $pkgname
 }

+openrc() {
+	depends="tqftpserv-openrc"
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 a705956c51f524c026cba34fba7613c951cae4054462acd1ca23ade1e5e514fe042dfd850c773f2699e5a1a08c86c3efacf36f55bab4ee6db4fc92aa30817bc8  deviceinfo
 93c77bfcde005c021ac9b671f9671923339f855e45d4fce8b2caea4748eccc08c8ec65bdfc85fef4900c974860613e8d62e6fe0ea95741ec1ab08c814148472b  modules-initfs
@@ -15,6 +15,7 @@ depends="
 	"
 subpackages="
 	$pkgname-modem
+	$pkgname-modem-openrc:modem_openrc
 	$pkgname-nonfree-firmware:nonfree_firmware
 	"
 makedepends="devicepkg-dev mipi-dbi-cmd"
@@ -59,11 +60,17 @@ nonfree_firmware() {
 }

 modem() {
-	depends="qrtr rmtfs rmtfs-openrc msm-modem-uim-selection"
+	depends="qrtr rmtfs msm-modem-uim-selection"
 	install_if="$pkgname=$pkgver-r$pkgrel $pkgname-nonfree-firmware"
 	mkdir "$subpkgdir"
 }

+modem_openrc() {
+	depends="rmtfs-openrc"
+	install_if="$pkgname-modem=$pkgver-r$pkgrel openrc"
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 ef1456f2fb7da41af4f98f0004f6f69ae0a051b641d3a9a3d6057708d1aca682437c04c58954d3982be471c8973cff7a12ebe359d2f003071110ce5f5dc4b601  nokia,weeknd-st7789vx2-yihua-panel.txt
 bdcff520b74e6247d9737554fcf9b4811d608495feba336345655e8fc41acf502b53bb14d380401c6e4ad1b143417e85d59ad2510f79b7888b4b2f8bd677a1fb  nokia,weeknd-gc9104-v2-panel.txt
@@ -2,13 +2,14 @@
 pkgname=device-oneplus-oneplus3t
 pkgdesc="OnePlus 3T"
 pkgver=2
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
 	$pkgname-kernel-s6e3fa3:kernel_s6e3fa3
 	$pkgname-kernel-s6e3fa5:kernel_s6e3fa5
 	$pkgname-phosh
@@ -25,7 +26,6 @@ source="
 	modules-initfs.s6e3fa5
 	modules-initfs.s6e3fa3
 	phoc.ini
-	device-oneplus-oneplus3t-nonfree-firmware.post-install
 	10-local-powersave.rules
 	gpu-nobin.sh
 	"
@@ -51,7 +51,14 @@ nonfree_firmware() {
 		linux-firmware-qca
 		soc-qcom-msm8996-nonfree-firmware
 		"
+
+	mkdir "$subpkgdir"
+}
+
+nonfree_firmware_openrc() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install"
+
 	mkdir "$subpkgdir"
 }

@@ -78,7 +85,6 @@ sha512sums="
 6262c1adcd6097cfd7c3c13267cb272e9157b9cd6fa5ec9f0c4821e25e9aa1e444d15df6ab4b567cc20cf0dd430854f88bbbf138c858a4b37b3e0d7ff84f50c9  modules-initfs.s6e3fa5
 cc0bbb074d5ca73910673b571546715d6cdf0195526ee7b873f1795c0181ca62b650ab9899d70b3e0589a6373a5c873c2056dd67f68980f348b45fad6b399dfa  modules-initfs.s6e3fa3
 38409d4ce48db4624539dbfd695d3c6e1596a29fd7c3004a41368b28cba646495d05360420ad728f82c63d6ddeeca71d09944df06ebaca120aedd9cc2b436eb3  phoc.ini
-7c9d5e9f2032e088f720918ead9ed27ae6f81b4163a835310f41880c8ce16e63ee412c21cf80f9ee5b4dc0f9034b14980a47c5a717110e67dc4fb73133ff77c1  device-oneplus-oneplus3t-nonfree-firmware.post-install
 c87ec170b7fcdbe37c27d389fe2aa8f9c25b76beeb02ea7f5958fe3daaeb6e55cfc4fc970c80571da9aea0316677dc12cbb23f4d3b14ff5215def03a7637f8e9  10-local-powersave.rules
 4d9908ea8d0a497133df155a9b263fcf793eaec4b23fd11604503c2d9126d2ed2e51e746e24f8daa4d35ae182bfb0690cff62a3c398684c0ed79afcd658fe009  gpu-nobin.sh
 "
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-pine64-dontbeevil
 pkgver=1
-pkgrel=2
+pkgrel=3
 pkgdesc="PINE64 PinePhone Don't be evil devkit"
 url="https://postmarketos.org"
 license="MIT"
@@ -11,12 +11,12 @@ subpackages="
 	$pkgname-kernel-longts:kernel_longts
 	$pkgname-kernel-shortts:kernel_shortts
 	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-openrc
 	$pkgname-sensorfw
 	$pkgname-x11
 "
 depends="postmarketos-base u-boot-sunxi u-boot-tools ofono"
 makedepends="devicepkg-dev"
-install="$pkgname.post-install"
 source="
 	deviceinfo
 	modules-initfs
@@ -64,6 +64,13 @@ kernel_longts() {
 	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+
+	mkdir -p "$subpkgdir"
+}
+
 sensorfw() {
 	install_if="$pkgname=$pkgver-r$pkgrel sensorfw"

@@ -2,7 +2,7 @@
 pkgname=device-raspberry-pi
 pkgdesc="Raspberry Pi"
 pkgver=1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
@@ -11,7 +11,9 @@ depends="postmarketos-base raspberrypi-bootloader"
 makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-kernel-rpi:kernel_rpi
+	$pkgname-kernel-rpi-openrc:kernel_rpi_openrc
 	$pkgname-kernel-rpi2:kernel_rpi2
+	$pkgname-kernel-rpi2-openrc:kernel_rpi2_openrc
 	$pkgname-sway
 	$pkgname-phosh
 "
@@ -38,17 +40,27 @@ package() {
 kernel_rpi() {
 	pkgdesc="Kernel for the Raspberry Pi 1 (from Alpine, depends on non free firmware!)"
 	depends="$pkgname linux-rpi"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 }

+kernel_rpi_openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel $pkgname-kernel-rpi openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	mkdir -p "$subpkgdir"
+}
+
 kernel_rpi2() {
 	pkgdesc="Kernel for the Raspberry Pi 2 (from Alpine, depends on non free firmware!)"
 	depends="$pkgname linux-rpi2"
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	mkdir "$subpkgdir"
 }

+kernel_rpi2_openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel $pkgname-kernel-rpi2 openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	mkdir -p "$subpkgdir"
+}
+
 sway() {
 	install_if="$pkgname postmarketos-ui-sway"
 	depends="$pkgname"
@@ -0,0 +1 @@
+device-raspberry-pi-kernel-rpi-openrc.post-install
@@ -1 +0,0 @@
-device-raspberry-pi-kernel-rpi.post-install
@@ -0,0 +1 @@
+device-raspberry-pi-kernel-rpi2-openrc.post-install
@@ -1 +0,0 @@
-device-raspberry-pi-kernel-rpi2.post-install
@@ -2,14 +2,14 @@
 pkgname=device-raspberry-pi0
 pkgdesc="Raspberry Pi Zero"
 pkgver=1
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="armhf"
 options="!check !archcheck"
 depends="postmarketos-base raspberrypi-bootloader linux-rpi bluetooth-raspberry-pi"
 makedepends="devicepkg-dev"
-install="$pkgname.post-install $pkgname.post-upgrade"
+subpackages="$pkgname-openrc"
 source="deviceinfo modules-initfs config.txt usercfg.txt cmdline.txt 95-vchiq-permissions.rules"

 build() {
@@ -25,6 +25,13 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/95-vchiq-permissions.rules
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 98927951d5c1302798e5af1f79170eb4236d40978fa84f63748b8aba51eef86f5cb8597d63ca37b8bf12bbc3382d09ed8ec842261d3135734f497c22898d2ea9  deviceinfo
 09540960017460809c091457ba9f96b0d12c8a12ef300b77017651bf1492e66440244502ccf22fb8c58d0362751366ef1acf1c5a60b0698c1dda530f0945c17f  modules-initfs
@@ -0,0 +1 @@
+./device-raspberry-pi0-openrc.post-install
@@ -1 +0,0 @@
-device-raspberry-pi0.post-install
@@ -3,14 +3,14 @@
 pkgname=device-raspberry-pi3
 pkgdesc="Raspberry Pi 3B/3B+"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base raspberrypi-bootloader linux-rpi bluetooth-raspberry-pi"
 makedepends="devicepkg-dev"
-install="$pkgname.post-install $pkgname.post-upgrade"
+subpackages="$pkgname-openrc"
 source="deviceinfo modules-initfs usercfg.txt cmdline.txt 95-vchiq-permissions.rules networkmanager.conf"

 build() {
@@ -27,6 +27,13 @@ package() {
 		"$pkgdir"/etc/NetworkManager/conf.d/10-rpi3.conf
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 069270d1813875e5d71c1823850cc6bee14002be399529353112d1a46a051bf66ec28737333f34f98b3a8d653cef5473e8ce85a83bf5206e5172998068557cf7  deviceinfo
 e3515cf9f41807917eac1f7663e0131bd18783824facf15f2bb0381635bf6d9a0c334f3786b6fb76d01469de6449878c871f8b747f45e9e3cee77699905cf319  modules-initfs
@@ -0,0 +1 @@
+device-raspberry-pi3-openrc.post-install
@@ -1 +0,0 @@
-device-raspberry-pi3.post-install
@@ -2,7 +2,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-raspberry-pi4
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="Raspberry Pi 4"
 url="https://postmarketos.org"
 license="MIT"
@@ -10,9 +10,9 @@ arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base raspberrypi-bootloader linux-rpi"
 makedepends="devicepkg-dev"
-install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-openrc
 	$pkgname-plasma-bigscreen:plasma_bigscreen
 	"
 source="
@@ -43,6 +43,13 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
+}
+
 plasma_bigscreen() {
 	pkgdesc="$pkgdesc (Plasma Bigscreen)"
 	install_if="$pkgname plasma-bigscreen"
@@ -0,0 +1 @@
+./device-raspberry-pi4-openrc.post-install
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rc-update add swclock boot
@@ -1 +0,0 @@
-device-raspberry-pi4.post-install
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-a6lte
 pkgdesc="Samsung Galaxy A6 2018"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -20,8 +20,6 @@ replaces="
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
 source="
-	$pkgname.post-install
-	$pkgname-downstream-quirks.post-install
 	deviceinfo
 	etc-conf.d-samsungipcd
 	etc-init.d-hciattach-ttySAC0
@@ -37,10 +35,12 @@ source="
 	usr-share-wireplumber-wireplumber.conf.d-headroom.conf
 "
 subpackages="
+	$pkgname-openrc
 	$pkgname-kernel-downstream:kernel_downstream
 	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-downstream-quirks:downstream_quirks
+	$pkgname-downstream-quirks:downstream_quirks_openrc
+	$pkgname-downstream-quirks-openrc:downstream_quirks_openrc
 "

 # pulseaudio does not seem to work on this device. Will use pipewire-pulse instead.
@@ -53,7 +53,6 @@ build() {
 package() {
 	devicepkg_package $startdir $pkgname
 	install -Dm644 etc-conf.d-samsungipcd "$pkgdir"/etc/conf.d/samsungipcd
-	install -Dm755 etc-init.d-wlan0-up "$pkgdir"/etc/init.d/wlan0-up
 	install -Dm644 etc-lightdm-lightdm.conf "$pkgdir"/etc/lightdm/lightdm.conf
 	install -Dm755 usr-libexec-samsungipcd-voicecall.sh "$pkgdir"/usr/libexec/samsungipcd/voicecall.sh
 	install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-HiFi.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/HiFi.conf
@@ -62,6 +61,11 @@ package() {
 	install -Dm644 usr-share-wireplumber-wireplumber.conf.d-headroom.conf "$pkgdir"/usr/share/wireplumber/wireplumber.conf.d/headroom.conf
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install -Dm755 etc-init.d-wlan0-up "$subpkgdir"/etc/init.d/wlan0-up
+}
+
 kernel_downstream() {
 	pkgdesc="Working: display, touchscreen, wifi, bluetooth, audio, cellular"
 	depends="linux-samsung-a6lte msm-fb-refresher pipewire-pulse"
@@ -86,10 +90,7 @@ downstream_quirks() {
 	pkgdesc="Hacks to make the downstream kernel work"
 	depends="bluez-deprecated"
 	install_if="$pkgname-kernel-downstream"
-	replaces="bootmac udev-init-scripts-openrc"
-	install="$subpkgname.post-install"
-	install -Dm755 etc-init.d-udev-settle "$subpkgdir"/etc/init.d/udev-settle
-	install -Dm755 etc-init.d-hciattach-ttySAC0 "$subpkgdir"/etc/init.d/hciattach-ttySAC0
+	replaces="bootmac"
 	install -Dm644 etc-NetworkManager-conf.d-swlan0-unmanaged.conf "$pkgdir"/etc/NetworkManager/conf.d/swlan0-unmanaged.conf
 	install -Dm644 etc-NetworkManager-conf.d-wlan0-preserve-mac.conf "$pkgdir"/etc/NetworkManager/conf.d/wlan0-preserve-mac.conf
 	# we run bootmac ourselves and don't want it to trigger from the udev rule
@@ -97,9 +98,15 @@ downstream_quirks() {
 	install -Dm755 /dev/null "$subpkgdir"/usr/lib/udev/rules.d/90-bootmac.rules
 }

+downstream_quirks_openrc() {
+	install_if="$pkgname-downstream-quirks=$pkgver-r$pkgrel openrc"
+	replaces="udev-init-scripts-openrc"
+	install="$subpkgname.post-install"
+	install -Dm755 etc-init.d-udev-settle "$subpkgdir"/etc/init.d/udev-settle
+	install -Dm755 etc-init.d-hciattach-ttySAC0 "$subpkgdir"/etc/init.d/hciattach-ttySAC0
+}
+
 sha512sums="
-e787dd30a667fd886a46bb0b670bd2771a8fc78fddc39bb86405fdda6024bc1211b82f89664b7cfc622adf2968b9cd09b0eb3d2ed607148bf3549dd783e6f752  device-samsung-a6lte.post-install
-9c0f939c97582d9c03fb62386527569b7f08dd6c8350c8ac6cf9f70d6d5da61d5fc95997b413c4fdb671379ab35caedb631b9af33c7a1e8f3388b3fb56d9b435  device-samsung-a6lte-downstream-quirks.post-install
 95b46ef54f2b92edefcdc3742a1d36b7c52066daeeb5002f25b4de144d52e3cda8e3981c8b44d608dcfaf6ec5a89066d1e53e9c1eccbaf03c262b6c162efe532  deviceinfo
 3e5bb764529010d2b6b1f2759a7799f665d140aebcee2dd63433e68cd4282e09b5d3b34fb7c21e737595b406501e7f02ece4592651c60e4c2b9419de4aedb438  etc-conf.d-samsungipcd
 f9716fc70bf3508d2f9e83d908f1c13103403f01ebb784acec6cdf3e959e92b63c75e49b0120abe1ada5a50d768dcf30b8472630da1172fc826485e97024d85e  etc-init.d-hciattach-ttySAC0
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-i9100
 pkgver=7
-pkgrel=1
+pkgrel=2
 pkgdesc="Samsung Galaxy SII"
 url="https://postmarketos.org"
 arch="armv7"
@@ -16,6 +16,7 @@ subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-nonfree-firmware-front-camera:nonfree_firmware_front_camera
 	$pkgname-media-pipeline:media_pipeline
+	$pkgname-media-pipeline-openrc:media_pipeline_openrc
 "
 source="
 	deviceinfo
@@ -61,6 +62,11 @@ nonfree_firmware_front_camera() {
 media_pipeline() {
 	install_if="$pkgname-kernel-mainline"
 	depends="v4l-utils"
+	mkdir "$subpkgdir"
+}
+
+media_pipeline_openrc() {
+	install_if="$pkgname-media-pipeline=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install"
 	install -Dm755 "$srcdir"/media-pipeline.initd "$subpkgdir"/etc/init.d/media-pipeline
 }
@@ -3,7 +3,7 @@
 pkgname=device-samsung-j7y17lte
 pkgdesc="Samsung Galaxy J7 2017"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -24,6 +24,7 @@ replaces="
 "
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
+subpackages="$pkgname-openrc"
 source="
 	deviceinfo
 	etc-conf.d-samsungipcd
@@ -55,6 +56,13 @@ package() {
 	install -Dm644 usr-share-alsa-ucm2-conf.d-Universal7870-I-VoiceCall.conf "$pkgdir"/usr/share/alsa/ucm2/conf.d/Universal7870-I/VoiceCall.conf
 }

+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 ec63da7e446e81427dd60b1ad23f0a1615760697aa68de00e40af410c92c1bb0086813dfa85994af30fd592bffba5ec16ffdff61e674312558e19e0d54ae61c6  deviceinfo
 3e5bb764529010d2b6b1f2759a7799f665d140aebcee2dd63433e68cd4282e09b5d3b34fb7c21e737595b406501e7f02ece4592651c60e4c2b9419de4aedb438  etc-conf.d-samsungipcd
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rc-update add wlan0-up sysinit
Author	SHA1	Message	Date
Aster Boese	0294962f8d	main/nokia-weeknd: add openrc subpackage	2024-10-04 21:47:30 -04:00
Aster Boese	273a323259	main/wl1251-cal: add openrc subpackage	2024-10-04 21:47:30 -04:00
Aster Boese	c596866e56	soc-qcom-sm8350: move openrc scripts to subpackage [ci:ignore-count]	2024-10-04 21:47:30 -04:00
Aster Boese	35b7342edb	soc-qcom-sm7150: move openrc scripts to subpackage	2024-10-04 21:47:30 -04:00
Aster Boese	c4f0129c6c	soc-qcom-sm7125: move openrc scripts to subpackage	2024-10-04 21:47:30 -04:00
Aster Boese	a9582a09fd	soc-qcom-sdm660: move openrc scripts to subpackage	2024-10-04 21:47:30 -04:00
Aster Boese	99d909913a	soc-qcom-sc8180x: move openrc scripts to subpackage	2024-10-04 21:47:29 -04:00
Aster Boese	63a8ded2e4	soc-qcom-sc7280: move openrc scripts to subpackages	2024-10-04 21:47:29 -04:00
Aster Boese	16905b60f7	soc-qcom-msm8998: move openrc scripts to subpackage	2024-10-04 21:47:29 -04:00
Aster Boese	d83e8c9945	soc-qcom-msm8909: move openrc scripts to subpackage	2024-10-04 21:47:29 -04:00
Aster Boese	9207b3ff77	kobo-epdc-extractor: move openrc scripts to subpackage	2024-10-04 21:47:28 -04:00
Aster Boese	d38fa39d23	firmware-xiaomi-sagit: move openrc scripts to subpackage	2024-10-04 21:46:57 -04:00
Aster Boese	ab64f12ad5	firmware-sony-ninges: move openrc scripts to subpackage	2024-10-04 21:46:57 -04:00
Aster Boese	e72985f467	firmware-samsung-pxa1908: move openrc scripts to subpackage	2024-10-04 21:46:57 -04:00
Aster Boese	6839a4b84f	firmware-samsung-kminilte: move openrc scripts to subpackage	2024-10-04 21:46:57 -04:00
Aster Boese	1daa8e566e	firmware-samsung-degaswifi: move openrc scripts to subpackage	2024-10-04 21:46:57 -04:00
Aster Boese	fed560d4a0	firmware-oneplus-msm8998: move openrc scripts to subpackage	2024-10-04 21:46:57 -04:00
Aster Boese	4f70f7edf5	firmware-motorola-potter: move openrc scripts to subpackage	2024-10-04 21:46:56 -04:00
Aster Boese	fa665cc986	firmware-huawei-alice: move openrc scripts to subpackage	2024-10-04 21:46:56 -04:00
Aster Boese	982523af55	firmware-fxtec-qx1050: move openrc scripts to subpackage	2024-10-04 21:46:56 -04:00
Aster Boese	95e0e28391	xiaomi-vayu: move openrc scripts to subpackage	2024-10-04 21:46:56 -04:00
Aster Boese	7e6926da4b	fairphone-fp5: move openrc scripts to subpackage	2024-10-04 21:46:56 -04:00
Aster Boese	024faf682d	xiaomi-raphael: move openrc scripts to subpackage	2024-10-04 21:46:56 -04:00
Aster Boese	cacac2d970	xiaomi-natrium: move openrc scripts to subpackage	2024-10-04 21:46:56 -04:00
Aster Boese	0219c10ec2	xiaomi-elish: move openrc scripts to subpackage	2024-10-04 21:46:56 -04:00
Aster Boese	3088580f32	xiaomi-armani: move openrc scripts to subpackage	2024-10-04 21:46:56 -04:00
Aster Boese	aae4561ae5	sony-leo: move openrc scripts to subpackage	2024-10-04 21:46:52 -04:00
Aster Boese	49ace88e72	samsung-zeroltexx: move openrc scripts to subpackage	2024-10-04 21:45:54 -04:00
Aster Boese	5a869f8aa1	samsung-zerofltexx: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	142d58b0f5	samsung-j7y17lte: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	5ba2453f3c	samsung-i9100: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	226cbf16ec	samsung-a6lte: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	c9a01f7093	raspberry-pi4: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	dc19c0ca15	raspberry-pi3: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	f2c356f3a7	raspberry-pi0: move openrc scripts to subpackages	2024-10-04 21:45:53 -04:00
Aster Boese	e8da0eecba	raspberry-pi: move openrc scripts to subpackages	2024-10-04 21:45:53 -04:00
Aster Boese	99923925b2	pine64-dontbeevil: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	86991d8ba7	oneplus-oneplus3t: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	8df8f04c63	lenovo-q706f: move openrc scripts to subpackages	2024-10-04 21:45:53 -04:00
Aster Boese	fe99fb2131	jolla-sbj: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	b1189735bf	cutiepi-tablet: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	63281da2dd	clockworkpi-uconsole-cm4: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	14a8ecdf30	ayn-odin: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	5eb6b49f71	bluetooth-raspberry-pi: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	963224f9e8	soc-qcom-sc7180: move openrc scripts to subpackages	2024-10-04 21:45:53 -04:00
Aster Boese	f3c5a7b0f6	soc-qcom-msm8953: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	ff1076a2bd	soc-qcom-msm8916: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	71e445787f	xiaomi-scorpio: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	d726f21428	xiaomi-beryllium: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	c2c2461fcd	pine64-pinephonepro: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	6b2fb29c75	main/watchdog-kick: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	57e37f2d7f	main/postmarketos-cros-common: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	5400504389	main/postmarketos-boot-hwtest: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	35ba3f06ae	main/postmarketos-base-ui: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	7840b64345	main/postmarketos-base-ui-cage: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	5343720709	pine64-pinebookpro: move non-essential scripts to subpackages	2024-10-04 21:45:53 -04:00
Aster Boese	840c5c74c2	oneplus-enchilada: clean up openrc subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	0b2416185d	oneplus-fajita: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	7796f0a644	nokia-n900: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	664b976177	google-sargo: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	1706062619	fairphone-fp4: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	aba124e6a5	main/postmarketos-base: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	c040cd62dd	main/hisi-wlan: move openrc scripts to subpackage	2024-10-04 21:45:53 -04:00
Aster Boese	c37f662ea3	modem/msm-cros-efs-loader: move openrc scripts to subpackage	2024-10-04 21:45:52 -04:00
				`@@ -0,0 +1 @@`
				`./device-oneplus-fajita-nonfree-firmware-openrc.post-install`
				`@@ -1 +0,0 @@`
				`device-oneplus-fajita-nonfree-firmware.post-install`
				`@@ -0,0 +1 @@`
				`device-pine64-pinebookpro-openrc.post-install`
				`@@ -0,0 +1 @@`
				`./device-pine64-pinephonepro-openrc.post-install`
				`@@ -0,0 +1 @@`
				`device-xiaomi-beryllium-nonfree-firmware-openrc.post-install`
				`@@ -0,0 +1 @@`
				`./soc-qcom-msm8953-modem-openrc.post-install`
				`@@ -0,0 +1 @@`
				`./soc-qcom-sc7180-nonfree-firmware-openrc.post-install`
				`@@ -0,0 +1 @@`
				`./soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-install`
				`@@ -1 +0,0 @@`
				`soc-qcom-sc7180-nonfree-firmware-woa.post-install`