From f38c3c1749c6ebb4908372af725988f0ec5e364a Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Wed, 22 Feb 2017 16:25:57 -0800 Subject: [PATCH 1/2] addrwatch: fix complaint when adding addrwatch with image builder Signed-off-by: Stan Grishin --- net/addrwatch/Makefile | 2 +- net/addrwatch/files/addrwatch.init | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/net/addrwatch/Makefile b/net/addrwatch/Makefile index aadac2661..5ebf90d39 100644 --- a/net/addrwatch/Makefile +++ b/net/addrwatch/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=addrwatch PKG_VERSION:=0.8 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-master.tar.gz PKG_SOURCE_URL:=https://github.com/fln/addrwatch/releases/download/$(PKG_VERSION)/ diff --git a/net/addrwatch/files/addrwatch.init b/net/addrwatch/files/addrwatch.init index c7cbbfe1b..fb0ea4691 100644 --- a/net/addrwatch/files/addrwatch.init +++ b/net/addrwatch/files/addrwatch.init @@ -4,8 +4,6 @@ START=50 USE_PROCD=1 -. /lib/functions/network.sh - validate_section_addrwatch() { uci_validate_section addrwatch addrwatch "${1}" \ 'disabled:bool:0' \ @@ -65,6 +63,7 @@ start_instance() { } start_service() { + . /lib/functions/network.sh config_load 'addrwatch' config_foreach start_instance 'addrwatch' } From f6f9973fde21a64297e947e11cf26ef694162f44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Caletka?= Date: Fri, 24 Feb 2017 12:21:24 +0100 Subject: [PATCH 2/2] addrwatch: fix typo in config file name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ondřej Caletka --- net/addrwatch/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/addrwatch/Makefile b/net/addrwatch/Makefile index 5ebf90d39..2bba0829d 100644 --- a/net/addrwatch/Makefile +++ b/net/addrwatch/Makefile @@ -46,7 +46,7 @@ define Package/addrwatch/install $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/addrwatch $(1)/usr/sbin/ $(INSTALL_BIN) ./files/addrwatch.init $(1)/etc/init.d/addrwatch - $(INSTALL_CONF) ./files/addrwatch.config $(1)/etc/config/addrwatch$ + $(INSTALL_CONF) ./files/addrwatch.config $(1)/etc/config/addrwatch endef $(eval $(call BuildPackage,addrwatch))