diff --git a/ethmngr/Config.in b/ethmngr/Config.in index 43ffd6868..62ae8fa2c 100644 --- a/ethmngr/Config.in +++ b/ethmngr/Config.in @@ -2,8 +2,8 @@ if (PACKAGE_ethmngr) menu "Configurations" -config TR181_VENDOR_EXTENSIONS_MACVLAN - bool "Use TR181 vendor extension MACVLAN" +config ETHMNGR_MACVLAN_EXTENSION + bool "Enable datamodel MACVLAN vendor extension" default y endmenu endif diff --git a/ethmngr/Makefile b/ethmngr/Makefile index 477090ca3..b1d27840c 100644 --- a/ethmngr/Makefile +++ b/ethmngr/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ethmngr -PKG_VERSION:=2.1.11 +PKG_VERSION:=3.0.0 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git -PKG_SOURCE_VERSION:=dee1ef30dffb03924ad908a0be8ab3aba38b86ee +PKG_SOURCE_VERSION:=7d68c0d820a185fc48de13a500f1ed19c1172e68 PKG_MAINTAINER:=Rahul Thakur PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz PKG_MIRROR_HASH:=skip @@ -21,14 +21,14 @@ PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -include ../bbfdm/bbfdm.mk +include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk define Package/ethmngr SECTION:=utils CATEGORY:=Utilities TITLE:=Ethernet status and configration utility - DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy - DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service + DEPENDS:=+libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy + DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +libblobmsg-json +libjson-c +libc +libubus endef define Package/ethmngr/description @@ -53,26 +53,15 @@ TARGET_CFLAGS += \ -D_GNU_SOURCE \ -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\" -ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y) -TARGET_CFLAGS += -DTR181_VENDOR_EXTENSIONS_MACVLAN -endif - -ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),) -define Build/Compile -endef +ifeq ($(CONFIG_ETHMNGR_MACVLAN_EXTENSION),y) +TARGET_CFLAGS += -DETHMNGR_MACVLAN_EXTENSION endif define Package/ethmngr/install $(CP) ./files/* $(1)/ -ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),) $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/ -endif $(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME) - $(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/bbfdm_service.json b/ethmngr/bbfdm_service.json index f47b53a58..1fe7f828b 100644 --- a/ethmngr/bbfdm_service.json +++ b/ethmngr/bbfdm_service.json @@ -2,7 +2,7 @@ "daemon": { "enable": "1", "service_name": "ethmngr", - "unified_daemon": false, + "unified_daemon": true, "services": [ { "parent_dm": "Device.", diff --git a/ethmngr/files/etc/init.d/ethmngr b/ethmngr/files/etc/init.d/ethmngr index e4fdc138b..4c3f44f2d 100755 --- a/ethmngr/files/etc/init.d/ethmngr +++ b/ethmngr/files/etc/init.d/ethmngr @@ -6,23 +6,11 @@ STOP=90 USE_PROCD=1 PROG=/usr/sbin/ethmngr -. /lib/functions.sh -include /lib/ethernet - start_service() { if [ -f $PROG ]; then - procd_open_instance + procd_open_instance "ethmngr" procd_set_param command ${PROG} procd_set_param respawn - procd_close_instance + procd_close_instance "ethmngr" fi } - -reload_service() { - stop - start -} - -service_triggers() { - procd_add_reload_trigger network -} diff --git a/ethmngr/files/etc/ruleng/ethport.json b/ethmngr/files/etc/ruleng/ethport.json deleted file mode 100644 index b9d632010..000000000 --- a/ethmngr/files/etc/ruleng/ethport.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "ethport_update": { - "if" : [ - { - "event": "network.device" - } - ], - "then" : [ - { - "cli": "/sbin/hotplug-call ethernet", - "envs": { - "PORT": "&network.device->ifname", - "LINK": "&network.device->link" - }, - "timeout": 1 - } - ] - } -} - diff --git a/ethmngr/files/etc/uci-defaults/ruleng.ethport b/ethmngr/files/etc/uci-defaults/ruleng.ethport deleted file mode 100644 index cf201af47..000000000 --- a/ethmngr/files/etc/uci-defaults/ruleng.ethport +++ /dev/null @@ -1,2 +0,0 @@ -uci -q set ruleng.ethport=rule -uci -q set ruleng.ethport.recipe='/etc/ruleng/ethport.json'