diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-08-15 11:34:01 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-08-15 11:34:01 +0200 |
| commit | 428ad126d8ca0bdb42bbde6442028e9497d0e171 (patch) | |
| tree | f36a2bfedde74a08e41f4bb42528ce6cd8ef0090 /android | |
| parent | 844714165375e3a8ec45dcc7a97e4907ccda8e27 (diff) | |
| parent | c5197218e9612242c36df2504c52f4af8b4b0472 (diff) | |
| download | mullvadvpn-428ad126d8ca0bdb42bbde6442028e9497d0e171.tar.xz mullvadvpn-428ad126d8ca0bdb42bbde6442028e9497d0e171.zip | |
Merge branch 'update-wireguard-go'
Diffstat (limited to 'android')
| -rw-r--r-- | android/docker/Dockerfile | 16 | ||||
| -rw-r--r-- | android/docker/README.md | 2 | ||||
| -rwxr-xr-x | android/fdroid-build/init.sh | 11 |
3 files changed, 17 insertions, 12 deletions
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index 7a46151646..3a2bfd73ac 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -43,17 +43,19 @@ RUN cd /tmp && \ ENV ANDROID_NDK_HOME="/opt/android/android-ndk-r20b" \ NDK_TOOLCHAIN_DIR="/opt/android/android-ndk-r20b/toolchains/llvm/prebuilt/linux-x86_64/bin" -# Install Go +# Install golang +ENV GOLANG_VERSION 1.18.5 +# Checksum from: https://go.dev/dl/ +ENV GOLANG_HASH 9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2 COPY goruntime-boottime-over-monotonic.diff /tmp/goruntime-boottime-over-monotonic.diff - RUN cd /tmp && \ - curl -sf -L -O https://dl.google.com/go/go1.16.linux-amd64.tar.gz && \ - echo "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2 go1.16.linux-amd64.tar.gz" | sha256sum -c && \ + curl -sf -L -o go.tgz https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz && \ + echo "$GOLANG_HASH go.tgz" | sha256sum -c && \ cd /opt && \ - tar -xzf /tmp/go1.16.linux-amd64.tar.gz && \ + tar -xzf /tmp/go.tgz && \ patch -p1 -f -N -r- -d "/opt/go" < /tmp/goruntime-boottime-over-monotonic.diff && \ mkdir /opt/go/go-path && \ - rm /tmp/goruntime-boottime-over-monotonic.diff /tmp/go1.16.linux-amd64.tar.gz + rm /tmp/goruntime-boottime-over-monotonic.diff /tmp/go.tgz ENV GOROOT=/opt/go GOPATH=/opt/go/go-path PATH=${PATH}:/opt/go/bin @@ -72,7 +74,7 @@ ENV PATH="${PATH}:/root/.cargo/bin" \ RUN curl -sf -L https://sh.rustup.rs > /tmp/rustup.sh && \ cd /tmp && \ - echo "a3cb081f88a6789d104518b30d4aa410009cd08c3822a1226991d6cf0442a0f8 rustup.sh" | sha256sum -c && \ + echo "173f4881e2de99ba9ad1acb59e65be01b2a44979d83b6ec648d0d22f8654cbce rustup.sh" | sha256sum -c && \ chmod +x rustup.sh && \ ./rustup.sh -y && \ rm rustup.sh && \ diff --git a/android/docker/README.md b/android/docker/README.md index 38cf5a38ee..4594f65466 100644 --- a/android/docker/README.md +++ b/android/docker/README.md @@ -39,7 +39,7 @@ The example below builds only for 64-bit ARM and x86-64: docker run \ --rm \ -it \ - -e ARCHITECTURES="aarch64 x86_64" + -e ARCHITECTURES="aarch64 x86_64" \ --name mullvad-android-build \ -v /home/user/mullvadvpn-app:/project \ -w /project \ diff --git a/android/fdroid-build/init.sh b/android/fdroid-build/init.sh index f363372df7..f8d498e10c 100755 --- a/android/fdroid-build/init.sh +++ b/android/fdroid-build/init.sh @@ -19,11 +19,14 @@ rustup target add \ aarch64-linux-android \ armv7-linux-androideabi -# Install Go +# Install golang +GOLANG_VERSION="1.18.5" +# Checksum from: https://golang.org/dl/ +GOLANG_HASH="9e5de37f9c49942c601b191ac5fba404b868bfc21d446d6960acc12283d6e5f2" cd "$HOME" -curl -sf -L -O https://golang.org/dl/go1.16.linux-amd64.tar.gz -echo "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2 go1.16.linux-amd64.tar.gz" | sha256sum -c -tar -xzvf go1.16.linux-amd64.tar.gz +curl -sf -L -o go.tgz https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz +echo "$GOLANG_HASH go.tgz" | sha256sum -c +tar -xzvf go.tgz patch -p1 -f -N -r- -d "$HOME/go" < "$REPO_DIR/wireguard/libwg/goruntime-boottime-over-monotonic.diff" # Configure Cargo for cross-compilation |