From 01c39f33b536ce154591d168b709c94fa01e30c2 Mon Sep 17 00:00:00 2001
From: Trong Nghia Nguyen <nghiant2710@gmail.com>
Date: Wed, 25 Oct 2017 00:50:32 +0700
Subject: [PATCH] Fixes #511, add support for new supervisor image for x86 with
 quark cpu boards.

Change-Type: minor
Signed-off-by: Trong Nghia Nguyen <nghiant2710@gmail.com>
---
 Dockerfile                                  | 2 ++
 automation/deploy-to-resin.js               | 2 +-
 base-image/build.sh                         | 3 +++
 base-image/build/conf/machine/i386-nlp.conf | 5 +++++
 circle.yml                                  | 9 +++++++++
 gosuper/build.sh                            | 3 +++
 6 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 base-image/build/conf/machine/i386-nlp.conf

diff --git a/Dockerfile b/Dockerfile
index 2f4bb84a..4e1a6c15 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -115,6 +115,8 @@ FROM resin/i386-node:6.5-slim as i386-node-base
 RUN echo '#!/bin/sh\nexit 0' > /usr/bin/cross-build-start && chmod +x /usr/bin/cross-build-start \
 	&& echo '#!/bin/sh\nexit 0' > /usr/bin/cross-build-end && chmod +x /usr/bin/cross-build-end
 
+FROM i386-node-base as i386-nlp-node-base
+
 # Build nodejs dependencies
 FROM $ARCH-node-base as node
 ARG ARCH
diff --git a/automation/deploy-to-resin.js b/automation/deploy-to-resin.js
index e17ddaba..de9f4944 100644
--- a/automation/deploy-to-resin.js
+++ b/automation/deploy-to-resin.js
@@ -32,7 +32,7 @@ if (_.isEmpty(tag)) {
 	process.exit(1);
 }
 
-const supportedArchitectures = [ 'amd64', 'rpi', 'aarch64', 'armel', 'i386', 'armv7hf' ];
+const supportedArchitectures = [ 'amd64', 'rpi', 'aarch64', 'armel', 'i386', 'armv7hf', 'i386-nlp' ];
 if (!_.isEmpty(arch) && !_.includes(supportedArchitectures, arch)) {
 	console.error('Invalid architecture ' + arch);
 	process.exit(1);
diff --git a/base-image/build.sh b/base-image/build.sh
index c44e6132..c97927df 100755
--- a/base-image/build.sh
+++ b/base-image/build.sh
@@ -23,6 +23,9 @@ case "$ARCH" in
 'aarch64')
 	export TARGET_MACHINE='generic-armv8'
 ;;
+'i386-nlp')
+	export TARGET_MACHINE='i386-nlp'
+;;
 esac
 
 export SOURCE_DIR=/source
diff --git a/base-image/build/conf/machine/i386-nlp.conf b/base-image/build/conf/machine/i386-nlp.conf
new file mode 100644
index 00000000..4483ac73
--- /dev/null
+++ b/base-image/build/conf/machine/i386-nlp.conf
@@ -0,0 +1,5 @@
+#@TYPE: Machine
+#@NAME: common_pc
+#@DESCRIPTION: Machine configuration for x86 with quark cpu boards.
+
+require conf/machine/include/tune-i586-nlp.inc
diff --git a/circle.yml b/circle.yml
index 43c8917f..ad126ae1 100644
--- a/circle.yml
+++ b/circle.yml
@@ -72,6 +72,14 @@ jobs:
       PUSH_IMAGES: "true"
       STAGING_API_ENDPOINT: https://api.resinstaging.io
       PRODUCTION_API_ENDPOINT: https://api.resin.io
+  i386-nlp:
+    <<: *defaults
+    environment:
+      DOCKER_USERNAME: travisciresin
+      ARCH: i386-nlp
+      PUSH_IMAGES: "true"
+      STAGING_API_ENDPOINT: https://api.resinstaging.io
+      PRODUCTION_API_ENDPOINT: https://api.resin.io
   armel:
     <<: *defaults
     environment:
@@ -114,3 +122,4 @@ workflows:
       - rpi
       - armv7hf
       - aarch64
+      - i386-nlp
diff --git a/gosuper/build.sh b/gosuper/build.sh
index ec5ec235..e57739b8 100644
--- a/gosuper/build.sh
+++ b/gosuper/build.sh
@@ -12,6 +12,9 @@ case "$ARCH" in
 'i386')
 	export GOARCH=386
 ;;
+'i386-nlp')
+	export GOARCH=386
+;;
 'rpi')
 	export GOARCH=arm
 	export GOARM=6