From 6a2e72a8e7f619d3e26fa46caccb12e3f736a961 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 26 Jul 2019 01:59:17 +0800 Subject: [PATCH] luci-app-chinadns & luci-app-appfilter: fix errors --- package/cnsztl/luci-app-appfilter/Makefile | 10 +--------- .../files/root/etc/uci-defaults/luci-chinadns | 6 +++--- package/cnsztl/oaf/Makefile | 5 +++-- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/package/cnsztl/luci-app-appfilter/Makefile b/package/cnsztl/luci-app-appfilter/Makefile index 4c5b63a696..71f612e570 100755 --- a/package/cnsztl/luci-app-appfilter/Makefile +++ b/package/cnsztl/luci-app-appfilter/Makefile @@ -9,15 +9,7 @@ LUCI_PKGARCH:=all PKG_NAME:=luci-app-appfilter PKG_VERSION:=1.0 PKG_RELEASE:=1 - -define Package/$(PKG_NAME) - SECTION:=luci - CATEGORY:=LuCI - SUBMENU:=3. Applications - TITLE:=LuCI Support for oaf - PKGARCH:=all - DEPENDS:=+oaf +appfilter -endef +LUCI_DEPENDS:=+kmod-oaf +appfilter include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/package/cnsztl/luci-app-chinadns/files/root/etc/uci-defaults/luci-chinadns b/package/cnsztl/luci-app-chinadns/files/root/etc/uci-defaults/luci-chinadns index 47e155717c..2309ac9612 100755 --- a/package/cnsztl/luci-app-chinadns/files/root/etc/uci-defaults/luci-chinadns +++ b/package/cnsztl/luci-app-chinadns/files/root/etc/uci-defaults/luci-chinadns @@ -1,8 +1,8 @@ #!/bin/sh uci -q batch <<-EOF >/dev/null - delete ucitrack.@ChinaDNS[-1] - add ucitrack ChinaDNS - set ucitrack.@ChinaDNS[-1].init=ChinaDNS + delete ucitrack.@chinands[-1] + add ucitrack chinadns + set ucitrack.@chinadns[-1].init=chinadns commit ucitrack EOF exit 0 diff --git a/package/cnsztl/oaf/Makefile b/package/cnsztl/oaf/Makefile index c2412e87b5..3cd46611a4 100755 --- a/package/cnsztl/oaf/Makefile +++ b/package/cnsztl/oaf/Makefile @@ -10,8 +10,9 @@ include $(INCLUDE_DIR)/package.mk PKG_AUTOLOAD:=oaf define KernelPackage/oaf - SECTION:=net - CATEGORY:=Network + SECTION:=Kernel + CATEGORY:=Kernel modules + SUBMENU:=Netfilter Extensions TITLE:=open app filter kernel module FILES:=$(PKG_BUILD_DIR)/oaf.ko KCONFIG:=