From 15fe770c178722615985a60ba9c0e5f848361d76 Mon Sep 17 00:00:00 2001 From: Gagan Deep Date: Tue, 22 Oct 2024 16:55:23 +0530 Subject: [PATCH] openwisp-config: fix Makefile for 1.1.0 Update configuration in Makefile to fix #25168. Add "/etc/openwisp/" to conf files. Signed-off-by: Gagan Deep (cherry picked from commit 67d4fa3b05e0a8ee0724bc245d6eec318351876a) --- admin/openwisp-config/Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/admin/openwisp-config/Makefile b/admin/openwisp-config/Makefile index e2c409c9bc..aadd5fe616 100644 --- a/admin/openwisp-config/Makefile +++ b/admin/openwisp-config/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openwisp-config PKG_VERSION:=1.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Federico Capoano PKG_LICENSE:=GPL-3.0-or-later @@ -38,6 +38,7 @@ endef define Package/openwisp-config/conffiles /etc/config/openwisp +/etc/openwisp/ endef define Package/openwisp-config/install @@ -45,16 +46,16 @@ define Package/openwisp-config/install $(1)/usr/sbin \ $(1)/etc/init.d \ $(1)/etc/config \ - $(1)/etc/openwisp \ + $(1)/usr/lib/openwisp-config \ $(1)/usr/lib/lua/openwisp $(INSTALL_BIN) \ $(PKG_BUILD_DIR)/openwisp-config/files/openwisp.agent \ - $(1)/usr/sbin/openwisp_config + $(1)/usr/sbin/openwisp-config $(INSTALL_BIN) \ $(PKG_BUILD_DIR)/openwisp-config/files/openwisp.init \ - $(1)/etc/init.d/openwisp_config + $(1)/etc/init.d/openwisp-config $(INSTALL_CONF) $(PKG_BUILD_DIR)/openwisp-config/files/openwisp.config \ $(1)/etc/config/openwisp @@ -95,7 +96,11 @@ define Package/openwisp-config/install $(PKG_BUILD_DIR)/openwisp-config/files/sbin/openwisp-get-address.lua \ $(1)/usr/sbin/openwisp-get-address - $(CP) $(PKG_BUILD_DIR)/VERSION $(1)/etc/openwisp/ + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/openwisp-config/files/sbin/openwisp-get-random-number.lua \ + $(1)/usr/sbin/openwisp-get-random-number + + $(CP) $(PKG_BUILD_DIR)/VERSION $(1)/usr/lib/openwisp-config/ endef $(eval $(call BuildPackage,openwisp-config)) -- 2.30.2