From c3dfa1cdb4c7ca3593d8b49214d1c7c5719d2ce0 Mon Sep 17 00:00:00 2001 From: jane400 Date: Wed, 5 Jun 2024 21:28:32 +0200 Subject: [PATCH] main/postmarketos-base-ui: split out openrc specifics into subpackages (MR 5364) Also renames subpackage bluez to bluez-openrc --- main/postmarketos-base-ui/APKBUILD | 37 +++++++++++++++---- ...etos-base-ui-wifi-iwd-openrc.post-install} | 0 ...ketos-base-ui-wifi-iwd-openrc.post-upgrade | 1 + ...postmarketos-base-ui-wifi-iwd.post-upgrade | 1 - ...i-wifi-wpa_supplicant-openrc.post-install} | 0 ...ui-wifi-wpa_supplicant-openrc.post-upgrade | 1 + ...s-base-ui-wifi-wpa_supplicant.post-upgrade | 1 - 7 files changed, 31 insertions(+), 10 deletions(-) rename main/postmarketos-base-ui/{postmarketos-base-ui-wifi-iwd.post-install => postmarketos-base-ui-wifi-iwd-openrc.post-install} (100%) create mode 120000 main/postmarketos-base-ui/postmarketos-base-ui-wifi-iwd-openrc.post-upgrade delete mode 120000 main/postmarketos-base-ui/postmarketos-base-ui-wifi-iwd.post-upgrade rename main/postmarketos-base-ui/{postmarketos-base-ui-wifi-wpa_supplicant.post-install => postmarketos-base-ui-wifi-wpa_supplicant-openrc.post-install} (100%) create mode 120000 main/postmarketos-base-ui/postmarketos-base-ui-wifi-wpa_supplicant-openrc.post-upgrade delete mode 120000 main/postmarketos-base-ui/postmarketos-base-ui-wifi-wpa_supplicant.post-upgrade diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD index 413fdf23c..7aeafc576 100644 --- a/main/postmarketos-base-ui/APKBUILD +++ b/main/postmarketos-base-ui/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Clayton Craft pkgname=postmarketos-base-ui pkgver=25 -pkgrel=1 +pkgrel=2 pkgdesc="Meta package for minimal postmarketOS UI base" url="https://postmarketos.org" arch="noarch" @@ -25,7 +25,7 @@ subpackages=" $pkgname-audio-none:_audio_none $pkgname-audio-pipewire:_audio_pipewire $pkgname-audio-pulseaudio:_audio_pulseaudio - $pkgname-bluez + $pkgname-bluez-openrc:_bluez_openrc $pkgname-bluez-obexd:_obexd $pkgname-elogind $pkgname-flatpak @@ -37,6 +37,8 @@ subpackages=" $pkgname-tinydm $pkgname-wayland $pkgname-wifi-iwd:iwd + $pkgname-wifi-iwd-openrc:iwd_openrc + $pkgname-wifi-wpa_supplicant-openrc:wpa_supplicant_openrc $pkgname-wifi-wpa_supplicant:wpa_supplicant $pkgname-x11 postmarketos-default-camera:_default_camera @@ -125,7 +127,7 @@ x11() { amove etc/X11/Xwrapper.config } -bluez() { +_bluez_openrc() { install_if="$pkgname=$pkgver-r$pkgrel bluez-openrc" amove etc/conf.d/bluetooth @@ -210,27 +212,46 @@ qt_wayland() { wpa_supplicant() { pkgdesc="Use wpa_supplicant as the WiFi backend." - depends="wpa_supplicant" - install="$subpkgname.post-install $subpkgname.post-upgrade" - replaces="wpa_supplicant-openrc" provides="postmarketos-base-ui-wifi=$pkgver-r$pkgrel" provider_priority=100 + depends="wpa_supplicant" + + mkdir -p "$subpkgdir" +} + +wpa_supplicant_openrc() { + install_if="$pkgname-wpa_supplicant=$pkgver-r$pkgrel openrc" + install="$subpkgname.post-install $subpkgname.post-upgrade" + + depends="wpa_supplicant-openrc openrc" + replaces="wpa_supplicant-openrc" + replaces_priority=100 + amove etc/conf.d/wpa_supplicant } iwd() { pkgdesc="Use iwd as the WiFi backend (but may not work with all devices)" - depends="iwd" - install="$subpkgname.post-install $subpkgname.post-upgrade" provides="postmarketos-base-ui-wifi=$pkgver-r$pkgrel" # Lower than wpa_supplicant for now, see: # https://gitlab.com/postmarketOS/pmaports/-/issues/1379 provider_priority=90 + depends="iwd" + amove usr/lib/NetworkManager/conf.d/50-iwd.conf } +iwd_openrc() { + install_if="$pkgname-iwd=$pkgver-r$pkgrel openrc" + install="$subpkgname.post-install $subpkgname.post-upgrade" + + depends="iwd-openrc openrc" + + mkdir -p "$subpkgdir" +} + _audio_none() { pkgdesc="Do not install any audio backend." provides="postmarketos-base-ui-audio=$pkgver-r$pkgrel" diff --git a/main/postmarketos-base-ui/postmarketos-base-ui-wifi-iwd.post-install b/main/postmarketos-base-ui/postmarketos-base-ui-wifi-iwd-openrc.post-install similarity index 100% rename from main/postmarketos-base-ui/postmarketos-base-ui-wifi-iwd.post-install rename to main/postmarketos-base-ui/postmarketos-base-ui-wifi-iwd-openrc.post-install diff --git a/main/postmarketos-base-ui/postmarketos-base-ui-wifi-iwd-openrc.post-upgrade b/main/postmarketos-base-ui/postmarketos-base-ui-wifi-iwd-openrc.post-upgrade new file mode 120000 index 000000000..38c496af6 --- /dev/null +++ b/main/postmarketos-base-ui/postmarketos-base-ui-wifi-iwd-openrc.post-upgrade @@ -0,0 +1 @@ +postmarketos-base-ui-wifi-iwd-openrc.post-install \ No newline at end of file diff --git a/main/postmarketos-base-ui/postmarketos-base-ui-wifi-iwd.post-upgrade b/main/postmarketos-base-ui/postmarketos-base-ui-wifi-iwd.post-upgrade deleted file mode 120000 index 66076d93d..000000000 --- a/main/postmarketos-base-ui/postmarketos-base-ui-wifi-iwd.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -postmarketos-base-ui-wifi-iwd.post-install \ No newline at end of file diff --git a/main/postmarketos-base-ui/postmarketos-base-ui-wifi-wpa_supplicant.post-install b/main/postmarketos-base-ui/postmarketos-base-ui-wifi-wpa_supplicant-openrc.post-install similarity index 100% rename from main/postmarketos-base-ui/postmarketos-base-ui-wifi-wpa_supplicant.post-install rename to main/postmarketos-base-ui/postmarketos-base-ui-wifi-wpa_supplicant-openrc.post-install diff --git a/main/postmarketos-base-ui/postmarketos-base-ui-wifi-wpa_supplicant-openrc.post-upgrade b/main/postmarketos-base-ui/postmarketos-base-ui-wifi-wpa_supplicant-openrc.post-upgrade new file mode 120000 index 000000000..d5ede21ba --- /dev/null +++ b/main/postmarketos-base-ui/postmarketos-base-ui-wifi-wpa_supplicant-openrc.post-upgrade @@ -0,0 +1 @@ +postmarketos-base-ui-wifi-wpa_supplicant-openrc.post-install \ No newline at end of file diff --git a/main/postmarketos-base-ui/postmarketos-base-ui-wifi-wpa_supplicant.post-upgrade b/main/postmarketos-base-ui/postmarketos-base-ui-wifi-wpa_supplicant.post-upgrade deleted file mode 120000 index 6beddffa4..000000000 --- a/main/postmarketos-base-ui/postmarketos-base-ui-wifi-wpa_supplicant.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -postmarketos-base-ui-wifi-wpa_supplicant.post-install \ No newline at end of file