OpenWrt
/
small
mirror of https://github.com/kenzok8/small.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update 2024-07-17 20:21:31

This commit is contained in:
actions-user 2024-07-17 20:21:31 +08:00
parent 3c588f419e
commit cb1e689d72
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
luci-app-passwall/luasrc/passwall/api.lua
View File

@ -14,6 +14,7 @@ curl_args = { "-skfL", "--connect-timeout 3", "--retry 3" }
command_timeout = 300 command_timeout = 300
OPENWRT_ARCH = nil OPENWRT_ARCH = nil
DISTRIB_ARCH = nil DISTRIB_ARCH = nil
OPENWRT_BOARD = nil
LOG_FILE = "/tmp/log/" .. appname .. ".log" LOG_FILE = "/tmp/log/" .. appname .. ".log"
CACHE_PATH = "/tmp/etc/" .. appname .. "_tmp" CACHE_PATH = "/tmp/etc/" .. appname .. "_tmp"
@ -620,7 +621,9 @@ local function auto_get_arch()
local arch = nixio.uname().machine or "" local arch = nixio.uname().machine or ""
if not OPENWRT_ARCH and fs.access("/usr/lib/os-release") then if not OPENWRT_ARCH and fs.access("/usr/lib/os-release") then
OPENWRT_ARCH = sys.exec("echo -n $(grep 'OPENWRT_ARCH' /usr/lib/os-release | awk -F '[\\042\\047]' '{print $2}')") OPENWRT_ARCH = sys.exec("echo -n $(grep 'OPENWRT_ARCH' /usr/lib/os-release | awk -F '[\\042\\047]' '{print $2}')")
OPENWRT_BOARD = sys.exec("echo -n $(grep 'OPENWRT_BOARD' /usr/lib/os-release | awk -F '[\\042\\047]' '{print $2}')")
if OPENWRT_ARCH == "" then OPENWRT_ARCH = nil end if OPENWRT_ARCH == "" then OPENWRT_ARCH = nil end
if OPENWRT_BOARD == "" then OPENWRT_BOARD = nil end
end end
if not DISTRIB_ARCH and fs.access("/etc/openwrt_release") then if not DISTRIB_ARCH and fs.access("/etc/openwrt_release") then
DISTRIB_ARCH = sys.exec("echo -n $(grep 'DISTRIB_ARCH' /etc/openwrt_release | awk -F '[\\042\\047]' '{print $2}')") DISTRIB_ARCH = sys.exec("echo -n $(grep 'DISTRIB_ARCH' /etc/openwrt_release | awk -F '[\\042\\047]' '{print $2}')")
@ -651,6 +654,10 @@ local function auto_get_arch()
end end
end end
if arch == "aarch64" and OPENWRT_BOARD and OPENWRT_BOARD:match("rockchip") ~= nil then
arch = "rockchip"
end
return util.trim(arch) return util.trim(arch)
end end
@ -696,8 +703,9 @@ local default_file_tree = {
x86_64 = "amd64", x86_64 = "amd64",
x86 = "386", x86 = "386",
aarch64 = "arm64", aarch64 = "arm64",
rockchip = "arm64",
mips = "mips", mips = "mips",
mipsel = "mipsle", mipsel = "mipsel",
armv5 = "arm.*5", armv5 = "arm.*5",
armv6 = "arm.*6[^4]*", armv6 = "arm.*6[^4]*",
armv7 = "arm.*7", armv7 = "arm.*7",

19
luci-app-passwall/luasrc/passwall/com.lua
View File

@ -62,15 +62,16 @@ _M["chinadns-ng"] = {
default_path = "/usr/bin/chinadns-ng", default_path = "/usr/bin/chinadns-ng",
match_fmt_str = "%s", match_fmt_str = "%s",
file_tree = { file_tree = {
x86_64 = "x86_64@", x86_64 = "wolfssl@x86_64.*x86_64@",
x86 = "i686", x86 = "wolfssl@i386.*i686",
mips = "mips%-.*mips32%+soft_float@", mips = "wolfssl@mips%-.*mips32%+soft_float@",
mipsel = "mipsel.*mips32%+soft_float@", mipsel = "wolfssl@mipsel.*mips32%+soft_float@",
aarch64 = "aarch64.*v8a", aarch64 = "wolfssl_noasm@aarch64.*v8a",
armv5 = "arm.*v5te", rockchip = "wolfssl@aarch64.*v8a",
armv6 = "arm.*v6t2", armv5 = "wolfssl@arm.*v5te",
armv7 = "eabihf.*v7a", armv6 = "wolfssl@arm.*v6t2",
armv8 = "aarch64.*v8a" armv7 = "wolfssl@arm.*eabihf.*v7a",
armv8 = "wolfssl_noasm@aarch64.*v8a"
} }
} }