From ca503cc4054d9a13558c7b552886a6dba359a0eb Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Tue, 29 Oct 2024 21:21:55 +0530 Subject: [PATCH] openwisp-monitoring: allow not depending on rpcd-mod-iwinfo Add option to exclude rpcd-mod-iwinfo from dependency. Signed-off-by: Gagan Deep --- admin/openwisp-monitoring/Config.in | 9 +++++++++ admin/openwisp-monitoring/Makefile | 14 ++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 admin/openwisp-monitoring/Config.in diff --git a/admin/openwisp-monitoring/Config.in b/admin/openwisp-monitoring/Config.in new file mode 100644 index 0000000000..5b5bf37f25 --- /dev/null +++ b/admin/openwisp-monitoring/Config.in @@ -0,0 +1,9 @@ +menu "netjson-monitoring Configuration" + +config NETJSON_MONITORING_IWINFO + bool "Enable rpcd-mod-iwinfo" + default y + help + Whether to include the rpcd-mod-iwinfo dependency (enabled by default). + +endmenu diff --git a/admin/openwisp-monitoring/Makefile b/admin/openwisp-monitoring/Makefile index 4395c1ffe9..64aea23369 100644 --- a/admin/openwisp-monitoring/Makefile +++ b/admin/openwisp-monitoring/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openwisp-monitoring PKG_VERSION:=0.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Federico Capoano PKG_LICENSE:=GPL-3.0-or-later @@ -34,10 +34,15 @@ define Package/netjson-monitoring CATEGORY:=Administration SECTION:=admin SUBMENU:=openwisp - DEPENDS:=+libubus-lua +lua-cjson +rpcd +rpcd-mod-iwinfo + DEPENDS:=+libubus-lua +lua-cjson +rpcd + DEPENDS+=+NETJSON_MONITORING_IWINFO:rpcd-mod-iwinfo URL:=http://openwisp.org endef +define Package/netjson-monitoring/config + source "$(SOURCE)/Config.in" +endef + define Build/Compile endef @@ -88,6 +93,11 @@ define Package/netjson-monitoring/install $(PKG_BUILD_DIR)/openwisp-monitoring/files/lib/openwisp-monitoring/wifi.lua \ $(1)/usr/lib/lua/openwisp-monitoring/wifi.lua +# Iwinfo is enabled by default unless specified otherwise +ifeq ($(CONFIG_NETJSON_MONITORING_IWINFO), y) + $(CP) $(PKG_BUILD_DIR)/openwisp-monitoring/files/lib/openwisp-monitoring/iwinfo.lua $(1)/usr/lib/lua/openwisp-monitoring/iwinfo.lua +endif + $(CP) $(PKG_BUILD_DIR)/VERSION $(1)/usr/lib/openwisp-monitoring/ endef -- 2.30.2