Don't generate relay list at build time
This commit is contained in:
@@ -25,9 +25,7 @@ makedepends="
|
||||
libnftnl-dev
|
||||
"
|
||||
install="
|
||||
$pkgname.post-install
|
||||
$pkgname.pre-upgrade
|
||||
$pkgname.post-upgrade
|
||||
$pkgname.pre-deinstall
|
||||
$pkgname.post-deinstall
|
||||
$pkgname-systemd.post-install
|
||||
@@ -51,12 +49,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() {
|
||||
@@ -90,10 +82,12 @@ package() {
|
||||
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"
|
||||
# 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
|
||||
}
|
||||
|
||||
systemd() {
|
||||
|
||||
Reference in New Issue
Block a user