From c1893ee1b45278215c70b2852ededcde126da6d1 Mon Sep 17 00:00:00 2001
From: fatedier <fatedier@gmail.com>
Date: Thu, 25 Apr 2024 13:08:41 +0800
Subject: [PATCH] adjust arm compilation configuration (#4181)

---
 Makefile.cross-compiles | 11 ++++++++---
 README.md               |  1 -
 package.sh              |  2 +-
 server/dashboard_api.go |  2 --
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile.cross-compiles b/Makefile.cross-compiles
index 9ff163c..564e99f 100644
--- a/Makefile.cross-compiles
+++ b/Makefile.cross-compiles
@@ -2,7 +2,7 @@ export PATH := $(PATH):`go env GOPATH`/bin
 export GO111MODULE=on
 LDFLAGS := -s -w
 
-os-archs=darwin:amd64 darwin:arm64 freebsd:amd64 linux:amd64 linux:arm linux:arm:6 linux:arm64 windows:amd64 windows:arm64 linux:mips64 linux:mips64le linux:mips:softfloat linux:mipsle:softfloat linux:riscv64 android:arm64
+os-archs=darwin:amd64 darwin:arm64 freebsd:amd64 linux:amd64 linux:arm:7 linux:arm:5 linux:arm64 windows:amd64 windows:arm64 linux:mips64 linux:mips64le linux:mips:softfloat linux:mipsle:softfloat linux:riscv64 android:arm64
 
 all: build
 
@@ -16,8 +16,13 @@ app:
 		flags=''; \
 		target_suffix=$${os}_$${arch}; \
 		if [ "$${os}" = "linux" ] && [ "$${arch}" = "arm" ] && [ "$${extra}" != "" ] ; then \
-			flags=GOARM=$${extra}; \
-			target_suffix=$${os}_$${arch}_$${extra}; \
+			if [ "$${extra}" = "7" ]; then \
+				flags=GOARM=7; \
+				target_suffix=$${os}_arm_hf; \
+			elif [ "$${extra}" = "5" ]; then \
+				flags=GOARM=5; \
+				target_suffix=$${os}_arm; \
+			fi; \
 		elif [ "$${os}" = "linux" ] && ([ "$${arch}" = "mips" ] || [ "$${arch}" = "mipsle" ]) && [ "$${extra}" != "" ] ; then \
 		    flags=GOMIPS=$${extra}; \
 		fi; \
diff --git a/README.md b/README.md
index 25b007f..f3641f0 100644
--- a/README.md
+++ b/README.md
@@ -352,7 +352,6 @@ You may substitute `https2https` for the plugin, and point the `localAddr` to a
   # frpc.toml
   serverAddr = "x.x.x.x"
   serverPort = 7000
-  vhostHTTPSPort = 443
 
   [[proxies]]
   name = "test_https2http"
diff --git a/package.sh b/package.sh
index 8bdcbc9..df36108 100755
--- a/package.sh
+++ b/package.sh
@@ -19,7 +19,7 @@ mkdir -p ./release/packages
 
 os_all='linux windows darwin freebsd android'
 arch_all='386 amd64 arm arm64 mips64 mips64le mips mipsle riscv64'
-extra_all='_ 6'
+extra_all='_ hf'
 
 cd ./release
 
diff --git a/server/dashboard_api.go b/server/dashboard_api.go
index ce5a4c7..f34da4e 100644
--- a/server/dashboard_api.go
+++ b/server/dashboard_api.go
@@ -32,8 +32,6 @@ import (
 	"github.com/fatedier/frp/pkg/util/version"
 )
 
-// TODO(fatedier): add an API to clean status of all offline proxies.
-
 type GeneralResponse struct {
 	Code int
 	Msg  string