From b946c2842a4966511eaca699b8af60502e246b53 Mon Sep 17 00:00:00 2001 From: Suvendhu Hansa Date: Wed, 13 Mar 2024 06:16:27 +0000 Subject: [PATCH] swmodd: aligned with bbfdm micro-service --- swmodd/Makefile | 5 +++-- swmodd/files/etc/swmodd/input.json | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 swmodd/files/etc/swmodd/input.json diff --git a/swmodd/Makefile b/swmodd/Makefile index fbefedf5a..388861779 100755 --- a/swmodd/Makefile +++ b/swmodd/Makefile @@ -75,6 +75,7 @@ endif define Package/swmodd/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/config + $(INSTALL_DIR) $(1)/etc/swmodd $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/share/swmodd/ $(INSTALL_DIR) $(1)/etc/uci-defaults @@ -90,13 +91,13 @@ ifeq ($(CONFIG_PACKAGE_liblxc),y) $(INSTALL_BIN) ./files/etc/uci-defaults/02-migrate-lxc $(1)/etc/uci-defaults/02-migrate-lxc endif ifeq ($(CONFIG_PACKAGE_crun),y) - $(INSTALL_DIR) $(1)/etc/swmodd $(INSTALL_BIN) ./files/etc/swmodd/run.sh $(1)/etc/swmodd/run.sh $(INSTALL_BIN) ./files/etc/init.d/crun $(1)/etc/init.d/crun $(INSTALL_BIN) ./files/etc/config/crun $(1)/etc/config/crun $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/crun_create $(1)/usr/sbin/crun_create endif - $(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libswmodd.so) + $(call BbfdmInstallPluginInMicroservice,$(1)/etc/swmodd,$(PKG_BUILD_DIR)/libswmodd.so) + $(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/swmodd/input.json) endef define Package/swmodd-cgroup/install diff --git a/swmodd/files/etc/swmodd/input.json b/swmodd/files/etc/swmodd/input.json new file mode 100644 index 000000000..f353bfb54 --- /dev/null +++ b/swmodd/files/etc/swmodd/input.json @@ -0,0 +1,17 @@ +{ + "daemon": { + "config": { + "loglevel": "1" + }, + "input": { + "type": "DotSo", + "name": "/etc/swmodd/libswmodd.so" + }, + "output": { + "type": "UBUS", + "parent_dm": "Device.", + "object": "SoftwareModules", + "root_obj": "bbfdm" + } + } +}