systemd/networkmanager: remove some alpine-isms (MR 5375) (MR 5563)
Co-authored-by: Clayton Craft <clayton@craftyguy.net> [ci:skip-build] already built successfully in CI
This commit is contained in:
parent
7488c4a895
commit
684b6d8348
4 changed files with 2 additions and 61 deletions
|
|
@ -4,7 +4,7 @@
|
|||
pkgname=networkmanager
|
||||
pkgver=9991.48.2
|
||||
_pkgver=1.48.2
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
pkgdesc="Network Management daemon"
|
||||
url="https://wiki.gnome.org/Projects/NetworkManager"
|
||||
arch="all"
|
||||
|
|
@ -52,8 +52,6 @@ checkdepends="
|
|||
install="
|
||||
$pkgname.pre-install
|
||||
$pkgname.pre-upgrade
|
||||
$pkgname.post-install
|
||||
$pkgname.post-upgrade
|
||||
"
|
||||
subpackages="
|
||||
$pkgname-dbg
|
||||
|
|
@ -98,8 +96,8 @@ build() {
|
|||
_build() {
|
||||
local outdir=$1; shift
|
||||
|
||||
#-Db_lto=true \
|
||||
abuild-meson \
|
||||
-Db_lto=true \
|
||||
-Dconfig_dhcp_default=internal \
|
||||
-Dconfig_plugins_default=ifupdown \
|
||||
-Dcrypto=nss \
|
||||
|
|
@ -152,16 +150,6 @@ package() {
|
|||
"$pkgdir/usr/share/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
|
||||
|
||||
mv "$pkgdir/usr/share/doc/NetworkManager" "$pkgdir/usr/share/doc/$pkgname"
|
||||
|
||||
# post-install message
|
||||
cat > "$pkgdir"/usr/share/doc/$pkgname/README.alpine <<-EOF
|
||||
To modify system network connections without the root password: add your user account to the 'plugdev' group, or use Polkit.
|
||||
|
||||
To use iwd instead of the default wpa_supplicant install iwd, start its service and add the following to your /etc/NetworkManager/NetworkManager.conf:
|
||||
|
||||
[device]
|
||||
wifi.backend=iwd
|
||||
EOF
|
||||
}
|
||||
|
||||
dev() {
|
||||
|
|
@ -209,12 +197,10 @@ ppp() {
|
|||
amove usr/lib/pppd/*/nm-pppd-plugin.so
|
||||
}
|
||||
|
||||
# TODO: Add dependency on wpa_supplicant or iwd via some virtual (?).
|
||||
wifi() {
|
||||
_default_plugin
|
||||
pkgdesc="WiFi device plugin for NetworkManager"
|
||||
depends="$depends wireless-regdb"
|
||||
install="$subpkgname.post-install"
|
||||
}
|
||||
|
||||
wwan() {
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
cat >&2 <<EOF
|
||||
*
|
||||
* To control WiFi devices, install either 'wpa_supplicant' or 'iwd' package,
|
||||
* enable and start the corresponding service (rc-update add <name>;
|
||||
* rc-service <name> start), and restart networkmanager.
|
||||
*
|
||||
* If you chose iwd, you have to also add 'wifi.backend=iwd' into section
|
||||
* '[device]' in /etc/NetworkManager/NetworkManager.conf.
|
||||
*
|
||||
EOF
|
||||
|
||||
exit 0
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
cat >&2 <<EOF
|
||||
*
|
||||
* To modify system network connections without the root password, add your user
|
||||
* account to the 'plugdev' group.
|
||||
*
|
||||
* If you use wifi, bluetooth, ppp, wwan (mobile broadband), adsl or ovs (Open
|
||||
* vSwitch), install the corresponding plugin: apk add networkmanager-<name>.
|
||||
*
|
||||
* If you use NetworkManager features which require dnsmasq, you need to install
|
||||
* dnsmasq support: apk add networkmanager-dnsmasq
|
||||
*
|
||||
EOF
|
||||
|
||||
exit 0
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
ver_old=$2
|
||||
|
||||
if [ "$(apk version -t "$ver_old" '1.34.0-r3')" = '<' ]; then
|
||||
cat >&2 <<-EOF
|
||||
*
|
||||
* NetworkManager plugins adsl, bluetooth, ovs, ppp, wwan (mobile broadband),
|
||||
* and wifi have been split into subpackages. If you use some of them, install
|
||||
* the corresponding packages (e.g. 'apk add networkmanager-wifi').
|
||||
*
|
||||
EOF
|
||||
fi
|
||||
|
||||
exit 0
|
||||
Loading…
Add table
Add a link
Reference in a new issue