Make package function more compact

mullvad-vpn-daemon/APKBUILD

@@ -1,21 +1,15 @@
 maintainer="Joakim Hulthe <joakim@hulthe.net>"
 pkgname=mullvad-vpn-daemon
 pkgver=2026.2_beta1
-pkgrel=1
+pkgrel=0
 pkgdesc="Mullvad VPN client (daemon and CLI)"
 url="https://mullvad.net/"
-arch="all"
-license="GPL-3-or-later"
-depends="
-	dbus
-	libmnl
-	libnftnl
-"
+# Mullvad depends on old versions of the `nix` library
+# which are broken on on loongarch64 and s390x
+arch="all !loongarch64 !s390x"
+license="GPL-3.0-or-later"
 makedepends="
-	build-base
 	cargo-auditable
-	rust
-	pkgconfig
 	git
 	protobuf-dev
 	dbus-dev
@@ -23,11 +17,8 @@ makedepends="
 	libnftnl-dev
 "
 install="
-	$pkgname.post-install
 	$pkgname.pre-upgrade
-	$pkgname.post-upgrade
 	$pkgname.pre-deinstall
-	$pkgname.post-deinstall
 	$pkgname-systemd.post-install
 	$pkgname-systemd.post-upgrade
 	$pkgname-systemd.pre-deinstall
@@ -49,12 +40,6 @@ prepare() {
 	default_prepare
 
 	cargo fetch --target "$CHOST" --locked
-
-	# Generate vendored relay list
-	cargo run --frozen \
-		-p mullvad-api --bin relay_list \
-		--target "$CHOST" \
-		> "$builddir/relays.json"
 }
 
 build() {
@@ -76,41 +61,31 @@ check() {
 }
 
 package() {
-	install -m755 -D "$_cargo_release_dir/mullvad" \
-		"$pkgdir/usr/bin/mullvad"
+	install -m755 -Dt "$pkgdir/usr/bin/" \
+		"$_cargo_release_dir/mullvad" \
+		"$_cargo_release_dir/mullvad-daemon" \
+		"$_cargo_release_dir/mullvad-problem-report" \
+		"$_cargo_release_dir/mullvad-setup"		
 
-	install -m755 -D "$_cargo_release_dir/mullvad-daemon" \
-		"$pkgdir/usr/bin/mullvad-daemon"
+	# TODO: Bundle a relay list.
+	# We can't generate one at build time since that would break build reproducibility.
+	# Once mullvad starts checking a relay list into their release branches, we can bundle that.
+	#install -m644 -D "$builddir/<todo>/relays.json" \
+	#	"$pkgdir/usr/share/mullvad-vpn/relays.json"
+	# TODO: Copy relay list into /var/cache/ in post-upgrade/post-install
 
-	install -m755 -D "$_cargo_release_dir/mullvad-problem-report" \
-		"$pkgdir/usr/bin/mullvad-problem-report"
-
-	install -m755 -D "$_cargo_release_dir/mullvad-setup" \
-		"$pkgdir/usr/bin/mullvad-setup"
-
-	# Bundle the vendored relay list.
-	# It's copied to /var/cache/mullvad-vpn/ by the post-* scripts.
-	install -m644 -D "$builddir/relays.json" \
-		"$pkgdir/usr/share/mullvad-vpn/relays.json"
-}
-
-systemd() {
-	pkgdesc="systemd service files for Mullvad VPN"
-	depends="$pkgname=$pkgver-r$pkgrel"
-
-	install -m755 -D "$builddir/dist-assets/linux/mullvad-daemon.service" \
-		"$subpkgdir/usr/lib/systemd/system/mullvad-daemon.service"
-
-	install -m755 -D "$builddir/dist-assets/linux/mullvad-early-boot-blocking.service" \
-		"$subpkgdir/usr/lib/systemd/system/mullvad-early-boot-blocking.service"
+	# files in /usr/lib/systemd/ are automatically put in systemd subpackage
+	install -m755 -Dt "$pkgdir/usr/lib/systemd/system/" \
+		"$builddir/dist-assets/linux/mullvad-daemon.service" \
+		"$builddir/dist-assets/linux/mullvad-early-boot-blocking.service"
 }
 
 suid() {
 	pkgdesc="mullvad-exclude cli for split tunneling"
 	depends="$pkgname=$pkgver-r$pkgrel"
 
-	install -m4755 -D "$_cargo_release_dir/mullvad-exclude" \
-		"$subpkgdir/usr/bin/mullvad-exclude"
+	install -m4755 -Dt "$subpkgdir/usr/bin/" \
+		"$_cargo_release_dir/mullvad-exclude"
 }
 
 sha512sums="

mullvad-vpn-daemon/mullvad-vpn-daemon.post-deinstall

@@ -1,9 +0,0 @@
-#!/bin/sh
-set -eu
-
-rm -r /var/log/mullvad-vpn/ || \
-  echo "Failed to remove mullvad-vpn logs"
-rm -r /var/cache/mullvad-vpn/ || \
-  echo "Failed to remove mullvad-vpn cache"
-rm -r /etc/mullvad-vpn || \
-  echo "Failed to remove mullvad-vpn config"

mullvad-vpn-daemon/mullvad-vpn-daemon.post-install

@@ -1,7 +1,8 @@
 #!/bin/sh
 set -eu
 
+# TODO: see `package()` in APKBUILD
 # Copy vendored relay list into place
-mkdir -p /var/cache/mullvad-vpn \
-  && cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
-  || echo "failed to install /var/cache/mullvad-vpn/relays.json"
+# mkdir -p /var/cache/mullvad-vpn \
+#   && cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
+#   || echo "failed to install /var/cache/mullvad-vpn/relays.json"

mullvad-vpn-daemon/mullvad-vpn-daemon.post-upgrade

@@ -1,7 +1,8 @@
 #!/bin/sh
 set -eu
 
+# TODO: see `package()` in APKBUILD
 # Overwrite the cached relay list with the vendored one.
-mkdir -p /var/cache/mullvad-vpn \
-  && cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
-  || echo "failed to install /var/cache/mullvad-vpn/relays.json"
+# mkdir -p /var/cache/mullvad-vpn \
+#   && cp /usr/share/mullvad-vpn/relays.json /var/cache/mullvad-vpn/relays.json \
+#   || echo "failed to install /var/cache/mullvad-vpn/relays.json"