From b079514eb106ffb04d7f2643431863653b07b97b Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 26 Jul 2019 01:25:51 +0800 Subject: [PATCH] update OpenAppFilter --- .../{luci-app-oaf => luci-app-appfilter}/Makefile | 13 +++++++++++-- .../luasrc/controller/appfilter.lua | 0 .../luasrc/model/cbi/appfilter/appfilter.lua | 0 .../po/zh-cn/oaf.po | 0 .../root/etc/uci-defaults/91_luci-oaf | 0 package/cnsztl/oaf/Makefile | 4 ++-- package/cnsztl/open-app-filter/Makefile | 4 ++-- 7 files changed, 15 insertions(+), 6 deletions(-) rename package/cnsztl/{luci-app-oaf => luci-app-appfilter}/Makefile (59%) rename package/cnsztl/{luci-app-oaf => luci-app-appfilter}/luasrc/controller/appfilter.lua (100%) rename package/cnsztl/{luci-app-oaf => luci-app-appfilter}/luasrc/model/cbi/appfilter/appfilter.lua (100%) rename package/cnsztl/{luci-app-oaf => luci-app-appfilter}/po/zh-cn/oaf.po (100%) rename package/cnsztl/{luci-app-oaf => luci-app-appfilter}/root/etc/uci-defaults/91_luci-oaf (100%) diff --git a/package/cnsztl/luci-app-oaf/Makefile b/package/cnsztl/luci-app-appfilter/Makefile similarity index 59% rename from package/cnsztl/luci-app-oaf/Makefile rename to package/cnsztl/luci-app-appfilter/Makefile index 7e0e49ec0d..4c5b63a696 100755 --- a/package/cnsztl/luci-app-oaf/Makefile +++ b/package/cnsztl/luci-app-appfilter/Makefile @@ -1,4 +1,3 @@ - # # This is free software, licensed under the Apache License, Version 2.0 . # @@ -7,8 +6,18 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Open App Filter Module LUCI_PKGARCH:=all -PKG_NAME:=luci-app-oaf +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 + include $(TOPDIR)/feeds/luci/luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/package/cnsztl/luci-app-oaf/luasrc/controller/appfilter.lua b/package/cnsztl/luci-app-appfilter/luasrc/controller/appfilter.lua similarity index 100% rename from package/cnsztl/luci-app-oaf/luasrc/controller/appfilter.lua rename to package/cnsztl/luci-app-appfilter/luasrc/controller/appfilter.lua diff --git a/package/cnsztl/luci-app-oaf/luasrc/model/cbi/appfilter/appfilter.lua b/package/cnsztl/luci-app-appfilter/luasrc/model/cbi/appfilter/appfilter.lua similarity index 100% rename from package/cnsztl/luci-app-oaf/luasrc/model/cbi/appfilter/appfilter.lua rename to package/cnsztl/luci-app-appfilter/luasrc/model/cbi/appfilter/appfilter.lua diff --git a/package/cnsztl/luci-app-oaf/po/zh-cn/oaf.po b/package/cnsztl/luci-app-appfilter/po/zh-cn/oaf.po similarity index 100% rename from package/cnsztl/luci-app-oaf/po/zh-cn/oaf.po rename to package/cnsztl/luci-app-appfilter/po/zh-cn/oaf.po diff --git a/package/cnsztl/luci-app-oaf/root/etc/uci-defaults/91_luci-oaf b/package/cnsztl/luci-app-appfilter/root/etc/uci-defaults/91_luci-oaf similarity index 100% rename from package/cnsztl/luci-app-oaf/root/etc/uci-defaults/91_luci-oaf rename to package/cnsztl/luci-app-appfilter/root/etc/uci-defaults/91_luci-oaf diff --git a/package/cnsztl/oaf/Makefile b/package/cnsztl/oaf/Makefile index f0725ce9ee..c2412e87b5 100755 --- a/package/cnsztl/oaf/Makefile +++ b/package/cnsztl/oaf/Makefile @@ -10,8 +10,8 @@ include $(INCLUDE_DIR)/package.mk PKG_AUTOLOAD:=oaf define KernelPackage/oaf - SECTION:=Derry Apps - CATEGORY:=Derry Apps + SECTION:=net + CATEGORY:=Network TITLE:=open app filter kernel module FILES:=$(PKG_BUILD_DIR)/oaf.ko KCONFIG:= diff --git a/package/cnsztl/open-app-filter/Makefile b/package/cnsztl/open-app-filter/Makefile index a9a495dc86..d4a6cb484a 100755 --- a/package/cnsztl/open-app-filter/Makefile +++ b/package/cnsztl/open-app-filter/Makefile @@ -11,8 +11,8 @@ include $(INCLUDE_DIR)/package.mk #include $(INCLUDE_DIR)/kernel.mk define Package/appfilter - SECTION:=Derry Apps - CATEGORY:=Derry Apps + SECTION:=net + CATEGORY:=Network TITLE:=App filter userspace module endef