From 0bed988629ed9573dd801f8449f6b934e8ff2a22 Mon Sep 17 00:00:00 2001
From: i1i1 <vanyarybin1@live.ru>
Date: Fri, 24 Jan 2020 16:26:23 +0300
Subject: [PATCH] Add aarch64 deb packaging

---
 .cargo/config          |  5 +++++
 builder/Dockerfile-deb | 11 +++++++++--
 builder/build.sh       |  4 ++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.cargo/config b/.cargo/config
index 9fdfc12..f55a0b7 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -7,3 +7,8 @@ strip = { path = "arm-linux-gnueabihf-strip" }
 linker = "arm-linux-gnueabihf-gcc"
 objcopy = { path = "arm-linux-gnueabihf-objcopy" }
 strip = { path = "arm-linux-gnueabihf-strip" }
+
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+objcopy = { path = "aarch64-linux-gnu-objcopy" }
+strip = { path = "aarch64-linux-gnu-strip" }
diff --git a/builder/Dockerfile-deb b/builder/Dockerfile-deb
index aa4915f..2d13408 100644
--- a/builder/Dockerfile-deb
+++ b/builder/Dockerfile-deb
@@ -2,7 +2,13 @@ FROM ubuntu:16.04
 
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
-    curl ruby-ronn build-essential gcc-arm-linux-gnueabihf libc6-dev-armhf-cross \
+    build-essential \
+    curl \
+    gcc-aarch64-linux-gnu \
+    gcc-arm-linux-gnueabihf \
+    libc6-dev-arm64-cross \
+    libc6-dev-armhf-cross \
+    ruby-ronn \
  && rm -rf /var/cache/dpkg
 
 RUN useradd -ms /bin/bash user
@@ -16,7 +22,8 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${RUST}
 ENV PATH=/home/user/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN rustup target add i686-unknown-linux-gnu \
- && rustup target add armv7-unknown-linux-gnueabihf
+ && rustup target add armv7-unknown-linux-gnueabihf \
+ && rustup target add aarch64-unknown-linux-gnu
 
 RUN cargo install cargo-deb \
  && rm -rf /home/user/.cargo/{git,tmp,registry}
diff --git a/builder/build.sh b/builder/build.sh
index ec8b037..8f65afb 100755
--- a/builder/build.sh
+++ b/builder/build.sh
@@ -31,6 +31,10 @@ cp ../target/debian/vpncloud_${VERSION}_amd64.deb ../dist/vpncloud_${VERSION}_am
 docker_cmd deb 'cd code && cargo deb --target armv7-unknown-linux-gnueabihf'
 cp ../target/armv7-unknown-linux-gnueabihf/debian/vpncloud_${VERSION}_armhf.deb ../dist/vpncloud_${VERSION}_armhf.deb
 
+# aarch64 deb
+docker_cmd deb 'cd code && cargo deb --target aarch64-unknown-linux-gnu'
+cp ../target/aarch64-unknown-linux-gnu/debian/vpncloud_${VERSION}_arm64.deb ../dist/vpncloud_${VERSION}_arm64.deb
+
 
 docker build --rm -f=Dockerfile-rpm -t vpncloud-builder-rpm .