dslmngr: Added dsl,fst,atm,ptm bbf microservice

DSL, ATM,FAST and PTM added as mlti object bbf microservice handling
 updated commit ID in Makefile
 incremented minor version
This commit is contained in:
Amit Kumar 2024-02-15 15:12:33 +05:30 committed by Rahul Thakur
parent d6333aa476
commit e9d0a81e8e
3 changed files with 24 additions and 3 deletions

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=dslmngr PKG_NAME:=dslmngr
PKG_VERSION:=1.2.1 PKG_VERSION:=1.2.2
LOCAL_DEV=0 LOCAL_DEV=0
ifneq ($(LOCAL_DEV),1) ifneq ($(LOCAL_DEV),1)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=cb8b8fd2549751bcd38808391b76a1a9a908c4de PKG_SOURCE_VERSION:=6009d4cdabc2fb6827a1dd6096a96e720e97750b
PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu> PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
@ -26,6 +26,7 @@ PKG_LICENSE_FILES:=LICENSE
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include ../bbfdm/bbfdm.mk
ifeq ($(CONFIG_TARGET_brcmbca),y) ifeq ($(CONFIG_TARGET_brcmbca),y)
TARGET_PLATFORM=BROADCOM TARGET_PLATFORM=BROADCOM
@ -39,7 +40,7 @@ define Package/dslmngr
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=XDSL status and configration utility TITLE:=XDSL status and configration utility
DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
endef endef
define Package/dslmngr/description define Package/dslmngr/description
@ -69,12 +70,14 @@ define Build/Compile
endef endef
define Package/dslmngr/install define Package/dslmngr/install
$(INSTALL_DIR) $(1)/etc/dsl
$(CP) ./files/common/* $(1)/ $(CP) ./files/common/* $(1)/
ifeq ($(CONFIG_TARGET_brcmbca),y) ifeq ($(CONFIG_TARGET_brcmbca),y)
$(CP) ./files/broadcom/* $(1)/ $(CP) ./files/broadcom/* $(1)/
endif endif
$(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
$(CP) $(PKG_BUILD_DIR)/libbbfdsl.so $(1)/etc/dsl/
endef endef
$(eval $(call BuildPackage,dslmngr)) $(eval $(call BuildPackage,dslmngr))

View file

@ -0,0 +1,16 @@
{
"daemon": {
"input": {
"type": "DotSo",
"name": "/etc/dsl/libbbfdsl.so"
},
"output": {
"type": "UBUS",
"name": "bbfdm.DSL.",
"parent_dm": "Device.",
"object": "DSL",
"root_obj": "bbfdm",
"multiple_objects": ["DSL","PTM","ATM","FAST"]
}
}
}

View file

@ -2,6 +2,7 @@
. /lib/functions.sh . /lib/functions.sh
include /lib/dsl include /lib/dsl
. /etc/bbfdm/bbfdm_services.sh
START=20 START=20
USE_PROCD=1 USE_PROCD=1
@ -9,6 +10,7 @@ USE_PROCD=1
DSLMNGR=$(which dslmngr) DSLMNGR=$(which dslmngr)
start_service() { start_service() {
bbfdm_add_service "bbfdm.DSL" "/etc/dsl/input.json"
[ -n "$DSLMNGR" ] && { [ -n "$DSLMNGR" ] && {
procd_open_instance procd_open_instance
procd_set_param command "$DSLMNGR" procd_set_param command "$DSLMNGR"