瀏覽代碼

Use arm64 golang download for aarch64 #72

Bob Mottram 7 年之前
父節點
當前提交
52c9c5abc7
共有 2 個檔案被更改,包括 13 行新增3 行删除
  1. 4
    1
      src/freedombone-image-customise
  2. 9
    2
      src/freedombone-utils-go

+ 4
- 1
src/freedombone-image-customise 查看文件

1164
     if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
1164
     if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
1165
         GOARCH=amd64
1165
         GOARCH=amd64
1166
     fi
1166
     fi
1167
-    if [[ $ARCHITECTURE == *"arm"* || $ARCHITECTURE == *"aarch"* ]]; then
1167
+    if [[ $ARCHITECTURE == *"arm"* ]]; then
1168
         GOARCH=armv6l
1168
         GOARCH=armv6l
1169
     fi
1169
     fi
1170
+    if [[ $ARCHITECTURE == *"aarch"* ]]; then
1171
+        GOARCH=arm64
1172
+    fi
1170
     if [ ! $GOARCH ]; then
1173
     if [ ! $GOARCH ]; then
1171
         echo $'System architecture was not specified when installing Go'
1174
         echo $'System architecture was not specified when installing Go'
1172
         exit 6734378
1175
         exit 6734378

+ 9
- 2
src/freedombone-utils-go 查看文件

144
     if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
144
     if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
145
         GOARCH=amd64
145
         GOARCH=amd64
146
     fi
146
     fi
147
-    if [[ $ARCHITECTURE == *"arm"* || $ARCHITECTURE == *"aarch"* ]]; then
147
+    if [[ $ARCHITECTURE == *"arm"* ]]; then
148
         GOARCH=armv6l
148
         GOARCH=armv6l
149
     fi
149
     fi
150
+    if [[ $ARCHITECTURE == *"aarch"* ]]; then
151
+        GOARCH=arm64
152
+    fi
150
     if [ ! $GOARCH ]; then
153
     if [ ! $GOARCH ]; then
151
         echo $'No architecture specified'
154
         echo $'No architecture specified'
152
         ARCHITECTURE=$(uname -m)
155
         ARCHITECTURE=$(uname -m)
153
-        if [[ $ARCHITECTURE == "arm"* || $ARCHITECTURE == *"aarch"* ]]; then
156
+        if [[ $ARCHITECTURE == "arm"* ]]; then
154
             GOARCH=armv6l
157
             GOARCH=armv6l
155
             echo $"Using $GOARCH"
158
             echo $"Using $GOARCH"
156
         fi
159
         fi
160
+        if [[ $ARCHITECTURE == *"aarch"* ]]; then
161
+            GOARCH=arm64
162
+            echo $"Using $GOARCH"
163
+        fi
157
         if [[ $ARCHITECTURE == "amd"* || $ARCHITECTURE == "x86_64" ]]; then
164
         if [[ $ARCHITECTURE == "amd"* || $ARCHITECTURE == "x86_64" ]]; then
158
             GOARCH=amd64
165
             GOARCH=amd64
159
             echo $"Using $GOARCH"
166
             echo $"Using $GOARCH"