diff --git a/luci-app-passwall/luasrc/passwall/com.lua b/luci-app-passwall/luasrc/passwall/com.lua index d19b4acfe..55af79950 100644 --- a/luci-app-passwall/luasrc/passwall/com.lua +++ b/luci-app-passwall/luasrc/passwall/com.lua @@ -62,10 +62,10 @@ _M["chinadns-ng"] = { default_path = "/usr/bin/chinadns-ng", match_fmt_str = "%s", file_tree = { - x86_64 = "x86_64_v4", + x86_64 = "x86_64", x86 = "i686", - mips = "mips%-.*mips32@", - mipsel = "mipsel.*mips32@", + mips = "mips%-.*mips32%+soft_float@", + mipsel = "mipsel.*mips32%+soft_float@", aarch64 = "aarch64.*v8a", armv5 = "arm.*v5te", armv6 = "arm.*v6t2", diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index 9a8ef91a0..77e28c805 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -36,7 +36,13 @@ LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \ define Package/$(PKG_NAME)/config menu "Configuration" - depends on PACKAGE_$(PKG_NAME) + +config PACKAGE_$(PKG_NAME)_INCLUDE_IPv6_Nat + depends on PACKAGE_ip6tables + bool "Include IPv6 Nat" + default n + +if PACKAGE_$(PKG_NAME) config PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy bool "Iptables Transparent Proxy" @@ -73,11 +79,6 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria select PACKAGE_hysteria default n -config PACKAGE_$(PKG_NAME)_INCLUDE_IPv6_Nat - depends on PACKAGE_ip6tables - bool "Include IPv6 Nat" - default n - config PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy bool "Include NaiveProxy" depends on !(arc||(arm&&TARGET_gemini)||armeb||mips||mips64||powerpc) @@ -139,6 +140,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin select PACKAGE_v2ray-plugin default y if aarch64||arm||i386||x86_64 +endif endmenu endef