diff --git a/ethmngr/Makefile b/ethmngr/Makefile index 7645d01df..5f454310b 100644 --- a/ethmngr/Makefile +++ b/ethmngr/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ethmngr -PKG_VERSION:=2.1.6 +PKG_VERSION:=2.1.7 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=b1ca967248cc5c7b852e8a904134e0bed451a116 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git +PKG_SOURCE_VERSION:=d029ce86fe99b7896f096f68eda3f6caa000ee5f PKG_MAINTAINER:=Rahul Thakur PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz PKG_MIRROR_HASH:=skip @@ -69,9 +69,10 @@ ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$( $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/ endif - $(CP) $(PKG_BUILD_DIR)/libbbfethernet.so $(1)/etc/ethmngr - $(CP) $(PKG_BUILD_DIR)/libbbfethernetmacvlan.so $(1)/etc/ethmngr/plugins - $(call BbfdmInstallMicroServiceInputFile,$(1),./files/etc/bbfdm/micro_services/ethernet.json) + $(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfethernet.so $(1) $(PKG_NAME) +ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y) + $(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/libbbfethernetmacvlan.so $(1) $(PKG_NAME) +endif endef $(eval $(call BuildPackage,ethmngr)) diff --git a/ethmngr/files/etc/bbfdm/micro_services/ethernet.json b/ethmngr/files/etc/bbfdm/micro_services/ethernet.json deleted file mode 100644 index 50be5b09c..000000000 --- a/ethmngr/files/etc/bbfdm/micro_services/ethernet.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "daemon": { - "config": { - "loglevel": "1" - }, - "input": { - "type": "DotSo", - "name": "/etc/ethmngr/libbbfethernet.so", - "plugin_dir": "/etc/ethmngr/plugins" - }, - "output": { - "type": "UBUS", - "parent_dm": "Device.", - "object": "Ethernet", - "root_obj": "bbfdm" - } - } -}