diff --git a/package/ntlf9t/luci-app-eqos/Makefile b/package/ntlf9t/luci-app-eqos/Makefile index cf5b8fbec2..6e6883fb43 100644 --- a/package/ntlf9t/luci-app-eqos/Makefile +++ b/package/ntlf9t/luci-app-eqos/Makefile @@ -7,94 +7,18 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=eqos -PKG_RELEASE:=1 -LUCI_DIR:=/usr/lib/lua/luci +LUCI_TITLE:=LuCI support for eqos. +LUCI_DESCRIPTION:=LuCI support for Easy QoS(Support speed limit based on IP address). +LUCI_DEPENDS:=+tc +kmod-sched-core +kmod-ifb +LUCI_PKGARCH:=all + +PKG_NAME:=luci-app-eqos +PKG_VERSION:=1.0.0 +PKG_RELEASE:=2 PKG_MAINTAINER:=Jianhui Zhao -include $(INCLUDE_DIR)/package.mk +include $(TOPDIR)/feeds/luci/luci.mk -define Package/eqos - SECTION:=net - CATEGORY:=Network - DEPENDS:=+tc +kmod-sched-core +kmod-ifb - TITLE:=Easy QoS(Support speed limit based on IP address) - PKGARCH:=all -endef +# call BuildPackage - OpenWrt buildroot signature - -define Package/luci-app-eqos - SECTION:=luci - CATEGORY:=LuCI - TITLE:=EQOS - LuCI interface - PKGARCH:=all - DEPENDS:=+luci-base +eqos - SUBMENU:=3. Applications -endef - -define Package/luci-app-eqos/description - Luci interface for the eqos. -endef - -define Package/luci-i18n-eqos-zh-cn - SECTION:=luci - CATEGORY:=LuCI - TITLE:=luci-app-eqos - zh-cn translation - HIDDEN:=1 - DEPENDS:=luci-app-eqos - DEFAULT:=LUCI_LANG_zh-cn - PKGARCH:=all -endef - -define Build/Prepare -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/eqos/install - $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d $(1)/etc/hotplug.d/iface - $(INSTALL_BIN) ./files/eqos.sh $(1)/usr/sbin/eqos - $(INSTALL_BIN) ./files/eqos.init $(1)/etc/init.d/eqos - $(INSTALL_BIN) ./files/eqos.hotplug $(1)/etc/hotplug.d/iface/10-eqos - $(INSTALL_CONF) ./files/eqos.config $(1)/etc/config/eqos -endef - -define Package/luci-app-eqos/install - $(INSTALL_DIR) $(1)$(LUCI_DIR)/controller $(1)$(LUCI_DIR)/model/cbi $(1)$(LUCI_DIR)/i18n $(1)/etc/uci-defaults - $(INSTALL_DATA) ./files/eqos-controller.lua $(1)$(LUCI_DIR)/controller/eqos.lua - $(INSTALL_DATA) ./files/eqos-cbi.lua $(1)$(LUCI_DIR)/model/cbi/eqos.lua - $(INSTALL_BIN) ./files/uci-defaults-eqos $(1)/etc/uci-defaults/luci-eqos -endef - -define Package/luci-app-eqos/postinst -#!/bin/sh -which uci > /dev/null || exit 0 -uci -q get ucitrack.@eqos[0] > /dev/null || { - uci add ucitrack eqos > /dev/null - uci set ucitrack.@eqos[0].init=eqos - uci commit -} -endef - -define Package/luci-app-eqos/postrm -#!/bin/sh -which uci > /dev/null || exit 0 -uci -q get ucitrack.@eqos[0] > /dev/null && { - uci delete ucitrack.@eqos[0] - uci commit -} -endef - -define Package/luci-i18n-eqos-zh-cn/install - $(INSTALL_DIR) $(1)$(LUCI_DIR)/i18n - po2lmo ./files/po/zh-cn/eqos.po $(1)$(LUCI_DIR)/i18n/eqos.zh-cn.lmo -endef - -$(eval $(call BuildPackage,eqos)) -$(eval $(call BuildPackage,luci-app-eqos)) -$(eval $(call BuildPackage,luci-i18n-eqos-zh-cn)) \ No newline at end of file diff --git a/package/ntlf9t/luci-app-eqos/README.md b/package/ntlf9t/luci-app-eqos/README.md deleted file mode 100644 index c165d32a1c..0000000000 --- a/package/ntlf9t/luci-app-eqos/README.md +++ /dev/null @@ -1,32 +0,0 @@ -# Easy QoS for OpenWRT/Lede([中文](https://github.com/lwxlwxlwx/eqos/blob/master/README_ZH.md)) - -![](https://img.shields.io/badge/license-GPLV3-brightgreen.svg?style=plastic "License") - -![](https://github.com/lwxlwxlwx/blob/master/eqos.png) - -# Features -* Support speed limit based on IP address -* No marking by iptables -* Support LuCI interface - -# Install to OpenWRT/LEDE - - git clone https://github.com/lwxlwxlwx/eqos.git - cp -r eqos LEDE_DIR/package/eqos - - cd LEDE_DIR - ./scripts/feeds update -a - ./scripts/feeds install -a - - make menuconfig - LuCI ---> - 1. Collections ---> - <*> luci - 3. Applications ---> - <*> luci-app-eqos...................................... EQOS - LuCI interface - 4. Themes ---> - <*> luci-theme-material - Network ---> - -*- eqos................... Easy QoS(Support speed limit based on IP address) - - make package/eqos/compile V=s diff --git a/package/ntlf9t/luci-app-eqos/README_ZH.md b/package/ntlf9t/luci-app-eqos/README_ZH.md deleted file mode 100644 index 26c78cee15..0000000000 --- a/package/ntlf9t/luci-app-eqos/README_ZH.md +++ /dev/null @@ -1,32 +0,0 @@ -# Easy QoS for OpenWRT/Lede - -![](https://img.shields.io/badge/license-GPLV3-brightgreen.svg?style=plastic "License") - -![](https://github.com/lwxlwxlwx/blob/master/eqos_zh.png) - -# 特性 -* 支持基于IP地址限速 -* 未使用iptables打MARK -* 提供Luci界面 - -# 安装到OpenWRT/LEDE - - git clone https://github.com/lwxlwxlwx/eqos.git - cp -r eqos LEDE_DIR/package/eqos - - cd LEDE_DIR - ./scripts/feeds update -a - ./scripts/feeds install -a - - make menuconfig - LuCI ---> - 1. Collections ---> - <*> luci - 3. Applications ---> - <*> luci-app-eqos...................................... EQOS - LuCI interface - 4. Themes ---> - <*> luci-theme-material - Network ---> - -*- eqos................... Easy QoS(Support speed limit based on IP address) - - make package/eqos/compile V=s diff --git a/package/ntlf9t/luci-app-eqos/files/eqos-controller.lua b/package/ntlf9t/luci-app-eqos/luasrc/controller/eqos.lua similarity index 100% rename from package/ntlf9t/luci-app-eqos/files/eqos-controller.lua rename to package/ntlf9t/luci-app-eqos/luasrc/controller/eqos.lua diff --git a/package/ntlf9t/luci-app-eqos/files/eqos-cbi.lua b/package/ntlf9t/luci-app-eqos/luasrc/model/cbi/eqos.lua similarity index 100% rename from package/ntlf9t/luci-app-eqos/files/eqos-cbi.lua rename to package/ntlf9t/luci-app-eqos/luasrc/model/cbi/eqos.lua diff --git a/package/ntlf9t/luci-app-eqos/files/po/zh-cn/eqos.po b/package/ntlf9t/luci-app-eqos/po/zh-cn/eqos.po similarity index 100% rename from package/ntlf9t/luci-app-eqos/files/po/zh-cn/eqos.po rename to package/ntlf9t/luci-app-eqos/po/zh-cn/eqos.po diff --git a/package/ntlf9t/luci-app-eqos/files/eqos.config b/package/ntlf9t/luci-app-eqos/root/etc/config/eqos similarity index 100% rename from package/ntlf9t/luci-app-eqos/files/eqos.config rename to package/ntlf9t/luci-app-eqos/root/etc/config/eqos diff --git a/package/ntlf9t/luci-app-eqos/files/eqos.hotplug b/package/ntlf9t/luci-app-eqos/root/etc/hotplug.d/iface/10-eqos similarity index 100% rename from package/ntlf9t/luci-app-eqos/files/eqos.hotplug rename to package/ntlf9t/luci-app-eqos/root/etc/hotplug.d/iface/10-eqos diff --git a/package/ntlf9t/luci-app-eqos/files/eqos.init b/package/ntlf9t/luci-app-eqos/root/etc/init.d/eqos similarity index 100% rename from package/ntlf9t/luci-app-eqos/files/eqos.init rename to package/ntlf9t/luci-app-eqos/root/etc/init.d/eqos diff --git a/package/ntlf9t/luci-app-eqos/files/uci-defaults-eqos b/package/ntlf9t/luci-app-eqos/root/etc/uci-defaults/luci-eqos similarity index 100% rename from package/ntlf9t/luci-app-eqos/files/uci-defaults-eqos rename to package/ntlf9t/luci-app-eqos/root/etc/uci-defaults/luci-eqos diff --git a/package/ntlf9t/luci-app-eqos/files/eqos.sh b/package/ntlf9t/luci-app-eqos/root/usr/sbin/eqos similarity index 100% rename from package/ntlf9t/luci-app-eqos/files/eqos.sh rename to package/ntlf9t/luci-app-eqos/root/usr/sbin/eqos