From 800597ae2b487fa70dde5b1475ad1c2fbfe8d6c1 Mon Sep 17 00:00:00 2001
From: Vivek Kumar Dutta <vivek.dutta@iopsys.eu>
Date: Sun, 10 Mar 2024 13:14:41 +0530
Subject: [PATCH] tr104: Align with bbfdm microservice

---
 tr104/Makefile                                       |  5 +++--
 tr104/files/etc/init.d/tr104d.bbfdm                  | 12 ------------
 .../etc/uci-defaults/50_add_tr104_dm_microservice    |  8 ++++++++
 3 files changed, 11 insertions(+), 14 deletions(-)
 delete mode 100644 tr104/files/etc/init.d/tr104d.bbfdm
 create mode 100644 tr104/files/etc/uci-defaults/50_add_tr104_dm_microservice

diff --git a/tr104/Makefile b/tr104/Makefile
index d5a7092eb..7d7681cb4 100644
--- a/tr104/Makefile
+++ b/tr104/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr104
-PKG_VERSION:=1.0.21
+PKG_VERSION:=1.0.22
 
 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
@@ -71,13 +71,14 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/tr104/plugins/
+	$(INSTALL_DIR) $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/tr104/input.json $(1)/etc/tr104/input.json
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/tr104/libtr104.so $(1)/etc/tr104/
 ifeq ($(CONFIG_TR104_VENDOR_EXTENSIONS),y)
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libdm/extensions/iowrt/libtr104ext.so $(1)/etc/tr104/plugins/
 endif
 ifeq ($(CONFIG_TR104_RUNAS_BBFDM_MICROSERVICE),y)
-	$(INSTALL_BIN) ./files/etc/init.d/tr104d.bbfdm $(1)/etc/init.d/tr104d
+	$(INSTALL_BIN) ./files/etc/uci-defaults/50_add_tr104_dm_microservice $(1)/etc/uci-defaults/
 else
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/daemon/ubus/tr104d $(1)/usr/sbin/
diff --git a/tr104/files/etc/init.d/tr104d.bbfdm b/tr104/files/etc/init.d/tr104d.bbfdm
deleted file mode 100644
index ed1f300dc..000000000
--- a/tr104/files/etc/init.d/tr104d.bbfdm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=60
-STOP=10
-
-USE_PROCD=1
-. /etc/bbfdm/bbfdm_services.sh
-
-start_service()
-{
-	bbfdm_add_service "tr104" "/etc/tr104/input.json"
-}
diff --git a/tr104/files/etc/uci-defaults/50_add_tr104_dm_microservice b/tr104/files/etc/uci-defaults/50_add_tr104_dm_microservice
new file mode 100644
index 000000000..2a25f1c6f
--- /dev/null
+++ b/tr104/files/etc/uci-defaults/50_add_tr104_dm_microservice
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if ! uci -q get bbfdm.tr104 >/dev/null; then
+	uci set bbfdm.tr104=micro_service
+	uci set bbfdm.tr104.enable=1
+	uci set bbfdm.tr104.input_json="/etc/tr104/input.json"
+	uci set bbfdm.tr104.loglevel=1
+fi