Skip to content

Commit 1c7dbfe

Browse files
committed
Updated install scripts and added ARMv6 supports.
1 parent c2d3728 commit 1c7dbfe

File tree

6 files changed

+23
-8
lines changed

6 files changed

+23
-8
lines changed

.github/build/build_info.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"386": {"arch": "i686", "name": "linux-32"},
44
"amd64": {"arch": "x86_64", "name": "linux-64"},
55
"arm5": {"arch": "arm", "abi": "eabi", "name": "linux-arm32-v5"},
6+
"arm6": {"arch": "armv5l", "abi": "eabihf", "name": "linux-arm32-v6"},
67
"arm7": {"arch": "armv7l", "abi": "eabihf", "name": "linux-arm32-v7a"},
78
"arm64": {"arch": "aarch64", "name": "linux-arm64-v8a"}
89
},

.github/workflows/build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,17 @@ jobs:
8585
- goarch: 386
8686
goos: darwin
8787
include:
88-
# BEGIN Linux ARM 5 7
88+
# BEGIN Linux ARM 5 6 7
8989
- goos: linux
9090
goarch: arm
9191
goarm: 7
92+
- goos: linux
93+
goarch: arm
94+
goarm: 6
9295
- goos: linux
9396
goarch: arm
9497
goarm: 5
95-
# END Linux ARM 5 7
98+
# END Linux ARM 5 6 7
9699
env:
97100
CGO_ENABLED: 1
98101
GOOS: ${{ matrix.goos }}

README-zh_CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Nginx UI 遵循 Nginx 的标准,创建的网站配置文件位于 Nginx 配置
107107
Nginx UI 可在以下平台中使用:
108108

109109
- Mac OS X 10.10 Yosemite 及之后版本(amd64 / arm64)
110-
- Linux 2.6.23 及之后版本(x86 / amd64 / arm64)
110+
- Linux 2.6.23 及之后版本(x86 / amd64 / arm64 / armv5 / armv6 / armv7
111111
- 包括但不限于 Debian 7 / 8、Ubuntu 12.04 / 14.04 及后续版本、CentOS 6 / 7、Arch Linux
112112
- FreeBSD (x86 / amd64)
113113
- OpenBSD (x86 / amd64)

README-zh_TW.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Nginx UI 遵循 Nginx 的標準,建立的網站配置檔案位於 Nginx 配置
107107
Nginx UI 可在以下平臺中使用:
108108

109109
- Mac OS X 10.10 Yosemite 及之後版本(amd64 / arm64)
110-
- Linux 2.6.23 及之後版本(x86 / amd64 / arm64)
110+
- Linux 2.6.23 及之後版本(x86 / amd64 / arm64 / armv5 / armv6 / armv7
111111
- 包括但不限於 Debian 7 / 8、Ubuntu 12.04 / 14.04 及後續版本、CentOS 6 / 7、Arch Linux
112112
- FreeBSD (x86 / amd64)
113113
- OpenBSD (x86 / amd64)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ to the `sites-enabled` directory. Therefore, you may need to adjust the way the
105105
Nginx UI is available on the following platforms:
106106

107107
- Mac OS X 10.10 Yosemite and later (amd64 / arm64)
108-
- Linux 2.6.23 and later (x86 / amd64 / arm64)
108+
- Linux 2.6.23 and later (x86 / amd64 / arm64 / armv5 / armv6 / armv7)
109109
- Including but not limited to Debian 7 / 8, Ubuntu 12.04 / 14.04 and later, CentOS 6 / 7, Arch Linux
110110
- FreeBSD (x86 / amd64)
111111
- OpenBSD (x86 / amd64)

install.sh

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,24 @@ identify_the_operating_system_and_architecture() {
134134
if [[ "$(uname)" == 'Linux' ]]; then
135135
case "$(uname -m)" in
136136
'i386' | 'i686')
137-
MACHINE='386'
137+
MACHINE='32'
138138
;;
139139
'amd64' | 'x86_64')
140-
MACHINE='amd64'
140+
MACHINE='64'
141+
;;
142+
'armv5tel')
143+
MACHINE='arm32-v5'
144+
;;
145+
'armv6l')
146+
MACHINE='arm32-v6'
147+
grep Features /proc/cpuinfo | grep -qw 'vfp' || MACHINE='arm32-v5'
148+
;;
149+
'armv7' | 'armv7l')
150+
MACHINE='arm32-v7a'
151+
grep Features /proc/cpuinfo | grep -qw 'vfp' || MACHINE='arm32-v5'
141152
;;
142153
'armv8' | 'aarch64')
143-
MACHINE='arm64'
154+
MACHINE='arm64-v8a'
144155
;;
145156
*)
146157
echo -e "${FontRed}error: The architecture is not supported.${FontSuffix}"

0 commit comments

Comments
 (0)