From 124b24d6e251538a620c3820f41fb1f5b6022b48 Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Tue, 22 Oct 2024 22:28:46 +0530 Subject: [PATCH] openwisp-monitoring: fix Makefile for 0.2.0 update Commit 5e69da4ccb760da66f00f91e6cb2248ddcdabe5d upgraded openwisp-monitoring to version 0.2.0 but missed necessary Makefile adjustments, causing the package to break in OpenWrt feeds. This patch updates the Makefile to ensure proper functionality of openwisp-monitoring with the 0.2.0 release. Signed-off-by: Gagan Deep (cherry picked from commit 886b3fa36d0b82071b10d0169d6950b0aaa6f16c) --- admin/openwisp-monitoring/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/admin/openwisp-monitoring/Makefile b/admin/openwisp-monitoring/Makefile index 959c788775..4395c1ffe9 100644 --- a/admin/openwisp-monitoring/Makefile +++ b/admin/openwisp-monitoring/Makefile @@ -30,7 +30,7 @@ define Package/openwisp-monitoring endef define Package/netjson-monitoring - TITLE:=NetJson Monitoring + TITLE:=NetJSON Monitoring CATEGORY:=Administration SECTION:=admin SUBMENU:=openwisp @@ -50,7 +50,7 @@ define Package/netjson-monitoring/install $(1)/usr/sbin \ $(1)/usr/libexec \ $(1)/usr/lib/lua/openwisp-monitoring \ - $(1)/etc/openwisp-monitoring + $(1)/usr/lib/openwisp-monitoring $(INSTALL_BIN) \ $(PKG_BUILD_DIR)/openwisp-monitoring/files/sbin/netjson-monitoring.lua \ @@ -88,7 +88,7 @@ define Package/netjson-monitoring/install $(PKG_BUILD_DIR)/openwisp-monitoring/files/lib/openwisp-monitoring/wifi.lua \ $(1)/usr/lib/lua/openwisp-monitoring/wifi.lua - $(CP) $(PKG_BUILD_DIR)/VERSION $(1)/etc/openwisp-monitoring/ + $(CP) $(PKG_BUILD_DIR)/VERSION $(1)/usr/lib/openwisp-monitoring/ endef @@ -97,7 +97,8 @@ define Package/openwisp-monitoring/install $(1)/usr/sbin \ $(1)/etc/init.d \ $(1)/etc/config \ - $(1)/etc/openwisp-monitoring + $(1)/usr/lib/openwisp-monitoring \ + $(1)/etc/hotplug.d/openwisp $(INSTALL_BIN) \ $(PKG_BUILD_DIR)/openwisp-monitoring/files/monitoring.agent \ @@ -107,6 +108,10 @@ define Package/openwisp-monitoring/install $(PKG_BUILD_DIR)/openwisp-monitoring/files/monitoring.init \ $(1)/etc/init.d/openwisp-monitoring + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/openwisp-monitoring/files/openwisp-monitoring.hotplug \ + $(1)/etc/hotplug.d/openwisp/openwisp-monitoring + $(INSTALL_CONF) \ $(PKG_BUILD_DIR)/openwisp-monitoring/files/monitoring.config \ $(1)/etc/config/openwisp-monitoring -- 2.30.2