From 8d52798669690c257f6cc1ff98fd5b0dccd33b2f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 13 Jul 2022 16:26:23 +0800
Subject: [PATCH] update 2022-07-13 16:26:23

---
 luci-app-mosdns/Makefile                               |  2 +-
 mosdns/Makefile                                        |  6 +++---
 my-default-settings/Makefile                           | 10 +++++-----
 .../etc/hotplug.d/iface/12-rk3328                      |  0
 .../{files => base-files}/etc/init.d/fa-fancontrol     |  0
 .../{files => base-files}/usr/bin/fa-fancontrol.sh     |  0
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename my-default-settings/target/rockchip/armv8/{files => base-files}/etc/hotplug.d/iface/12-rk3328 (100%)
 rename my-default-settings/target/rockchip/armv8/{files => base-files}/etc/init.d/fa-fancontrol (100%)
 rename my-default-settings/target/rockchip/armv8/{files => base-files}/usr/bin/fa-fancontrol.sh (100%)

diff --git a/luci-app-mosdns/Makefile b/luci-app-mosdns/Makefile
index f44cea9aa..2aff025bd 100644
--- a/luci-app-mosdns/Makefile
+++ b/luci-app-mosdns/Makefile
@@ -6,7 +6,7 @@ PKG_RELEASE:=1
 
 LUCI_TITLE:=LuCI Support for mosdns
 LUCI_PKGARCH:=all
-LUCI_DEPENDS:=+mosdns-neo +jsonfilter +bash +luci-compat +v2ray-geoip +v2ray-geosite
+LUCI_DEPENDS:=+mosdns +jsonfilter +bash +luci-compat +v2ray-geoip +v2ray-geosite
 
 define Package/$(PKG_NAME)/conffiles
 /etc/mosdns/cus_config.yaml
diff --git a/mosdns/Makefile b/mosdns/Makefile
index 7f5c3bf7b..f1ba01814 100644
--- a/mosdns/Makefile
+++ b/mosdns/Makefile
@@ -44,7 +44,7 @@ define Package/mosdns
   DEPENDS:=$(GO_ARCH_DEPENDS)
 endef
 
-define Package/mosdns-neo
+define Package/mosdns
   $(call Package/mosdns/Default)
   DEPENDS:=$(GO_ARCH_DEPENDS)
 endef
@@ -81,10 +81,10 @@ define Package/mosdns/install
 	$(call GoPackage/Package/Install/Bin,$(1))
 endef
 
-define Package/mosdns-neo/install
+define Package/mosdns/install
 	$(call GoPackage/Package/Install/Bin,$(1))
 endef
 
 $(eval $(call GoBinPackage,mosdns))
 $(eval $(call BuildPackage,mosdns))
-$(eval $(call BuildPackage,mosdns-neo))
+$(eval $(call BuildPackage,mosdns))
diff --git a/my-default-settings/Makefile b/my-default-settings/Makefile
index 5b34d7422..43624e3a8 100644
--- a/my-default-settings/Makefile
+++ b/my-default-settings/Makefile
@@ -29,7 +29,7 @@ define Package/$(PKG_NAME)/conffiles
 endef
 
 define Build/Prepare
-	chmod -R +x ./files/bin ./files/sbin ./files/etc/profile.d ./files/etc/rc.d ./files/usr/share target/*/{*,}/files/{etc/init.d,usr/bin} >/dev/null || true
+	chmod -R +x ./files/bin ./files/sbin ./files/etc/profile.d ./files/etc/rc.d ./files/usr/share target/*/{*,}/base-files/{etc/init.d,usr/bin} >/dev/null || true
 endef
 
 define Build/Compile
@@ -38,11 +38,11 @@ endef
 define Package/$(PKG_NAME)/install
 	$(CP) ./files/* $(1)/
 	echo $(BOARD)$(TARGETID)
-	if [ -d ./target/$(BOARD)/files/. ]; then \
-		$(CP) ./target/$(BOARD)/files/* $(1)/; \
+	if [ -d ./target/$(BOARD)/base-files/. ]; then \
+		$(CP) ./target/$(BOARD)/base-files/* $(1)/; \
 	fi
-	if [ -d ./target/$(TARGETID)/files/. ]; then \
-		$(CP) ./target/$(TARGETID)/files/* $(1)/; \
+	if [ -d ./target/$(TARGETID)/base-files/. ]; then \
+		$(CP) ./target/$(TARGETID)/base-files/* $(1)/; \
 	fi; \
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
 	po2lmo ./po/zh_Hans/default.po $(1)/usr/lib/lua/luci/i18n/default.zh-cn.lmo
diff --git a/my-default-settings/target/rockchip/armv8/files/etc/hotplug.d/iface/12-rk3328 b/my-default-settings/target/rockchip/armv8/base-files/etc/hotplug.d/iface/12-rk3328
similarity index 100%
rename from my-default-settings/target/rockchip/armv8/files/etc/hotplug.d/iface/12-rk3328
rename to my-default-settings/target/rockchip/armv8/base-files/etc/hotplug.d/iface/12-rk3328
diff --git a/my-default-settings/target/rockchip/armv8/files/etc/init.d/fa-fancontrol b/my-default-settings/target/rockchip/armv8/base-files/etc/init.d/fa-fancontrol
similarity index 100%
rename from my-default-settings/target/rockchip/armv8/files/etc/init.d/fa-fancontrol
rename to my-default-settings/target/rockchip/armv8/base-files/etc/init.d/fa-fancontrol
diff --git a/my-default-settings/target/rockchip/armv8/files/usr/bin/fa-fancontrol.sh b/my-default-settings/target/rockchip/armv8/base-files/usr/bin/fa-fancontrol.sh
similarity index 100%
rename from my-default-settings/target/rockchip/armv8/files/usr/bin/fa-fancontrol.sh
rename to my-default-settings/target/rockchip/armv8/base-files/usr/bin/fa-fancontrol.sh