From f701de6e47a06df46dfd786e9b527ea9a03cdc1e Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Tue, 16 Apr 2024 16:13:57 +0530
Subject: [PATCH] qosmngr: align with bbfdm

---
 qosmngr/Makefile                            |  6 ++----
 qosmngr/files/common/etc/qos_bbf/input.json | 15 ---------------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100755 qosmngr/files/common/etc/qos_bbf/input.json

diff --git a/qosmngr/Makefile b/qosmngr/Makefile
index a429a54dc..afe604181 100644
--- a/qosmngr/Makefile
+++ b/qosmngr/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qosmngr
-PKG_VERSION:=1.0.8
+PKG_VERSION:=1.0.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -42,7 +42,6 @@ endef
 endif
 
 define Package/qosmngr/install
-	$(INSTALL_DIR) $(1)/etc/qos_bbf
 	$(CP) ./files/common/* $(1)/
 ifneq ($(CONFIG_TARGET_brcmbca),)
 	$(CP) ./files/broadcom/* $(1)/
@@ -53,8 +52,7 @@ else
 endif
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/qosmngr $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/bbf_plugin/libqos_bbf.so $(1)/etc/qos_bbf
-	$(call BbfdmInstallMicroServiceInputFile,$(1),./files/common/etc/qos_bbf/input.json)
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/bbf_plugin/libqos_bbf.so $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,qosmngr))
diff --git a/qosmngr/files/common/etc/qos_bbf/input.json b/qosmngr/files/common/etc/qos_bbf/input.json
deleted file mode 100755
index 8bb902c57..000000000
--- a/qosmngr/files/common/etc/qos_bbf/input.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"daemon": {
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/qos_bbf/libqos_bbf.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.qos.",
-			"parent_dm": "Device.",
-			"object": "QoS",
-			"root_obj": "bbfdm"
-		}
-	}
-}