jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-18 16:56:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Makefile): Support arm64 / armv8 / aarch64

Browse Source 
This adds support for 64bit arm cpu architectures.

Change-Type: patch
Changelog-Entry: Support building Etcher on armv8
This commit is contained in:
Jonas Hermsmeier 2018-02-14 16:26:40 +01:00
parent 4fa0f990e5
commit 6990d7632a
No known key found for this signature in database
GPG Key ID: 1B870F801A0CEE9F
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -55,6 +55,15 @@ else
ifeq ($(shell uname -m),armv7l) ifeq ($(shell uname -m),armv7l)
HOST_ARCH = armv7hf HOST_ARCH = armv7hf
endif endif
ifeq ($(shell uname -m),aarch64)
HOST_ARCH = aarch64
endif
ifeq ($(shell uname -m),armv8)
HOST_ARCH = aarch64
endif
ifeq ($(shell uname -m),arm64)
HOST_ARCH = aarch64
endif
endif endif
ifeq ($(shell uname -s),Darwin) ifeq ($(shell uname -s),Darwin)
PLATFORM = darwin PLATFORM = darwin

12
scripts/build/architecture-convert.sh
View File

@ -53,6 +53,8 @@ if [ "$ARGV_TYPE" == "node" ]; then
RESULT=x64 RESULT=x64
elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then
RESULT=arm RESULT=arm
elif [ "$ARGV_ARCHITECTURE" == "aarch64" ]; then
RESULT=arm64
fi fi
elif [ "$ARGV_TYPE" == "electron-builder" ]; then elif [ "$ARGV_TYPE" == "electron-builder" ]; then
if [ "$ARGV_ARCHITECTURE" == "x86" ]; then if [ "$ARGV_ARCHITECTURE" == "x86" ]; then
@ -61,6 +63,8 @@ elif [ "$ARGV_TYPE" == "electron-builder" ]; then
RESULT=x64 RESULT=x64
elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then
RESULT=armv7l RESULT=armv7l
elif [ "$ARGV_ARCHITECTURE" == "aarch64" ]; then
RESULT=arm64
fi fi
elif [ "$ARGV_TYPE" == "debian" ]; then elif [ "$ARGV_TYPE" == "debian" ]; then
if [ "$ARGV_ARCHITECTURE" == "x86" ]; then if [ "$ARGV_ARCHITECTURE" == "x86" ]; then
@ -69,6 +73,8 @@ elif [ "$ARGV_TYPE" == "debian" ]; then
RESULT=amd64 RESULT=amd64
elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then
RESULT=armhf RESULT=armhf
elif [ "$ARGV_ARCHITECTURE" == "aarch64" ]; then
RESULT=arm64
fi fi
elif [ "$ARGV_TYPE" == "redhat" ]; then elif [ "$ARGV_TYPE" == "redhat" ]; then
if [ "$ARGV_ARCHITECTURE" == "x86" ]; then if [ "$ARGV_ARCHITECTURE" == "x86" ]; then
@ -77,6 +83,8 @@ elif [ "$ARGV_TYPE" == "redhat" ]; then
RESULT='x86_64' RESULT='x86_64'
elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then
RESULT=armhfp RESULT=armhfp
elif [ "$ARGV_ARCHITECTURE" == "aarch64" ]; then
RESULT=aarch64
fi fi
elif [ "$ARGV_TYPE" == "appimage" ]; then elif [ "$ARGV_TYPE" == "appimage" ]; then
if [ "$ARGV_ARCHITECTURE" == "x86" ]; then if [ "$ARGV_ARCHITECTURE" == "x86" ]; then
@ -85,6 +93,8 @@ elif [ "$ARGV_TYPE" == "appimage" ]; then
RESULT='x86_64' RESULT='x86_64'
elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then
RESULT=armhf RESULT=armhf
elif [ "$ARGV_ARCHITECTURE" == "aarch64" ]; then
RESULT=arm64
fi fi
elif [ "$ARGV_TYPE" == "docker" ]; then elif [ "$ARGV_TYPE" == "docker" ]; then
if [ "$ARGV_ARCHITECTURE" == "x64" ]; then if [ "$ARGV_ARCHITECTURE" == "x64" ]; then
@ -93,6 +103,8 @@ elif [ "$ARGV_TYPE" == "docker" ]; then
RESULT=i686 RESULT=i686
elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then elif [ "$ARGV_ARCHITECTURE" == "armv7hf" ]; then
RESULT=armv7hf RESULT=armv7hf
elif [ "$ARGV_ARCHITECTURE" == "aarch64" ]; then
RESULT=arm64v8
fi fi
else else
echo "Unsupported architecture type: $ARGV_TYPE" 1>&2 echo "Unsupported architecture type: $ARGV_TYPE" 1>&2