From 3e46fd5f05104d169730ebb1091a2ac322a9e341 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Fri, 3 Apr 2020 18:23:58 +0300 Subject: [PATCH] sqm-scripts: move luci-app-sqm to the LuCI feed Move luci-app-sqm to the LuCI feed to enable it to be translated. Signed-off-by: Hannu Nyman --- net/sqm-scripts/Makefile | 32 +-------------------- net/sqm-scripts/files/luci-app-sqm.defaults | 8 ------ 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 net/sqm-scripts/files/luci-app-sqm.defaults diff --git a/net/sqm-scripts/Makefile b/net/sqm-scripts/Makefile index 836d5b2d8c..23462d45cc 100644 --- a/net/sqm-scripts/Makefile +++ b/net/sqm-scripts/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sqm-scripts PKG_SOURCE_VERSION:=ab763cba8b1516b3afa99760e0ca884f8b8d93b8 PKG_VERSION:=1.4.0 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/tohojo/sqm-scripts @@ -44,34 +44,4 @@ define Package/sqm-scripts/install make -C $(PKG_BUILD_DIR) DESTDIR=$(1) PLATFORM=openwrt install endef -define Package/luci-app-sqm - SECTION:=luci - CATEGORY:=LuCI - TITLE:=SQM Scripts - LuCI interface - PKGARCH:=all - DEPENDS:=+luci-compat +sqm-scripts - SUBMENU:=3. Applications -endef - -define Package/luci-app-sqm/description - Luci interface for the SQM scripts queue management configuration package. -endef - -define Package/luci-app-sqm/install - $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(1) PLATFORM=openwrt install-luci - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(INSTALL_BIN) ./files/luci-app-sqm.defaults $(1)/etc/uci-defaults -endef - -define Package/luci-app-sqm/postrm -#!/bin/sh -which uci > /dev/null || exit 0 -uci -q get ucitrack.@sqm[0] > /dev/null && { - uci delete ucitrack.@sqm[0] - uci del_list ucitrack.@firewall[0].affects=sqm - uci commit -} || exit 0 -endef - $(eval $(call BuildPackage,sqm-scripts)) -$(eval $(call BuildPackage,luci-app-sqm)) diff --git a/net/sqm-scripts/files/luci-app-sqm.defaults b/net/sqm-scripts/files/luci-app-sqm.defaults deleted file mode 100644 index 117a117ef1..0000000000 --- a/net/sqm-scripts/files/luci-app-sqm.defaults +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -uci -q get ucitrack.@sqm[0] >/dev/null || { - uci add ucitrack sqm > /dev/null - uci set ucitrack.@sqm[0].init=sqm - uci add_list ucitrack.@firewall[0].affects=sqm - uci commit -} -- 2.30.2