From 289d805bdc7cca397313459074a37d8d50d9d3b5 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Tue, 16 Apr 2024 17:54:39 +0530
Subject: [PATCH] hostmngr: align with bbfdm

---
 hostmngr/Makefile                              |  7 +++----
 .../etc/bbfdm/micro_services/hostmngr.json     | 18 ------------------
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 hostmngr/files/etc/bbfdm/micro_services/hostmngr.json

diff --git a/hostmngr/Makefile b/hostmngr/Makefile
index 20c8df06a..3cc7ace37 100644
--- a/hostmngr/Makefile
+++ b/hostmngr/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=1.2.3
+PKG_VERSION:=1.2.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -22,7 +22,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/hostmngr
   SECTION:=utils
@@ -60,11 +60,10 @@ MAKE_PATH:=src
 define Package/hostmngr/install
 	$(CP) ./files/etc $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/hostmngr/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/hostmngr $(1)/usr/sbin/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1)/etc/hostmngr/
 	$(INSTALL_DIR) $(1)/usr/share/hostmngr
 	$(INSTALL_DATA) ./files/scripts/hosts_acl.sh $(1)/usr/share/hostmngr/
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1) $(PKG_NAME)
 endef
 
 ifeq ($(LOCAL_DEV),1)
diff --git a/hostmngr/files/etc/bbfdm/micro_services/hostmngr.json b/hostmngr/files/etc/bbfdm/micro_services/hostmngr.json
deleted file mode 100644
index b9ecd1f86..000000000
--- a/hostmngr/files/etc/bbfdm/micro_services/hostmngr.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"daemon": {
-		"config": {
-			"loglevel": "1"
-		},
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/hostmngr/libhostmngr.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"parent_dm": "Device.",
-			"object": "Hosts",
-			"root_obj": "bbfdm"
-		}
-	}
-}
-