Revert "luci: cleanup makefile (#2118)" (#2148)

This reverts commit be2abcc6c86e99a66e898d4d27c4afe58d3f2d8b.
This commit is contained in:
zhusir 2022-10-17 21:51:53 +08:00 committed by sbwml
parent b7459bfef4
commit 4bbb005d9d

View File

@ -35,131 +35,131 @@ LUCI_TITLE:=LuCI support for PassWall
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \ LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \
+dns2socks +dns2tcp +ip-full +libuci-lua +lua +luci-compat +luci-lib-jsonc \ +dns2socks +dns2tcp +ip-full +libuci-lua +lua +luci-compat +luci-lib-jsonc \
+microsocks +resolveip +tcping +unzip +microsocks +resolveip +tcping +unzip \
+PACKAGE_$(PKG_NAME)_INCLUDE_Brook:brook \
+PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG:chinadns-ng \
+PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy:haproxy \
+PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria:hysteria \
+PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-local \
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-redir \
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server:shadowsocks-libev-ss-server \
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client:shadowsocks-rust-sslocal \
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server:shadowsocks-rust-ssserver \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client:shadowsocksr-libev-ssr-local \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client:shadowsocksr-libev-ssr-redir \
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server:shadowsocksr-libev-ssr-server \
+PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs:simple-obfs \
+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_Plugin:v2ray-plugin \
+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core \
+PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin:xray-plugin
define Package/$(PKG_NAME)/config define Package/$(PKG_NAME)/config
if PACKAGE_$(PKG_NAME) menu "Configuration"
menu "PassWall Configuration"
config PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy
bool "Iptables Transparent Proxy"
select PACKAGE_dnsmasq-full
select PACKAGE_ipset
select PACKAGE_ipt2socks
select PACKAGE_iptables
select PACKAGE_iptables-legacy
select PACKAGE_iptables-mod-conntrack-extra
select PACKAGE_iptables-mod-iprange
select PACKAGE_iptables-mod-socket
select PACKAGE_iptables-mod-tproxy
select PACKAGE_kmod-ipt-nat
default y if ! PACKAGE_firewall4
config PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy config PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy
bool "Nftables Transparent Proxy" bool "Iptables Transparent Proxy"
select PACKAGE_dnsmasq-full select PACKAGE_dnsmasq-full
select PACKAGE_nftables select PACKAGE_ipset
select PACKAGE_kmod-nft-socket select PACKAGE_ipt2socks
select PACKAGE_kmod-nft-tproxy select PACKAGE_iptables
select PACKAGE_kmod-nft-nat select PACKAGE_iptables-legacy
default y if PACKAGE_firewall4 select PACKAGE_iptables-mod-conntrack-extra
select PACKAGE_iptables-mod-iprange
select PACKAGE_iptables-mod-socket
select PACKAGE_iptables-mod-tproxy
select PACKAGE_kmod-ipt-nat
default y if ! PACKAGE_firewall4
config PACKAGE_$(PKG_NAME)_INCLUDE_Brook config PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy
bool "Include Brook" bool "Nftables Transparent Proxy"
select PACKAGE_brook select PACKAGE_dnsmasq-full
default n select PACKAGE_nftables
select PACKAGE_kmod-nft-socket
select PACKAGE_kmod-nft-tproxy
select PACKAGE_kmod-nft-nat
default y if PACKAGE_firewall4
config PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG config PACKAGE_$(PKG_NAME)_INCLUDE_Brook
bool "Include ChinaDNS-NG" bool "Include Brook"
select PACKAGE_ipset default n
select PACKAGE_chinadns-ng
default n
config PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy config PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG
bool "Include Haproxy" bool "Include ChinaDNS-NG"
select PACKAGE_haproxy select PACKAGE_ipset
default y if aarch64||arm||i386||x86_64 default n
config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria config PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy
bool "Include Hysteria" bool "Include Haproxy"
select PACKAGE_hysteria default y if aarch64||arm||i386||x86_64
default n
config PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
bool "Include NaiveProxy" bool "Include Hysteria"
depends on !(arc||(arm&&TARGET_gemini)||armeb||mips||mips64||powerpc) default n
select PACKAGE_naiveproxy
default n
config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client config PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy
bool "Include Shadowsocks Libev Client" bool "Include NaiveProxy"
select PACKAGE_shadowsocks-libev-ss-local depends on !(arc||(arm&&TARGET_gemini)||armeb||mips||mips64||powerpc)
select PACKAGE_shadowsocks-libev-ss-redir default n
default y
config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client
bool "Include Shadowsocks Libev Server" bool "Include Shadowsocks Libev Client"
select PACKAGE_shadowsocks-libev-ss-server default y
default y if aarch64||arm||i386||x86_64
config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server
bool "Include Shadowsocks Rust Client" bool "Include Shadowsocks Libev Server"
depends on aarch64||arm||i386||mips||mipsel||x86_64 default y if aarch64||arm||i386||x86_64
select PACKAGE_shadowsocks-rust-sslocal
default y if aarch64
config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client
bool "Include Shadowsocks Rust Server" bool "Include Shadowsocks Rust Client"
depends on aarch64||arm||i386||mips||mipsel||x86_64 depends on aarch64||arm||i386||mips||mipsel||x86_64
select PACKAGE_shadowsocks-rust-ssserver default y if aarch64
default n
config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server
bool "Include ShadowsocksR Libev Client" bool "Include Shadowsocks Rust Server"
select PACKAGE_shadowsocksr-libev-ssr-local depends on aarch64||arm||i386||mips||mipsel||x86_64
select PACKAGE_shadowsocksr-libev-ssr-redir default n
default y
config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client
bool "Include ShadowsocksR Libev Server" bool "Include ShadowsocksR Libev Client"
select PACKAGE_shadowsocksr-libev-ssr-server default y
default n
config PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server
bool "Include Simple-Obfs (Shadowsocks Plugin)" bool "Include ShadowsocksR Libev Server"
select PACKAGE_simple-obfs default n
default y
config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_GO config PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs
bool "Include Trojan-GO" bool "Include Simple-Obfs (Shadowsocks Plugin)"
select PACKAGE_trojan-go default y
default n
config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_GO
bool "Include Trojan-Plus" bool "Include Trojan-GO"
select PACKAGE_trojan-plus default n
default y
config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus
bool "Include V2ray" bool "Include Trojan-Plus"
select PACKAGE_v2ray-core default y
default y if aarch64||arm||i386||x86_64
config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray
bool "Include V2ray-Plugin (Shadowsocks Plugin)" bool "Include V2ray"
select PACKAGE_v2ray-plugin default y if aarch64||arm||i386||x86_64
default y if aarch64||arm||i386||x86_64
config PACKAGE_$(PKG_NAME)_INCLUDE_Xray config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin
bool "Include Xray" bool "Include V2ray-Plugin (Shadowsocks Plugin)"
select PACKAGE_xray-core default y if aarch64||arm||i386||x86_64
default y if aarch64||arm||i386||x86_64
config PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin config PACKAGE_$(PKG_NAME)_INCLUDE_Xray
bool "Include Xray-Plugin (Shadowsocks Plugin)" bool "Include Xray"
select PACKAGE_xray-plugin default y if aarch64||arm||i386||x86_64
default n
endmenu config PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin
endif bool "Include Xray-Plugin (Shadowsocks Plugin)"
default n
endmenu
endef endef
define Package/$(PKG_NAME)/conffiles define Package/$(PKG_NAME)/conffiles