Make package function more compact

This commit is contained in:
2026-04-26 16:40:47 +02:00
parent 2d8dcb239a
commit 045f20a120

View File

@@ -61,17 +61,11 @@ check() {
} }
package() { package() {
install -m755 -D "$_cargo_release_dir/mullvad" \ install -m755 -Dt "$pkgdir/usr/bin/" \
"$pkgdir/usr/bin/mullvad" "$_cargo_release_dir/mullvad" \
"$_cargo_release_dir/mullvad-daemon" \
install -m755 -D "$_cargo_release_dir/mullvad-daemon" \ "$_cargo_release_dir/mullvad-problem-report" \
"$pkgdir/usr/bin/mullvad-daemon" "$_cargo_release_dir/mullvad-setup"
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"
# TODO: Bundle a relay list. # TODO: Bundle a relay list.
# We can't generate one at build time since that would break build reproducibility. # We can't generate one at build time since that would break build reproducibility.
@@ -79,25 +73,19 @@ package() {
#install -m644 -D "$builddir/<todo>/relays.json" \ #install -m644 -D "$builddir/<todo>/relays.json" \
# "$pkgdir/usr/share/mullvad-vpn/relays.json" # "$pkgdir/usr/share/mullvad-vpn/relays.json"
# TODO: Copy relay list into /var/cache/ in post-upgrade/post-install # TODO: Copy relay list into /var/cache/ in post-upgrade/post-install
}
systemd() { # files in /usr/lib/systemd/ are automatically put in systemd subpackage
pkgdesc="systemd service files for Mullvad VPN" install -m755 -Dt "$pkgdir/usr/lib/systemd/system/" \
depends="$pkgname=$pkgver-r$pkgrel" "$builddir/dist-assets/linux/mullvad-daemon.service" \
"$builddir/dist-assets/linux/mullvad-early-boot-blocking.service"
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"
} }
suid() { suid() {
pkgdesc="mullvad-exclude cli for split tunneling" pkgdesc="mullvad-exclude cli for split tunneling"
depends="$pkgname=$pkgver-r$pkgrel" depends="$pkgname=$pkgver-r$pkgrel"
install -m4755 -D "$_cargo_release_dir/mullvad-exclude" \ install -m4755 -Dt "$subpkgdir/usr/bin/" \
"$subpkgdir/usr/bin/mullvad-exclude" "$_cargo_release_dir/mullvad-exclude"
} }
sha512sums=" sha512sums="