From 4722276f196143975b640dc26f27d30c9d6a39a7 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Tue, 21 Jul 2020 13:45:02 +0800
Subject: [PATCH] luci-app-turboacc: fix typo error

---
 package/lean/luci-app-turboacc/Makefile       | 27 ++++++++++++-------
 .../luasrc/model/cbi/turboacc.lua             |  2 +-
 .../luci-app-turboacc/po/zh_Hans/turboacc.po  |  2 +-
 package/ntlf9t/AdGuardHome/Makefile           |  6 -----
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/package/lean/luci-app-turboacc/Makefile b/package/lean/luci-app-turboacc/Makefile
index e5cf88d869..f474a4c578 100644
--- a/package/lean/luci-app-turboacc/Makefile
+++ b/package/lean/luci-app-turboacc/Makefile
@@ -7,10 +7,10 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for Flow Offload / Shortcut-FE
 LUCI_DEPENDS:=+pdnsd-alt \
-              +PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe:kmod-fast-classifier \
-              +PACKAGE_luci-app-turboacc_INCLUDE_flow-offload:kmod-ipt-offload \
-              +PACKAGE_luci-app-turboacc_INCLUDE_bbr-cca:kmod-tcp-bbr \
-              +PACKAGE_luci-app-turboacc_INCLUDE_dnsforwarder:dnsforwarder
+              +PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe:kmod-fast-classifier \
+              +PACKAGE_$(PKG_NAME)_INCLUDE_flow-offload:kmod-ipt-offload \
+              +PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca:kmod-tcp-bbr \
+              +PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder:dnsforwarder
 LUCI_PKGARCH:=all
 
 PKG_NAME:=luci-app-turboacc
@@ -19,24 +19,31 @@ PKG_RELEASE:=1
 
 PKG_LICENSE:=GPLv3.0+
 
-define Package/luci-app-turboacc/config
-config PACKAGE_luci-app-turboacc_INCLUDE_shortcut-fe
+define Package/$(PKG_NAME)/config
+config PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe
 	bool "Include Shortcut-FE"
-	depends on PACKAGE_luci-app-turboacc_INCLUDE_flow-offload=n
+	depends on PACKAGE_$(PKG_NAME)_INCLUDE_flow-offload=n
 	default n
 
-config PACKAGE_luci-app-turboacc_INCLUDE_flow-offload
+config PACKAGE_$(PKG_NAME)_INCLUDE_flow-offload
 	bool "Include Flow Offload"
 	default y
 
-config PACKAGE_luci-app-turboacc_INCLUDE_bbr-cca
+config PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca
 	bool "Include BBR CCA"
 	default y
 
-config PACKAGE_luci-app-turboacc_INCLUDE_dnsforwarder
+config PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder
 	bool "Include DNSForwarder"
 	default n
 endef
+
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_shortcut-fe \
+	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_flow-offload \
+	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_bbr-cca \
+	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_dnsforwarder
+
 include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/package/lean/luci-app-turboacc/luasrc/model/cbi/turboacc.lua b/package/lean/luci-app-turboacc/luasrc/model/cbi/turboacc.lua
index 94c342873d..54bcb9ebd0 100644
--- a/package/lean/luci-app-turboacc/luasrc/model/cbi/turboacc.lua
+++ b/package/lean/luci-app-turboacc/luasrc/model/cbi/turboacc.lua
@@ -69,7 +69,7 @@ dns_caching.default = 0
 dns_caching.rmempty = false
 dns_caching.description = translate("Enable DNS Caching and anti ISP DNS pollution")
 
-dns_caching_mode = s:option(ListValue, "dns_caching_mode", translate("Resolve DNS Mode"), translate("Only PDNSD and DNSForwarder is suppoted now"))
+dns_caching_mode = s:option(ListValue, "dns_caching_mode", translate("Resolve DNS Mode"), translate("Only PDNSD and DNSForwarder is supported now"))
 dns_caching_mode:value("1", translate("Using PDNSD to query and cache"))
 if nixio.fs.access("/usr/bin/dnsforwarder") then
 dns_caching_mode:value("2", translate("Using DNSForwarder to query and cache"))
diff --git a/package/lean/luci-app-turboacc/po/zh_Hans/turboacc.po b/package/lean/luci-app-turboacc/po/zh_Hans/turboacc.po
index 0a13b3a74e..42acab59a4 100644
--- a/package/lean/luci-app-turboacc/po/zh_Hans/turboacc.po
+++ b/package/lean/luci-app-turboacc/po/zh_Hans/turboacc.po
@@ -67,7 +67,7 @@ msgstr "启用 DNS 多线程查询、缓存，并防止 ISP 的 DNS 广告和域
 msgid "Resolve DNS Mode"
 msgstr "DNS 解析方式"
 
-msgid "Only PDNSD and DNSForwarder is suppoted now"
+msgid "Only PDNSD and DNSForwarder is supported now"
 msgstr "目前仅支持 PDNSD 和 DNSForwarder"
 
 msgid "Using PDNSD to query and cache"
diff --git a/package/ntlf9t/AdGuardHome/Makefile b/package/ntlf9t/AdGuardHome/Makefile
index 7ba5206086..4d77bcd39d 100644
--- a/package/ntlf9t/AdGuardHome/Makefile
+++ b/package/ntlf9t/AdGuardHome/Makefile
@@ -28,12 +28,6 @@ GO_PKG_EXCLUDES:=dhcpd/standalone
 GO_PKG_LDFLAGS:=-s -w
 GO_PKG_LDFLAGS_X:=main.version=$(PKG_VERSION) main.channel=release
 
-ifneq ($(findstring $(ARCH),mips mipsel),)
-	ADG_CONF_NAME:=small_flash
-else
-	ADG_CONF_NAME:=big_space
-endif
-
 include $(INCLUDE_DIR)/package.mk
 include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk