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 <pandafy.dev@gmail.com>
(cherry picked from commit 67d4fa3b05e0a8ee0724bc245d6eec318351876a)

diff --git a/admin/openwisp-config/Makefile b/admin/openwisp-config/Makefile
index e2c409c9bc61dae4dab6e6412a637c1dc6d847c6..aadd5fe616367c6e6de68d9777fc6328f7d3772f 100644 (file)
--- 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 <f.capoano@openwisp.io>
 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))