diff --git a/sulu/sulu-builder/Makefile b/sulu/sulu-builder/Makefile index d6d855e36..4c0a90082 100644 --- a/sulu/sulu-builder/Makefile +++ b/sulu/sulu-builder/Makefile @@ -28,7 +28,7 @@ define Package/sulu/default CATEGORY:=Utilities SUBMENU:=SULU TITLE:=SULU-CE - DEPENDS:=+mosquitto-auth-shadow +usermngr +userinterface +obuspa +sulu-vendorext + DEPENDS:=+mosquitto-auth-shadow +usermngr +userinterface +obuspa DEPENDS+=+@OBUSPA_LOCAL_MQTT_LISTENER EXTRA_DEPENDS:=nginx endef diff --git a/sulu/sulu-vendorext/Makefile b/sulu/sulu-vendorext/Makefile deleted file mode 100644 index b2d5ca770..000000000 --- a/sulu/sulu-vendorext/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=sulu-vendorext -PKG_VERSION:=0.0.5 - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_LICENSE:=BSD-3-Clause -PKG_LICENSE_FILES:=none - -include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk - - -define Package/sulu-vendorext - SECTION:=utils - CATEGORY:=Utilities - TITLE:=Adds sulu-vendorext extensions -endef - -define Build/Compile -endef - -define Package/sulu-vendorext/install - $(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) suluvendorext - $(BBFDM_INSTALL_MS_DM) ./extn/X_IOWRT_EU_MAPController.json $(1) suluvendorext -endef - -$(eval $(call BuildPackage,sulu-vendorext)) diff --git a/sulu/sulu-vendorext/bbfdm_service.json b/sulu/sulu-vendorext/bbfdm_service.json deleted file mode 100644 index 79d5a775c..000000000 --- a/sulu/sulu-vendorext/bbfdm_service.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "daemon": { - "enable": "1", - "service_name": "suluvendorext", - "unified_daemon": false, - "services": [ - { - "parent_dm": "Device.", - "object": "X_IOWRT_EU_MAPController" - } - ], - "config": { - "loglevel": "3" - } - } -} diff --git a/sulu/sulu-vendorext/extn/X_IOWRT_EU_MAPController.json b/sulu/sulu-vendorext/extn/X_IOWRT_EU_MAPController.json deleted file mode 100644 index 106056f61..000000000 --- a/sulu/sulu-vendorext/extn/X_IOWRT_EU_MAPController.json +++ /dev/null @@ -1,206 +0,0 @@ -{ - "json_plugin_version": 2, - "Device.X_IOWRT_EU_MAPController.": { - "type": "object", - "protocols": [ - "usp" - ], - "access": false, - "array": false, - "Device.X_IOWRT_EU_MAPController.Controller.": { - "type": "object", - "protocols": [ - "usp" - ], - "access": false, - "array": false, - "dependency": "file:/etc/config/mapcontroller", - "Enable": { - "type": "boolean", - "read": true, - "write": true, - "protocols": [ - "usp" - ], - "default": true, - "mapping": [ - { - "type": "uci", - "uci": { - "file": "mapcontroller", - "section": { - "name": "controller" - }, - "option": { - "name": "enabled" - } - } - } - ] - }, - "ChannelPlan": { - "type": "unsignedInt", - "read": true, - "write": true, - "protocols": [ - "usp" - ], - "mapping": [ - { - "type": "uci", - "uci": { - "file": "mapcontroller", - "section": { - "name": "controller" - }, - "option": { - "name": "channel_plan_interval" - } - } - } - ] - }, - "AllowBackgroundDFS": { - "type": "unsignedInt", - "read": true, - "write": true, - "protocols": [ - "usp" - ], - "mapping": [ - { - "type": "uci", - "uci": { - "file": "mapcontroller", - "section": { - "name": "controller" - }, - "option": { - "name": "bgdfs_interval" - } - } - } - ] - }, - "TrafficSeparation": { - "type": "boolean", - "read": true, - "write": true, - "protocols": [ - "usp" - ], - "mapping": [ - { - "type": "uci", - "uci": { - "file": "mapcontroller", - "section": { - "name": "controller" - }, - "option": { - "name": "traffic_separation" - } - } - } - ] - }, - "InitialChannelScan": { - "type": "boolean", - "read": true, - "write": true, - "protocols": [ - "usp" - ], - "mapping": [ - { - "type": "uci", - "uci": { - "file": "mapcontroller", - "section": { - "name": "controller" - }, - "option": { - "name": "initial_scan" - } - } - } - ] - } - }, - "Device.X_IOWRT_EU_MAPController.STASteering.": { - "type": "object", - "protocols": [ - "usp" - ], - "access": false, - "array": false, - "dependency": "file:/etc/config/mapcontroller", - "STASteering": { - "type": "boolean", - "read": true, - "write": true, - "protocols": [ - "usp" - ], - "mapping": [ - { - "type": "uci", - "uci": { - "file": "mapcontroller", - "section": { - "name": "sta_steering" - }, - "option": { - "name": "enable_sta_steer" - } - } - } - ] - }, - "BackhaulSTASteering": { - "type": "boolean", - "read": true, - "write": true, - "protocols": [ - "usp" - ], - "mapping": [ - { - "type": "uci", - "uci": { - "file": "mapcontroller", - "section": { - "name": "sta_steering" - }, - "option": { - "name": "enable_bsta_steer" - } - } - } - ] - }, - "BandSteering": { - "type": "boolean", - "read": true, - "write": true, - "protocols": [ - "usp" - ], - "mapping": [ - { - "type": "uci", - "uci": { - "file": "mapcontroller", - "section": { - "name": "sta_steering" - }, - "option": { - "name": "bandsteer" - } - } - } - ] - } - } - } -}