ieee1905: prefix plugins with ieee1905-

This commit is contained in:
Jakob Olsson 2024-01-23 17:25:17 +01:00
parent 98bd33aa29
commit 0ed837ffda
8 changed files with 18 additions and 18 deletions

View file

@ -29,7 +29,7 @@ define Package/decollector
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=WiFi DataElements Collector Proxy TITLE:=WiFi DataElements Collector Proxy
DEPENDS:=+libuci +libubox +ubus +libpthread +libnl-genl \ DEPENDS:=+libuci +libubox +ubus +libpthread +libnl-genl \
+libeasy +libwifiutils +libieee1905 +map-plugin +libeasy +libwifiutils +libieee1905 +ieee1905-map-plugin
endef endef
define Package/decollector/description define Package/decollector/description

View file

@ -60,12 +60,12 @@ define Package/libieee1905/description
endef endef
plugins := \ plugins := \
$(if $(CONFIG_PACKAGE_map-plugin),map) \ $(if $(CONFIG_PACKAGE_ieee1905-map-plugin),map) \
$(if $(CONFIG_PACKAGE_snoop-plugin),snoop) \ $(if $(CONFIG_PACKAGE_ieee1905-snoop-plugin),snoop) \
$(if $(CONFIG_PACKAGE_topology-plugin),topology) $(if $(CONFIG_PACKAGE_ieee1905-topology-plugin),topology)
ppkg:=$(patsubst plugins/%.mk,%-plugin,$(wildcard plugins/*.mk)) ppkg:=$(patsubst plugins/%.mk,ieee1905-%-plugin,$(wildcard plugins/*.mk))
TARGET_CFLAGS += \ TARGET_CFLAGS += \

View file

@ -1,12 +1,12 @@
define Package/map-plugin define Package/ieee1905-map-plugin
$(call Package/ieee1905/Default) $(call Package/ieee1905/Default)
TITLE:=Multi-AP plugin supporting WiFi-Alliance Easymesh standard TITLE:=Multi-AP plugin supporting WiFi-Alliance Easymesh standard
DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \ DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+libjson-c +libblobmsg-json +ieee1905 +libieee1905 +libjson-c +libblobmsg-json +ieee1905 +libieee1905
endef endef
define Package/map-plugin/config define Package/ieee1905-map-plugin/config
if (PACKAGE_map-plugin) if (PACKAGE_ieee1905-map-plugin)
menu "Configuration" menu "Configuration"
@ -32,7 +32,7 @@ ifeq ($(CONFIG_MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG),y)
TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG
endif endif
define Build/InstallDev/map-plugin define Build/InstallDev/ieee1905-map-plugin
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
$(INSTALL_DIR) $(1)/usr/lib/ieee1905 $(INSTALL_DIR) $(1)/usr/lib/ieee1905
@ -43,7 +43,7 @@ define Build/InstallDev/map-plugin
$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so $(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
endef endef
define Package/map-plugin/install define Package/ieee1905-map-plugin/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DIR) $(1)/usr/lib/ieee1905 $(INSTALL_DIR) $(1)/usr/lib/ieee1905
$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so $(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so

View file

@ -1,11 +1,11 @@
define Package/snoop-plugin define Package/ieee1905-snoop-plugin
$(call Package/ieee1905/Default) $(call Package/ieee1905/Default)
TITLE:=Show all received 1905 CMDUs over UBUS TITLE:=Show all received 1905 CMDUs over UBUS
DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \ DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+libjson-c +libblobmsg-json +ieee1905 +libieee1905 +libjson-c +libblobmsg-json +ieee1905 +libieee1905
endef endef
define Package/snoop-plugin/install define Package/ieee1905-snoop-plugin/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DIR) $(1)/usr/lib/ieee1905 $(INSTALL_DIR) $(1)/usr/lib/ieee1905
$(CP) $(PKG_BUILD_DIR)/src/extensions/snoop/snoop.so $(1)/usr/lib/ieee1905/snoop.so $(CP) $(PKG_BUILD_DIR)/src/extensions/snoop/snoop.so $(1)/usr/lib/ieee1905/snoop.so

View file

@ -1,11 +1,11 @@
define Package/topology-plugin define Package/ieee1905-topology-plugin
$(call Package/ieee1905/Default) $(call Package/ieee1905/Default)
TITLE:=Build full network topology of the 1905 nodes only TITLE:=Build full network topology of the 1905 nodes only
DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \ DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+libjson-c +libblobmsg-json +ieee1905 +libieee1905 +libjson-c +libblobmsg-json +ieee1905 +libieee1905
endef endef
define Package/topology-plugin/install define Package/ieee1905-topology-plugin/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_DIR) $(1)/usr/lib/ieee1905 $(INSTALL_DIR) $(1)/usr/lib/ieee1905
$(CP) $(PKG_BUILD_DIR)/src/extensions/topology/topology.so $(1)/usr/lib/ieee1905/topology.so $(CP) $(PKG_BUILD_DIR)/src/extensions/topology/topology.so $(1)/usr/lib/ieee1905/topology.so

View file

@ -71,7 +71,7 @@ CONFIG_PACKAGE_wifimngr=y
# Multi-AP # # Multi-AP #
CONFIG_PACKAGE_ieee1905=y CONFIG_PACKAGE_ieee1905=y
CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y
CONFIG_PACKAGE_topology-plugin=y CONFIG_PACKAGE_ieee1905-topology-plugin=y
CONFIG_PACKAGE_decollector=y CONFIG_PACKAGE_decollector=y
CONFIG_PACKAGE_map-agent=y CONFIG_PACKAGE_map-agent=y
CONFIG_PACKAGE_map-controller=y CONFIG_PACKAGE_map-controller=y

View file

@ -28,7 +28,7 @@ define Package/map-agent
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=WiFi multi-AP Agent (EasyMesh R2) TITLE:=WiFi multi-AP Agent (EasyMesh R2)
DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \ DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
+map-plugin +ip-bridge +AGENT_USE_LIBDPP:libdpp +ieee1905-map-plugin +ip-bridge +AGENT_USE_LIBDPP:libdpp
endef endef
ifeq ($(CONFIG_AGENT_USE_LIBDPP),y) ifeq ($(CONFIG_AGENT_USE_LIBDPP),y)
@ -40,7 +40,7 @@ define Package/dynbhd
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=Dynamic Backhaul Daemon TITLE:=Dynamic Backhaul Daemon
DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \ DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
+map-plugin +map-agent +ieee1905-map-plugin +map-agent
endef endef

View file

@ -27,7 +27,7 @@ define Package/map-controller
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=WiFi Multi-AP Controller (EasyMesh R2) TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +map-plugin \ DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +ieee1905-map-plugin \
+CONTROLLER_USE_LIBDPP:libdpp +CONTROLLER_USE_LIBDPP:libdpp
endef endef