Make APKBUILD follow style guidelines
This commit is contained in:
@@ -23,7 +23,6 @@ makedepends="
|
|||||||
libmnl-dev
|
libmnl-dev
|
||||||
libnftnl-dev
|
libnftnl-dev
|
||||||
"
|
"
|
||||||
checkdepends=""
|
|
||||||
install="
|
install="
|
||||||
$pkgname.post-install
|
$pkgname.post-install
|
||||||
$pkgname.pre-upgrade
|
$pkgname.pre-upgrade
|
||||||
@@ -53,23 +52,23 @@ prepare() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
# Specify `--target` so that build artifacts will end up in target/<target>/release
|
# Specify `--target` so that build artifacts will be in target/<target>/release
|
||||||
# This avoids clashes with host system when running in a container with a mounted target folder.
|
# This avoids clashes with host system when building in a container.
|
||||||
|
|
||||||
# Compile all binaries
|
# Compile all binaries
|
||||||
cargo auditable build --release --locked \
|
cargo auditable build --release --locked \
|
||||||
--target "$CHOST" \
|
--target "$CHOST" \
|
||||||
-p mullvad-cli \
|
-p mullvad-cli \
|
||||||
-p mullvad-daemon \
|
-p mullvad-daemon \
|
||||||
-p mullvad-exclude \
|
-p mullvad-exclude \
|
||||||
-p mullvad-problem-report \
|
-p mullvad-problem-report \
|
||||||
-p mullvad-setup
|
-p mullvad-setup
|
||||||
|
|
||||||
# Generate vendored relay list
|
# Generate vendored relay list
|
||||||
cargo run --locked \
|
cargo run --locked \
|
||||||
-p mullvad-api --bin relay_list \
|
-p mullvad-api --bin relay_list \
|
||||||
--target "$CHOST" \
|
--target "$CHOST" \
|
||||||
> "$builddir/relays.json"
|
> "$builddir/relays.json"
|
||||||
}
|
}
|
||||||
|
|
||||||
check() {
|
check() {
|
||||||
@@ -89,7 +88,8 @@ package() {
|
|||||||
install -m755 -D "$_cargo_release_dir/mullvad-setup" \
|
install -m755 -D "$_cargo_release_dir/mullvad-setup" \
|
||||||
"$pkgdir/usr/bin/mullvad-setup"
|
"$pkgdir/usr/bin/mullvad-setup"
|
||||||
|
|
||||||
# Bundle the vendored relay list. It's copied to /var/cache/mullvad-vpn/ by the post-* scripts.
|
# Bundle the vendored relay list.
|
||||||
|
# It's copied to /var/cache/mullvad-vpn/ by the post-* scripts.
|
||||||
install -m644 -D "$builddir/relays.json" \
|
install -m644 -D "$builddir/relays.json" \
|
||||||
"$pkgdir/usr/share/mullvad-vpn/relays.json"
|
"$pkgdir/usr/share/mullvad-vpn/relays.json"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user