Merge Mainline

2020-04-23 02:54:31 +08:00 · 2020-04-23 02:54:31 +08:00 · 91c64798df
commit 91c64798df
parent 8e2e62cb6f 1e3f993f39
5 changed files with 4 additions and 6 deletions
--- a/package/ctcgfw/luci-app-gost/Makefile
+++ b/package/ctcgfw/luci-app-gost/Makefile
@ -11,7 +11,7 @@ PKG_NAME:=luci-app-gost
 PKG_VERSION:=1.0
 PKG_RELEASE:=1
 LUCI_TITLE:=LuCI support for Gost
-LUCI_DEPENDS:=+gost +iptables
+LUCI_DEPENDS:=+gost
 LUCI_PKGARCH:=all

 PKG_MAINTAINER:=[CTCGFW]Project-OpenWrt
--- a/package/ctcgfw/luci-app-gost/root/etc/init.d/gost
+++ b/package/ctcgfw/luci-app-gost/root/etc/init.d/gost
@ -2,7 +2,7 @@
 # Created By [CTCGFW]Project OpenWRT
 # https://github.com/project-openwrt

-START=80
+START=90
 STOP=10

 enable="$(uci get gost.@gost[0].enable)"
--- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini
+++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini
@ -2,7 +2,7 @@
 # Created By [CTCGFW]Project OpenWRT
 # https://github.com/project-openwrt

-START=80
+START=92
 STOP=10

 enable="$(uci get unblockneteasemusic-mini.@unblockneteasemusic-mini[0].enable)"
--- a/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic
+++ b/package/ctcgfw/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic
@ -2,7 +2,7 @@
 # Created By [CTCGFW]Project OpenWRT
 # https://github.com/project-openwrt

-START=89
+START=92
 STOP=10

 NAME="unblockneteasemusic"
--- a/tools/ucl/Makefile
+++ b/tools/ucl/Makefile
@ -43,8 +43,6 @@ define Host/Install
 endef

 define Host/Clean
-	$(MAKE) -C $(HOST_BUILD_DIR) uninstall
-	rm -rf $(HOST_BUILD_DIR)
 	rm -rf $(STAGING_DIR_HOST)/include/ucl
 endef