1
0
Эх сурвалжийг харах

Updated install scripts and added ARMv6 supports.

Hintay 2 жил өмнө
parent
commit
1c7dbfe63a

+ 1 - 0
.github/build/build_info.json

@@ -3,6 +3,7 @@
         "386": {"arch": "i686", "name": "linux-32"},
         "amd64": {"arch": "x86_64", "name": "linux-64"},
         "arm5": {"arch": "arm", "abi": "eabi", "name": "linux-arm32-v5"},
+        "arm6": {"arch": "armv5l", "abi": "eabihf", "name": "linux-arm32-v6"},
         "arm7": {"arch": "armv7l", "abi": "eabihf", "name": "linux-arm32-v7a"},
         "arm64": {"arch": "aarch64", "name": "linux-arm64-v8a"}
     },

+ 5 - 2
.github/workflows/build.yml

@@ -85,14 +85,17 @@ jobs:
                     - goarch: 386
                       goos: darwin
                 include:
-                    # BEGIN Linux ARM 5 7
+                    # BEGIN Linux ARM 5 6 7
                     - goos: linux
                       goarch: arm
                       goarm: 7
+                    - goos: linux
+                      goarch: arm
+                      goarm: 6
                     - goos: linux
                       goarch: arm
                       goarm: 5
-                    # END Linux ARM 5 7
+                    # END Linux ARM 5 6 7
         env:
             CGO_ENABLED: 1
             GOOS: ${{ matrix.goos }}

+ 1 - 1
README-zh_CN.md

@@ -107,7 +107,7 @@ Nginx UI 遵循 Nginx 的标准,创建的网站配置文件位于 Nginx 配置
 Nginx UI 可在以下平台中使用:
 
 - Mac OS X 10.10 Yosemite 及之后版本(amd64 / arm64)
-- Linux 2.6.23 及之后版本(x86 / amd64 / arm64)
+- Linux 2.6.23 及之后版本(x86 / amd64 / arm64 / armv5 / armv6 / armv7
   - 包括但不限于 Debian 7 / 8、Ubuntu 12.04 / 14.04 及后续版本、CentOS 6 / 7、Arch Linux
 - FreeBSD (x86 / amd64)
 - OpenBSD (x86 / amd64)

+ 1 - 1
README-zh_TW.md

@@ -107,7 +107,7 @@ Nginx UI 遵循 Nginx 的標準,建立的網站配置檔案位於 Nginx 配置
 Nginx UI 可在以下平臺中使用:
 
 - Mac OS X 10.10 Yosemite 及之後版本(amd64 / arm64)
-- Linux 2.6.23 及之後版本(x86 / amd64 / arm64)
+- Linux 2.6.23 及之後版本(x86 / amd64 / arm64 / armv5 / armv6 / armv7
   - 包括但不限於 Debian 7 / 8、Ubuntu 12.04 / 14.04 及後續版本、CentOS 6 / 7、Arch Linux
 - FreeBSD (x86 / amd64)
 - OpenBSD (x86 / amd64)

+ 1 - 1
README.md

@@ -105,7 +105,7 @@ to the `sites-enabled` directory. Therefore, you may need to adjust the way the
 Nginx UI is available on the following platforms:
 
 - Mac OS X 10.10 Yosemite and later (amd64 / arm64)
-- Linux 2.6.23 and later (x86 / amd64 / arm64)
+- Linux 2.6.23 and later (x86 / amd64 / arm64 / armv5 / armv6 / armv7)
   - Including but not limited to Debian 7 / 8, Ubuntu 12.04 / 14.04 and later, CentOS 6 / 7, Arch Linux
 - FreeBSD (x86 / amd64)
 - OpenBSD (x86 / amd64)

+ 14 - 3
install.sh

@@ -134,13 +134,24 @@ identify_the_operating_system_and_architecture() {
     if [[ "$(uname)" == 'Linux' ]]; then
         case "$(uname -m)" in
         'i386' | 'i686')
-            MACHINE='386'
+            MACHINE='32'
             ;;
         'amd64' | 'x86_64')
-            MACHINE='amd64'
+            MACHINE='64'
+            ;;
+        'armv5tel')
+            MACHINE='arm32-v5'
+            ;;
+        'armv6l')
+            MACHINE='arm32-v6'
+            grep Features /proc/cpuinfo | grep -qw 'vfp' || MACHINE='arm32-v5'
+            ;;
+        'armv7' | 'armv7l')
+            MACHINE='arm32-v7a'
+            grep Features /proc/cpuinfo | grep -qw 'vfp' || MACHINE='arm32-v5'
             ;;
         'armv8' | 'aarch64')
-            MACHINE='arm64'
+            MACHINE='arm64-v8a'
             ;;
         *)
             echo -e "${FontRed}error: The architecture is not supported.${FontSuffix}"