From a6ed88fea5db21f365ca19e76c90df79c8466bf3 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 18 Sep 2017 15:50:36 +0100
Subject: [PATCH] To be on the safe side when detecting 64bit arm #72
---
src/freedombone-image-customise | 2 +-
src/freedombone-utils-go | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index d665c031d..bed159031 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1167,7 +1167,7 @@ function image_setup_utils {
if [[ $ARCHITECTURE == *"arm"* ]]; then
GOARCH=armv6l
fi
- if [[ $ARCHITECTURE == *"aarch"* ]]; then
+ if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
GOARCH=arm64
fi
if [ ! $GOARCH ]; then
diff --git a/src/freedombone-utils-go b/src/freedombone-utils-go
index 933c8dc7f..6739a1630 100755
--- a/src/freedombone-utils-go
+++ b/src/freedombone-utils-go
@@ -147,7 +147,7 @@ function mesh_upgrade_golang {
if [[ $ARCHITECTURE == *"arm"* ]]; then
GOARCH=armv6l
fi
- if [[ $ARCHITECTURE == *"aarch"* ]]; then
+ if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
GOARCH=arm64
fi
if [ ! $GOARCH ]; then
@@ -157,7 +157,7 @@ function mesh_upgrade_golang {
GOARCH=armv6l
echo $"Using $GOARCH"
fi
- if [[ $ARCHITECTURE == *"aarch"* ]]; then
+ if [[ $ARCHITECTURE == *"aarch"* || $ARCHITECTURE == *"arm64"* ]]; then
GOARCH=arm64
echo $"Using $GOARCH"
fi
--
GitLab