From 461078d30e28cea08979c510e961a44d82312418 Mon Sep 17 00:00:00 2001
From: Shengzhou Liu <Shengzhou.Liu@nxp.com>
Date: Fri, 22 Jul 2016 21:47:44 +0800
Subject: [PATCH] Add arm64 support for toolchain in builder8:1.5

---
 docker/images/builder8/1.5/Dockerfile | 21 +++++++++++++++++++++
 docker/images/builder8/1.5/Makefile   | 19 +++++++++++++++++++
 make/config.arm64.mk                  |  9 +++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 docker/images/builder8/1.5/Dockerfile
 create mode 100644 docker/images/builder8/1.5/Makefile
 create mode 100644 make/config.arm64.mk

diff --git a/docker/images/builder8/1.5/Dockerfile b/docker/images/builder8/1.5/Dockerfile
new file mode 100644
index 00000000..16b968a6
--- /dev/null
+++ b/docker/images/builder8/1.5/Dockerfile
@@ -0,0 +1,21 @@
+############################################################
+#
+# Update with aarch64 support dependencies.
+#
+############################################################
+FROM opennetworklinux/builder8:1.4
+MAINTAINER Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
+
+RUN dpkg --add-architecture arm64
+
+RUN apt-get update && apt-get install -y \
+    crossbuild-essential-arm64 \
+    gcc-aarch64-linux-gnu
+
+RUN xapt -a arm64 libedit-dev ncurses-dev libsensors4-dev libwrap0-dev libssl-dev libsnmp-dev
+
+#
+# Docker shell and other container tools.
+#
+COPY docker_shell /bin/docker_shell
+COPY container-id /bin/container-id
diff --git a/docker/images/builder8/1.5/Makefile b/docker/images/builder8/1.5/Makefile
new file mode 100644
index 00000000..98d96572
--- /dev/null
+++ b/docker/images/builder8/1.5/Makefile
@@ -0,0 +1,19 @@
+VERSION=1.5
+USER=opennetworklinux
+REPO=builder8
+
+TOOLS=../../../tools/docker_shell ../../../tools/container-id
+
+build: check_version
+	cp $(TOOLS) .
+	docker build -t $(USER)/$(REPO):$(VERSION) .
+	rm -rf $(notdir $(TOOLS))
+
+#
+# Todo: Query remote repository to see if the request version already exists to avoid accidental overwrites
+# when a new image is built but the VERSION variable is not updated.
+#
+check_version:
+
+push:
+	docker push $(USER)/$(REPO):$(VERSION)
diff --git a/make/config.arm64.mk b/make/config.arm64.mk
new file mode 100644
index 00000000..fa294082
--- /dev/null
+++ b/make/config.arm64.mk
@@ -0,0 +1,9 @@
+############################################################
+#
+# Open Network Linux
+#
+############################################################
+include $(ONL)/make/config.mk
+export TOOLCHAIN := aarch64-linux-gnu
+export ARCH := arm64
+export UARCH := ARM64