ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-06 11:10:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for aarch64

Browse Source 
Change-Type: minor
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
This commit is contained in:
Pablo Carranza Velez 2017-06-01 11:20:15 -07:00
parent 639aa0aece
commit ffce794987
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -17,4 +17,4 @@ Dockerfile.build.*
Dockerfile.runtime.* Dockerfile.runtime.*
!Dockerfile.build.template !Dockerfile.build.template
!Dockerfile.runtime.template !Dockerfile.runtime.template
build /build/

5
Makefile
View File

@ -20,7 +20,7 @@ endif
DISABLE_CACHE = 'false' DISABLE_CACHE = 'false'
ARCH = rpi# rpi/amd64/i386/armv7hf/armel ARCH = rpi# rpi/amd64/i386/armv7hf/armel/aarch64
DEPLOY_REGISTRY = DEPLOY_REGISTRY =
@ -71,6 +71,9 @@ endif
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
GOARCH = amd64 GOARCH = amd64
endif endif
ifeq ($(ARCH),aarch64)
GOARCH = arm64
endif
SUPERVISOR_DIND_MOUNTS := -v $$(pwd)/../../:/resin-supervisor -v $$(pwd)/config.json:/mnt/conf/config.json -v $$(pwd)/config/env:/usr/src/app/config/env -v $$(pwd)/config/localenv:/usr/src/app/config/localenv SUPERVISOR_DIND_MOUNTS := -v $$(pwd)/../../:/resin-supervisor -v $$(pwd)/config.json:/mnt/conf/config.json -v $$(pwd)/config/env:/usr/src/app/config/env -v $$(pwd)/config/localenv:/usr/src/app/config/localenv
ifeq ($(OS), Linux) ifeq ($(OS), Linux)
SUPERVISOR_DIND_MOUNTS := ${SUPERVISOR_DIND_MOUNTS} -v /sys/fs/cgroup:/sys/fs/cgroup:ro -v /bin/kmod:/bin/kmod SUPERVISOR_DIND_MOUNTS := ${SUPERVISOR_DIND_MOUNTS} -v /sys/fs/cgroup:/sys/fs/cgroup:ro -v /bin/kmod:/bin/kmod

3
base-image/automation/jenkins-build.sh
View File

@ -33,6 +33,9 @@ case "$ARCH" in
'armel') 'armel')
machine='generic-armv5' machine='generic-armv5'
;; ;;
'aarch64')
machine='generic-armv8'
;;
esac esac
SSTATE_DIR="$JENKINS_PERSISTENT_WORKDIR/$machine/sstate" SSTATE_DIR="$JENKINS_PERSISTENT_WORKDIR/$machine/sstate"
# Make sure shared directories are in place # Make sure shared directories are in place

7
base-image/build/conf/machine/generic-armv8.conf Normal file
View File

@ -0,0 +1,7 @@
#@TYPE: Machine
#@NAME: Generic armv8 machine
#@DESCRIPTION: Machine configuration for armv8 based boards
require conf/machine/include/arm/arch-armv8.inc
DEFAULTTUNE = "aarch64"