mirror of
https://github.com/balena-os/balena-supervisor.git
synced 2025-06-21 08:40:05 +00:00
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>
This commit is contained in:
committed by
Pablo Carranza Velez
parent
89607fa2bc
commit
01c39f33b5
@ -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 \
|
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
|
&& 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
|
# Build nodejs dependencies
|
||||||
FROM $ARCH-node-base as node
|
FROM $ARCH-node-base as node
|
||||||
ARG ARCH
|
ARG ARCH
|
||||||
|
@ -32,7 +32,7 @@ if (_.isEmpty(tag)) {
|
|||||||
process.exit(1);
|
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)) {
|
if (!_.isEmpty(arch) && !_.includes(supportedArchitectures, arch)) {
|
||||||
console.error('Invalid architecture ' + arch);
|
console.error('Invalid architecture ' + arch);
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
|
@ -23,6 +23,9 @@ case "$ARCH" in
|
|||||||
'aarch64')
|
'aarch64')
|
||||||
export TARGET_MACHINE='generic-armv8'
|
export TARGET_MACHINE='generic-armv8'
|
||||||
;;
|
;;
|
||||||
|
'i386-nlp')
|
||||||
|
export TARGET_MACHINE='i386-nlp'
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
export SOURCE_DIR=/source
|
export SOURCE_DIR=/source
|
||||||
|
5
base-image/build/conf/machine/i386-nlp.conf
Normal file
5
base-image/build/conf/machine/i386-nlp.conf
Normal file
@ -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
|
@ -72,6 +72,14 @@ jobs:
|
|||||||
PUSH_IMAGES: "true"
|
PUSH_IMAGES: "true"
|
||||||
STAGING_API_ENDPOINT: https://api.resinstaging.io
|
STAGING_API_ENDPOINT: https://api.resinstaging.io
|
||||||
PRODUCTION_API_ENDPOINT: https://api.resin.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:
|
armel:
|
||||||
<<: *defaults
|
<<: *defaults
|
||||||
environment:
|
environment:
|
||||||
@ -114,3 +122,4 @@ workflows:
|
|||||||
- rpi
|
- rpi
|
||||||
- armv7hf
|
- armv7hf
|
||||||
- aarch64
|
- aarch64
|
||||||
|
- i386-nlp
|
||||||
|
@ -12,6 +12,9 @@ case "$ARCH" in
|
|||||||
'i386')
|
'i386')
|
||||||
export GOARCH=386
|
export GOARCH=386
|
||||||
;;
|
;;
|
||||||
|
'i386-nlp')
|
||||||
|
export GOARCH=386
|
||||||
|
;;
|
||||||
'rpi')
|
'rpi')
|
||||||
export GOARCH=arm
|
export GOARCH=arm
|
||||||
export GOARM=6
|
export GOARM=6
|
||||||
|
Reference in New Issue
Block a user