main/postmarketos-base-ui: split usb-tethering into subpackage (MR 4788)

this allows to opt-out of usb-tethering on pmOS devices with
`apk add !postmarketos-base-ui-networkmanager-usb-tethering`
this is useful for developers with laptops on pmOS / dailydriving
those laptops on pmOS.

[ci:skip-build]: Already built successfully in CI.
This commit is contained in:
jane400 2024-02-05 16:41:34 +01:00 committed by Stefan Hansson
parent 0bc724b8ba
commit 98af7cea03
No known key found for this signature in database
GPG key ID: 8A700086A9FE41FD

View file

@ -1,7 +1,7 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net> # Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=postmarketos-base-ui pkgname=postmarketos-base-ui
pkgver=17 pkgver=18
pkgrel=1 pkgrel=0
pkgdesc="Meta package for minimal postmarketOS UI base" pkgdesc="Meta package for minimal postmarketOS UI base"
url="https://postmarketos.org" url="https://postmarketos.org"
arch="noarch" arch="noarch"
@ -24,6 +24,7 @@ subpackages="
$pkgname-bluez-obexd:_obexd $pkgname-bluez-obexd:_obexd
$pkgname-elogind $pkgname-elogind
$pkgname-flatpak $pkgname-flatpak
$pkgname-networkmanager-usb-tethering:_usb_tethering
$pkgname-networkmanager $pkgname-networkmanager
$pkgname-openrc-settingsd:_openrc_settingsd $pkgname-openrc-settingsd:_openrc_settingsd
$pkgname-pulseaudio $pkgname-pulseaudio
@ -160,6 +161,15 @@ _obexd() {
mkdir -p "$subpkgdir" mkdir -p "$subpkgdir"
} }
_usb_tethering() {
install_if="$pkgname-networkmanager=$pkgver-r$pkgrel"
replaces="$pkgname-networkmanager"
amove usr/lib/NetworkManager/conf.d/50-tethering.conf
amove usr/lib/NetworkManager/dispatcher.d/50-tethering.sh
amove usr/lib/NetworkManager/system-connections/USB_Networking.nmconnection
}
networkmanager() { networkmanager() {
depends=" depends="
busctl busctl
@ -174,11 +184,8 @@ networkmanager() {
networkmanager-dnsmasq" networkmanager-dnsmasq"
amove usr/lib/NetworkManager/conf.d/50-hostname-mode.conf amove usr/lib/NetworkManager/conf.d/50-hostname-mode.conf
amove usr/lib/NetworkManager/conf.d/50-random-mac.conf amove usr/lib/NetworkManager/conf.d/50-random-mac.conf
amove usr/lib/NetworkManager/conf.d/50-tethering.conf
amove usr/lib/NetworkManager/conf.d/50-use-dnsmasq.conf amove usr/lib/NetworkManager/conf.d/50-use-dnsmasq.conf
amove usr/lib/NetworkManager/dispatcher.d/50-dns-filter.sh amove usr/lib/NetworkManager/dispatcher.d/50-dns-filter.sh
amove usr/lib/NetworkManager/dispatcher.d/50-tethering.sh
amove usr/lib/NetworkManager/system-connections/USB_Networking.nmconnection
} }
_default_camera() { _default_camera() {