From fd16f66e4f5b7587e81847f4618a3004eda1fdaa Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Mon, 27 May 2024 10:16:54 -0700
Subject: [PATCH] main/postmarketos-config-nftables: add openrc subpkg (MR
 5172)

For installing openrc-specific dependencies, specifically
nftables-openrc which is needed because the post-install enables the
openrc service and expects the initd script to be available then

[ci:skip-build] already built successfully in CI
---
 main/postmarketos-config-nftables/APKBUILD          | 13 ++++++++++---
 ...ostmarketos-config-nftables-openrc.post-install} |  0
 2 files changed, 10 insertions(+), 3 deletions(-)
 rename main/postmarketos-config-nftables/{postmarketos-config-nftables.post-install => postmarketos-config-nftables-openrc.post-install} (100%)

diff --git a/main/postmarketos-config-nftables/APKBUILD b/main/postmarketos-config-nftables/APKBUILD
index b85532791..87cb7b272 100644
--- a/main/postmarketos-config-nftables/APKBUILD
+++ b/main/postmarketos-config-nftables/APKBUILD
@@ -1,12 +1,11 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-config-nftables
 pkgver=0.16
-pkgrel=0
+pkgrel=1
 pkgdesc="nftables firewall configuration for postmarketOS"
 url="https://gitlab.com/postmarketos"
 arch="noarch"
 license="MIT"
-depends="nftables-openrc"
 subpackages="
 	$pkgname-openusb:openusb
 	$pkgname-log:log
@@ -19,6 +18,7 @@ subpackages="
 	$pkgname-vlc-chromecast:vlc_chromecast
 	$pkgname-vncserver:vncserver
 	$pkgname-wifi-display:wifi_display
+	$pkgname-openrc
 "
 source="
 	rules/00_log_all.nft
@@ -39,7 +39,6 @@ source="
 	networkmanager.conf
 "
 options="!check" # No tests
-install="$pkgname.post-install"
 
 package() {
 	cd rules
@@ -48,6 +47,14 @@ package() {
 	done
 }
 
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+	depends="nftables-openrc"
+
+	mkdir -p "$subpkgdir"
+}
+
 openusb() {
 	depends="$pkgname"
 	description="Adds a rule to accept all incoming connections to the usb* interface"
diff --git a/main/postmarketos-config-nftables/postmarketos-config-nftables.post-install b/main/postmarketos-config-nftables/postmarketos-config-nftables-openrc.post-install
similarity index 100%
rename from main/postmarketos-config-nftables/postmarketos-config-nftables.post-install
rename to main/postmarketos-config-nftables/postmarketos-config-nftables-openrc.post-install