Added libbbfdm-ubus and dm-service as dependencies for all microservices

2025-12-10 07:44:50 +01:00 · 2024-10-08 18:19:50 +02:00 · 2024-10-08 18:19:50 +02:00 · aab45b16b0
commit aab45b16b0
parent 586920d8a8
35 changed files with 66 additions and 38 deletions
--- a/bbfdm/Makefile
+++ b/bbfdm/Makefile
@ -45,7 +45,7 @@ define Package/bbfdmd
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=Datamodel ubus backend to expose core tree
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libopenssl +libbbfdm-ubus +bbf_configmngr +dm-service
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libopenssl +libbbfdm-ubus +bbf_configmngr
 endef

 define Package/dm-service
--- a/bridgemngr/Makefile
+++ b/bridgemngr/Makefile
@ -26,7 +26,8 @@ include ../bbfdm/bbfdm.mk
 define Package/bridgemngr
 CATEGORY:=Utilities
 TITLE:=Bridge Manager
- DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
+ DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/bridgemngr/description
--- a/ddnsmngr/Makefile
+++ b/ddnsmngr/Makefile
@ -28,7 +28,8 @@ define Package/$(PKG_NAME)
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=Dynamic DNS manager
-  DEPENDS:=+libbbfdm-api +DDNSMNGR_BACKEND_DDNSSCRIPT:ddns-scripts +DDNSMNGR_BACKEND_INADYN:inadyn
+  DEPENDS:=+DDNSMNGR_BACKEND_DDNSSCRIPT:ddns-scripts +DDNSMNGR_BACKEND_INADYN:inadyn
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
  MENU:=1
 endef

--- a/dhcpmngr/Makefile
+++ b/dhcpmngr/Makefile
@ -28,7 +28,8 @@ define Package/dhcpmngr
  SECTION:=net
  CATEGORY:=Network
  TITLE:=Package to add Device.DHCPv4 and v6 data model support.
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +odhcpd
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +odhcpd
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
  DEPENDS+=+DNSMNGR_DNS_SD:umdns
  DEPENDS+=+DNSMNGR_BACKEND_DNSMASQ:dnsmasq
 endef
--- a/dnsmngr/Makefile
+++ b/dnsmngr/Makefile
@ -27,7 +27,8 @@ MAKE_PATH:=src
 define Package/dnsmngr
  SECTION:=net
  CATEGORY:=Network
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +odhcpd
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +odhcpd
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
  DEPENDS+=+DNSMNGR_DNS_SD:umdns
  DEPENDS+=+DNSMNGR_BACKEND_DNSMASQ:dnsmasq
  DEPENDS+=+DNSMNGR_BACKEND_UNBOUND:unbound-daemon +DNSMNGR_BACKEND_UNBOUND:unbound-control
--- a/dslmngr/Makefile
+++ b/dslmngr/Makefile
@ -40,7 +40,8 @@ define Package/dslmngr
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/dslmngr/description
--- a/ethmngr/Makefile
+++ b/ethmngr/Makefile
@ -27,7 +27,8 @@ 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 +libbbfdm-api
+  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
 endef

 define Package/ethmngr/description
--- a/firewallmngr/Makefile
+++ b/firewallmngr/Makefile
@ -28,9 +28,10 @@ define Package/firewallmngr
  SECTION:=net
  CATEGORY:=Network
  TITLE:=Package to add Device.Firewall and Device.NAT. data model support.
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +firewall
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +firewall
  DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:kmod-ipt-trigger +FIREWALLMNGR_PORT_TRIGGER:kmod-ip6t-trigger
  DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:iptables-mod-nfqueue
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/firewallmngr/description
--- a/hostmngr/Makefile
+++ b/hostmngr/Makefile
@ -31,9 +31,8 @@ define Package/hostmngr
  DEPENDS= +libubox +libuci +libubus +ubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +libnfnetlink +libmnl \
 	   +libnetfilter-conntrack \
-	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi +libbbfdm-api \
-	   +libwifiutils
-
+	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi +libwifiutils
+  DEPENDS+= +libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/hostmngr/config
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@ -31,7 +31,8 @@ define Package/icwmp
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api +libopenssl
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libopenssl
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
  MENU:=1
 endef

--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@ -48,7 +48,8 @@ define Package/ieee1905
  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ubus +libpthread \
 	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi \
-	   +libwifiutils +libbbfdm-api
+	   +libwifiutils
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 include $(wildcard plugins/*.mk)
--- a/logmngr/Makefile
+++ b/logmngr/Makefile
@ -27,8 +27,9 @@ define Package/logmngr
 SECTION:=utils
 CATEGORY:=Utilities
 TITLE:=Logging Manager
- DEPENDS:=+libbbfdm-api +LOGMNGR_BACKEND_FLUENTBIT:fluent-bit +LOGMNGR_LOGROTATE:logrotate
+ DEPENDS:=+LOGMNGR_BACKEND_FLUENTBIT:fluent-bit +LOGMNGR_LOGROTATE:logrotate
 DEPENDS+=+LOGMNGR_BACKEND_SYSLOG_NG:syslog-ng
+ DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/logmngr/description
--- a/mcastmngr/Makefile
+++ b/mcastmngr/Makefile
@ -29,7 +29,8 @@ MAKE_PATH:=bbf_plugin
 define Package/mcastmngr
 CATEGORY:=Utilities
 TITLE:=Multicast Proxy/Snooping Manager
- DEPENDS:=+!TARGET_brcmbca:mcproxy +libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
+ DEPENDS:=+!TARGET_brcmbca:mcproxy +libuci +libubox +libubus +libblobmsg-json
+ DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/mcastmngr/description
--- a/netmngr/Makefile
+++ b/netmngr/Makefile
@ -25,7 +25,8 @@ include ../bbfdm/bbfdm.mk
 define Package/netmngr
 CATEGORY:=Utilities
 TITLE:=Network Data Model Support
- DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
+ DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/netmngr/description
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@ -34,7 +34,8 @@ define Package/obuspa
  MENU:=1
  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl +ca-certificates \
 		+OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL:mosquitto-ssl +OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL:mosquitto-client-ssl \
-		+OBUSPA_ENABLE_TEST_CONTROLLER:mosquitto-auth-shadow +libbbfdm-api +libjson-c
+		+OBUSPA_ENABLE_TEST_CONTROLLER:mosquitto-auth-shadow +libjson-c
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/obuspa/description
--- a/packet-capture-diagnostics/Makefile
+++ b/packet-capture-diagnostics/Makefile
@ -27,7 +27,8 @@ define Package/packet-capture-diagnostics
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=PacketCaptureDiagnostics datamodel
-  DEPENDS:=+libbbfdm-api +tcpdump
+  DEPENDS:=+tcpdump
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
  MENU:=1
 endef

--- a/periodicstats/Makefile
+++ b/periodicstats/Makefile
@ -26,7 +26,8 @@ define Package/periodicstats
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=Periodic Statistics Daemon
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/periodicstats/description
--- a/port-trigger/Makefile
+++ b/port-trigger/Makefile
@ -26,7 +26,8 @@ define Package/port-trigger
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=Port Trigger Daemon
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +kmod-ipt-trigger +kmod-ip6t-trigger +iptables-mod-nfqueue
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +kmod-ipt-trigger +kmod-ip6t-trigger +iptables-mod-nfqueue
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/port-trigger/description
--- a/qosmngr/Makefile
+++ b/qosmngr/Makefile
@ -28,8 +28,9 @@ define Package/qosmngr
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=QoS Manager
-  DEPENDS:=+libbbfdm-api +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos +!(TARGET_brcmbca||TARGET_airoha):tc-full
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos +!(TARGET_brcmbca||TARGET_airoha):tc-full
  DEPENDS+=+kmod-vlantranslation +kmod-dscp2pbit +!(TARGET_brcmbca):ebtables-legacy
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/qosmngr/description
--- a/self-diagnostics/Makefile
+++ b/self-diagnostics/Makefile
@ -13,7 +13,8 @@ define Package/self-diagnostics
  CATEGORY:=Utilities
  TITLE:=System Report
  DEPENDS:=+@CONFIG_BUSYBOX_CONFIG_TIMEOUT +@CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PATH +@CONFIG_BUSYBOX_CONFIG_TEE \
-           +@CONFIG_BUSYBOX_CONFIG_GZIP +libbbfdm-api
+           +@CONFIG_BUSYBOX_CONFIG_GZIP
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
  MENU:=1
 endef

--- a/ssdpd/Makefile
+++ b/ssdpd/Makefile
@ -33,7 +33,8 @@ endef
 define Package/ssdpd
  SECTION:=net
  CATEGORY:=Network
-  DEPENDS:=+libnfnetlink +libpthread +libubox +libubus +libblobmsg-json +libcurl +mxml +SSDPD_UPNP_DEVICE:miniupnpd-iptables +libbbfdm-api
+  DEPENDS:=+libnfnetlink +libpthread +libubox +libubus +libblobmsg-json +libcurl +mxml +SSDPD_UPNP_DEVICE:miniupnpd-iptables
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
  TITLE:=MiniSSDPd - SSDP Daemon
  URL:=https://miniupnp.tuxfamily.org/minissdpd.html
 endef
--- a/sshmngr/Makefile
+++ b/sshmngr/Makefile
@ -28,7 +28,8 @@ define Package/sshmngr
  SECTION:=net
  CATEGORY:=Network
  TITLE:=Package to add Device.SSH data model support.
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
  DEPENDS+=+SSHMNGR_BACKEND_OPENSSH:openssh-server +SSHMNGR_BACKEND_OPENSSH:openssh-client-utils
  DEPENDS+=+SSHMNGR_BACKEND_OPENSSH_PAM:openssh-server-pam +SSHMNGR_BACKEND_OPENSSH_PAM:openssh-client-utils
  DEPENDS+=+SSHMNGR_BACKEND_DROPBEAR:dropbear
--- a/stunc/Makefile
+++ b/stunc/Makefile
@ -32,7 +32,8 @@ define Package/stunc
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbfdm-api +libopenssl
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libopenssl
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 TARGET_CFLAGS += \
--- a/swmodd/Makefile
+++ b/swmodd/Makefile
@ -33,8 +33,8 @@ define Package/swmodd
  DEPENDS:=+libuci +libubox +ubus +libuuid +opkg +libcurl \
 	    +PACKAGE_lxc:lxc +PACKAGE_liblxc:liblxc +@BUSYBOX_CONFIG_BUSYBOX \
 	    +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT +@BUSYBOX_CONFIG_SCRIPT \
-	    +jq +libbbfdm-api +@CONFIG_KERNEL_CGROUPS \
-	    +SWMODD_LEGACY_CGROUPS:swmodd-cgroup
+	    +jq +@CONFIG_KERNEL_CGROUPS +SWMODD_LEGACY_CGROUPS:swmodd-cgroup
+	DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/swmodd/description
--- a/timemngr/Makefile
+++ b/timemngr/Makefile
@ -29,7 +29,8 @@ define Package/$(PKG_NAME)
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=Time manager daemon based on ntpd
-  DEPENDS:=+bbfdmd +ntpd +libuci +libubox +ubus +libbbfdm-api +libbbfdm-ubus +@BUSYBOX_CONFIG_PGREP
+  DEPENDS:=+ntpd +libuci +libubox +ubus +@BUSYBOX_CONFIG_PGREP
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +bbfdmd
  MENU:=1
 endef

--- a/tr104/Makefile
+++ b/tr104/Makefile
@ -32,7 +32,7 @@ define Package/$(PKG_NAME)
  SUBMENU:=TRx69
  TITLE:=TR104 Datamodel Daemon
  MENU:=1
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +asterisk +libcurl +PACKAGE_libbbfdm-api:libbbfdm-api
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +asterisk +libcurl +PACKAGE_libbbfdm-api:libbbfdm-api +PACKAGE_libbbfdm-ubus:libbbfdm-ubus +PACKAGE_dm-service:dm-service
 endef

 define Package/$(PKG_NAME)/description
--- a/tr143/Makefile
+++ b/tr143/Makefile
@ -25,7 +25,8 @@ include ../bbfdm/bbfdm.mk
 define Package/tr143
 CATEGORY:=Utilities
 TITLE:=TR-143 Data Model Support
- DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +netmngr
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
+ DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +netmngr
 endef

 define Package/tr143/description
--- a/tr471/Makefile
+++ b/tr471/Makefile
@ -25,7 +25,8 @@ include ../bbfdm/bbfdm.mk
 define Package/tr471
 CATEGORY:=Utilities
 TITLE:=TR-471 Data Model Support
- DEPENDS:=+obudpst +libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +netmngr
+ DEPENDS:=+obudpst +libuci +libubox +libubus +libblobmsg-json
+ DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +netmngr
 endef

 define Package/tr471/description
--- a/twamp/Makefile
+++ b/twamp/Makefile
@ -28,7 +28,8 @@ define Package/$(PKG_NAME)
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=TWAMP Light Client(TR-390)
-  DEPENDS:=+libuci +ubox +libubus +libbbfdm-api +netmngr
+  DEPENDS:=+libuci +ubox +libubus
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +netmngr
 endef

 define Package/$(PKG_NAME)/description
--- a/udpecho/Makefile
+++ b/udpecho/Makefile
@ -35,7 +35,7 @@ define Package/$(PKG_NAME)-server
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF UDP Echo Server
-  DEPENDS:=+libuci +libbbfdm-api +netmngr
+  DEPENDS:=+libuci +libbbfdm-api +netmngr +libbbfdm-ubus +dm-service
 endef

 define Package/$(PKG_NAME)-client
--- a/usbmngr/Makefile
+++ b/usbmngr/Makefile
@ -27,7 +27,7 @@ define Package/$(PKG_NAME)
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=USBManager
-  DEPENDS:=+libbbfdm-api
+  DEPENDS:=+libbbfdm-api +libbbfdm-ubus +dm-service
  MENU:=1
 endef

--- a/userinterface/Makefile
+++ b/userinterface/Makefile
@ -27,7 +27,8 @@ define Package/userinterface
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=Package to add Device.UserInterface. datamodel support using bbfdm
-  DEPENDS:=+libbbfdm-api +USERINTERFACE_HTTPACCESS_BACKEND_NGINX:nginx
+  DEPENDS:=+USERINTERFACE_HTTPACCESS_BACKEND_NGINX:nginx
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
  MENU:=1
 endef

--- a/usermngr/Makefile
+++ b/usermngr/Makefile
@ -28,7 +28,8 @@ define Package/usermngr
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=TRx69
-  DEPENDS:= +shadow-utils +libbbfdm-api +libopenssl
+  DEPENDS:= +shadow-utils +libopenssl
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
  TITLE:=Package to add Device.Users. datamodel support
 endef

--- a/wifidmd/Makefile
+++ b/wifidmd/Makefile
@ -25,7 +25,8 @@ include ../bbfdm/bbfdm.mk
 define Package/wifidmd
 CATEGORY:=Utilities
 TITLE:=WiFi Data Model Support
- DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
+ DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/wifidmd/config
--- a/xmppc/Makefile
+++ b/xmppc/Makefile
@ -35,7 +35,8 @@ define Package/$(PKG_NAME)
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF xmpp Client
-  DEPENDS:=+libuci +libubox +libstrophe +libubus +libbbfdm-api +@CONFIG_BUSYBOX_CONFIG_PIDOF
+  DEPENDS:=+libuci +libubox +libstrophe +libubus +@CONFIG_BUSYBOX_CONFIG_PIDOF
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef

 define Package/$(PKG_NAME)/description