diff --git a/lean/autocore/files/arm/sbin/usage b/lean/autocore/files/arm/sbin/usage index 099ee5a8..b027465b 100755 --- a/lean/autocore/files/arm/sbin/usage +++ b/lean/autocore/files/arm/sbin/usage @@ -1,21 +1,14 @@ #!/bin/sh NSS_PATH="/sys/kernel/debug/qca-nss-drv/stats" -ATH11K_NSS_OFFLOAD="/sys/module/ath11k/parameters/nss_offload" cpu_usage="$(busybox top -n1 | awk '/^CPU/ {printf("%d%", 100 - $8)}')" [ ! -d "$NSS_PATH" ] || \ npu_usage="$(grep '%' "$NSS_PATH"/cpu_load_ubi | awk -F ' ' '{print $2}')" -if [ -e "$ATH11K_NSS_OFFLOAD" ]; then - if [ "$(cat "$ATH11K_NSS_OFFLOAD" 2>/dev/null)" = "1" ]; then - wifi="with WiFi" - fi -fi - if [ -d "$NSS_PATH" ]; then - echo -n "CPU: ${cpu_usage}, NPU${wifi}: ${npu_usage}" + echo -n "CPU: ${cpu_usage}, NPU: ${npu_usage}" else echo -n "CPU: ${cpu_usage}" fi diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index b3ebf645..8be2a1e4 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -56,6 +56,7 @@ choice config PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy bool "Iptables Transparent Proxy" + depends on !PACKAGE_firewall4 select PACKAGE_dnsmasq_full_ipset select PACKAGE_ipset select PACKAGE_iptables @@ -68,6 +69,7 @@ config PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy config PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy bool "Nftables Transparent Proxy" + depends on PACKAGE_firewall4 select PACKAGE_dnsmasq_full_nftset select PACKAGE_nftables select PACKAGE_kmod-nft-socket diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile index bb0ed15d..219c8e61 100644 --- a/v2ray-geodata/Makefile +++ b/v2ray-geodata/Makefile @@ -30,13 +30,13 @@ define Download/geosite HASH:=680b8a378b94b69e6398cd05d5b5b016cb0809fad30f385211ce91a5a0f74815 endef -GEOSITE_IRAN_VER:=202606150209 +GEOSITE_IRAN_VER:=202606220211 GEOSITE_IRAN_FILE:=iran.dat.$(GEOSITE_IRAN_VER) define Download/geosite-ir URL:=https://github.com/bootmortis/iran-hosted-domains/releases/download/$(GEOSITE_IRAN_VER)/ URL_FILE:=iran.dat FILE:=$(GEOSITE_IRAN_FILE) - HASH:=2ae051203f836c859169a46c81b2ce177b608c2a95897c47db5e3cce446cdea9 + HASH:=596b39400e76b76153bbf65e06a5b262c12484a86e3d79b3b03612bc7b4ae8d8 endef define Package/v2ray-geodata/template