From 45a08ada04d929a4483bd2c876ae78793545f3b6 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Tue, 1 May 2018 20:12:24 +0000
Subject: [PATCH 1/3] Add CROSS_COMPILER and ARCH_BOOT settings for each
 architecture.

---
 make/config.amd64.mk   | 2 ++
 make/config.arm64.mk   | 2 ++
 make/config.armel.mk   | 2 ++
 make/config.powerpc.mk | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/make/config.amd64.mk b/make/config.amd64.mk
index df31cd5d..6bf10fae 100644
--- a/make/config.amd64.mk
+++ b/make/config.amd64.mk
@@ -5,6 +5,8 @@
 ############################################################
 include $(ONL)/make/config.mk
 export TOOLCHAIN := x86_64-linux-gnu
+export CROSS_COMPILER := $(TOOLCHAIN)-
 export ARCH := amd64
 export UARCH := AMD64
+export ARCH_BOOT := grub
 export __$(ARCH)__ := 1
diff --git a/make/config.arm64.mk b/make/config.arm64.mk
index 27587349..a64eec6a 100644
--- a/make/config.arm64.mk
+++ b/make/config.arm64.mk
@@ -5,6 +5,8 @@
 ############################################################
 include $(ONL)/make/config.mk
 export TOOLCHAIN := aarch64-linux-gnu
+export CROSS_COMPILER := $(TOOLCHAIN)-
 export ARCH := arm64
 export UARCH := ARM64
+export ARCH_BOOT := uboot
 export __$(ARCH)__ := 1
diff --git a/make/config.armel.mk b/make/config.armel.mk
index fe6b8c4c..cf70bcb7 100644
--- a/make/config.armel.mk
+++ b/make/config.armel.mk
@@ -5,6 +5,8 @@
 ############################################################
 include $(ONL)/make/config.mk
 export TOOLCHAIN := arm-linux-gnueabi
+export CROSS_COMPILER := $(TOOLCHAIN)-
 export ARCH := armel
 export UARCH := ARMEL
+export ARCH_BOOT := uboot
 export __$(ARCH)__ := 1
diff --git a/make/config.powerpc.mk b/make/config.powerpc.mk
index e8aba400..a72663a3 100644
--- a/make/config.powerpc.mk
+++ b/make/config.powerpc.mk
@@ -5,6 +5,8 @@
 ############################################################
 include $(ONL)/make/config.mk
 export TOOLCHAIN := powerpc-linux-gnu
+export CROSS_COMPILER := $(TOOLCHAIN)-
 export ARCH := powerpc
 export UARCH := PPC
+export ARCH_BOOT := uboot
 export __$(ARCH)__ := 1

From d2152e507cb732349a57b922ade341312ed4381e Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Tue, 1 May 2018 20:47:26 +0000
Subject: [PATCH 2/3] Minor builder8 update.

---
 docker/images/builder8/1.8/Dockerfile | 17 +++++++++++++++++
 docker/images/builder8/1.8/Makefile   | 19 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 docker/images/builder8/1.8/Dockerfile
 create mode 100644 docker/images/builder8/1.8/Makefile

diff --git a/docker/images/builder8/1.8/Dockerfile b/docker/images/builder8/1.8/Dockerfile
new file mode 100644
index 00000000..09b99b12
--- /dev/null
+++ b/docker/images/builder8/1.8/Dockerfile
@@ -0,0 +1,17 @@
+############################################################
+#
+# Minor updates.
+# - libelf-dev for kernel 4.14
+# - cryptsetup-bin
+#
+############################################################
+FROM opennetworklinux/builder8:1.7
+MAINTAINER Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
+
+RUN apt-get update && apt-get install libelf-dev && apt-get install cryptsetup-bin
+
+#
+# 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.8/Makefile b/docker/images/builder8/1.8/Makefile
new file mode 100644
index 00000000..7019be6b
--- /dev/null
+++ b/docker/images/builder8/1.8/Makefile
@@ -0,0 +1,19 @@
+VERSION=1.8
+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)

From d221db796a8c154978d4ecc0dac542262fc68fa8 Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Tue, 1 May 2018 13:53:38 -0700
Subject: [PATCH 3/3] builder8:1.8.

---
 docker/tools/onlbuilder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/tools/onlbuilder b/docker/tools/onlbuilder
index 8b2750fa..73077d22 100755
--- a/docker/tools/onlbuilder
+++ b/docker/tools/onlbuilder
@@ -18,7 +18,7 @@ g_current_uid  = os.getuid()
 g_timestamp = datetime.datetime.now().strftime("%Y-%m-%d.%H%M%S")
 
 g_builder7_image_name="opennetworklinux/builder7:1.2"
-g_builder8_image_name="opennetworklinux/builder8:1.7"
+g_builder8_image_name="opennetworklinux/builder8:1.8"
 g_builder9_image_name="opennetworklinux/builder9:1.1"
 
 g_default_image_name=g_builder8_image_name