From 5b77f36ae46c968f7413d8c8a301b7006111f573 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Tue, 16 Apr 2024 17:55:11 +0530
Subject: [PATCH] mcastmngr: align with bbfdm

---
 mcastmngr/Makefile                              |  5 ++---
 mcastmngr/files/common/etc/mcastmngr/input.json | 14 --------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100755 mcastmngr/files/common/etc/mcastmngr/input.json

diff --git a/mcastmngr/Makefile b/mcastmngr/Makefile
index 5274b681a..27c9d2e8e 100644
--- a/mcastmngr/Makefile
+++ b/mcastmngr/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mcastmngr
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.2.1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 LOCAL_DEV:=0
@@ -51,8 +51,7 @@ ifneq ($(CONFIG_TARGET_brcmbca),)
 else
 	$(CP) ./files/linux/* $(1)/
 endif
-	$(call BbfdmInstallPluginInMicroservice, $(1)/etc/mcastmngr,$(PKG_BUILD_DIR)/bbf_plugin/libmcast_bbf.so)
-	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/common/etc/mcastmngr/input.json)
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/bbf_plugin/libmcast_bbf.so $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,mcastmngr))
diff --git a/mcastmngr/files/common/etc/mcastmngr/input.json b/mcastmngr/files/common/etc/mcastmngr/input.json
deleted file mode 100755
index cc4161d7d..000000000
--- a/mcastmngr/files/common/etc/mcastmngr/input.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"daemon": {
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/mcastmngr/libmcast_bbf.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"parent_dm": "Device.",
-			"root_obj": "bbfdm",
-			"multiple_objects": ["X_IOPSYS_EU_IGMP","X_IOPSYS_EU_MLD"]
-		}
-	}
-}