diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index 4ba9f324d..ed9770f07 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -27,10 +27,10 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_GO \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \ + CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Geodata \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray \ - CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin \ - CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Geodata + CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin LUCI_TITLE:=LuCI support for PassWall LUCI_PKGARCH:=all @@ -54,11 +54,11 @@ LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \ +PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_GO:trojan-go \ +PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus:trojan-plus \ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray-core \ + +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Geodata:v2ray-geoip \ + +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Geodata:v2ray-geosite \ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin:v2ray-plugin \ +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core \ - +PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin:xray-plugin \ - +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Geodata:v2ray-geoip \ - +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Geodata:v2ray-geosite + +PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin:xray-plugin define Package/$(PKG_NAME)/config menu "Configuration" @@ -152,6 +152,10 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray bool "Include V2ray" default y if aarch64||arm||i386||x86_64 +config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Geodata + bool "Include V2ray_Geodata" + default n + config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin bool "Include V2ray-Plugin (Shadowsocks Plugin)" default y if aarch64||arm||i386||x86_64 @@ -164,10 +168,6 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin bool "Include Xray-Plugin (Shadowsocks Plugin)" default n -config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Geodata - bool "Include V2ray_Geodata" - default n - endmenu endef