iop: add remote references for openwrt

bbf/Makefile

@@ -4,22 +4,24 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=bbfdm
-PKG_VERSION:=1.0.4
+PKG_NAME:=libbbf_dm
+PKG_VERSION:=7.0.1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=96b305926f8fa8cafa0638e613879537da9b6086
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_SOURCE_VERSION:=4515b6319870aaa4b415bb66a4c60a91a1fa6592
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
-PKG_LICENSE:=BSD-3-Clause
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-define Package/libbbfdm-api
+define Package/libbbf_api
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
@@ -28,55 +30,43 @@ define Package/libbbfdm-api
   ABI_VERSION:=1.0
 endef
 
-define Package/libbbfdm/default
+define Package/libbbf_dm/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbfdm-api \
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbf_api \
 	    +BBF_TR471:obudpst
 endef
 
-define Package/libbbfdm
-  $(Package/libbbfdm/default)
-  TITLE += (default)
-  VARIANT:=default
-  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
+define Package/libbbf_dm
+  $(Package/libbbf_dm/default)
+  TITLE += (internal)
+  VARIANT:=internal
+endef
+
+define Package/libbbf_dm-mbedtls
+  $(Package/libbbf_dm/default)
+  TITLE += (mbedtls)
+  DEPENDS += +PACKAGE_libbbf_dm-mbedtls:libmbedtls
+  VARIANT:=mbedtls
   DEFAULT_VARIANT:=1
 endef
 
-define Package/libbbfdm-mbedtls
-  $(Package/libbbfdm/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_libbbfdm-mbedtls:libmbedtls
-  VARIANT:=mbedtls
-  CONFLICTS := libbbfdm libbbfdm-openssl libbbfdm-wolfssl
-endef
-
-define Package/libbbfdm-openssl
-  $(Package/libbbfdm/default)
+define Package/libbbf_dm-openssl
+  $(Package/libbbf_dm/default)
   TITLE += (openssl)
-  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
+  DEPENDS += +PACKAGE_libbbf_dm-openssl:libopenssl
+  CONFLICTS := libbbf_dm-mbedtls
   VARIANT:=openssl
-  CONFLICTS := libbbfdm libbbfdm-mbedtls libbbfdm-wolfssl
 endef
 
-define Package/libbbfdm-wolfssl
-  $(Package/libbbfdm/default)
+define Package/libbbf_dm-wolfssl
+  $(Package/libbbf_dm/default)
   TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_libbbfdm-wolfssl:libwolfssl
+  DEPENDS += +PACKAGE_libbbf_dm-wolfssl:libwolfssl
+  CONFLICTS := libbbf_dm-mbedtls libbbf_dm-openssl
   VARIANT:=wolfssl
-  CONFLICTS := libbbfdm libbbfdm-mbedtls libbbfdm-openssl
-endef
-
-define Package/bbfdmd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=Datamodel ubus backend
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +PACKAGE_libbbfdm-mbedtls:libbbfdm-mbedtls \
-		   +PACKAGE_libbbfdm-openssl:libbbfdm-openssl +PACKAGE_libbbfdm-wolfssl:libbbfdm-wolfssl \
-		   +PACKAGE_libbbfdm:libbbfdm
 endef
 
 define Package/userinterface
@@ -90,15 +80,15 @@ define Package/userinterface/description
   Package to add Device.UserInterface. datamodel support
 endef
 
-define Package/libbbfdm/config
+define Package/libbbf_dm/config
 	source "$(SOURCE)/Config_bbfdm.in"
 endef
 
-define Package/libbbfdm-api/description
- Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
+define Package/libbbf_api/description
+ Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbf_dm
 endef
 
-define Package/libbbfdm/description
+define Package/libbbf_dm/description
  Library contains the data model tree. It includes TR181, TR104 and TR143 data models
 endef
 
@@ -148,10 +138,6 @@ CMAKE_OPTIONS += \
 	-DBBF_DOTSO_PLUGIN=ON
 endif
 
-ifeq ($(BUILD_VARIANT),default)
-CMAKE_OPTIONS += -DWITH_OPENSSL=ON
-endif
-
 ifeq ($(BUILD_VARIANT),openssl)
 CMAKE_OPTIONS += -DWITH_OPENSSL=ON
 endif
@@ -164,28 +150,22 @@ ifeq ($(BUILD_VARIANT),mbedtls)
 CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
 endif
 
-ifeq ($(CONFIG_PACKAGE_bbfdmd),y)
-CMAKE_OPTIONS += -DBBFDMD_ENABLED=ON
-CMAKE_OPTIONS += \
-	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
-endif
-
-define Package/libbbfdm-api/install
+define Package/libbbf_api/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbbf_api/libbbf_api.so $(1)/lib/
 endef
 
-define Package/libbbfdm/default/install
+define Package/libbbf_dm/default/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbbf_dm/libbbf_dm.so $(1)/lib/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
 ifeq ($(CONFIG_BBF_TR143),y)
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libbbfdm/scripts/* $(1)/usr/share/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libbbf_dm/scripts/* $(1)/usr/share/bbfdm
 	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
 endif
 ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
@@ -196,21 +176,12 @@ ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
 endif
 endef
 
-define Package/libbbfdm/default/prerm
+define Package/libbbf_dm/default/prerm
 	#!/bin/sh
 	rm -rf /etc/bbfdm/dmmap/*
 	exit 0
 endef
 
-define Package/bbfdmd/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
-	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/src/bbfdmd $(1)/usr/sbin/
-endef
-
 define Package/userinterface/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
@@ -224,36 +195,31 @@ define Package/userinterface/install
 	$(INSTALL_BIN) ./files/etc/firewall.userinterface $(1)/etc/firewall.userinterface
 endef
 
-Package/libbbfdm/prerm = $(Package/libbbfdm/default/prerm)
-Package/libbbfdm-openssl/prerm = $(Package/libbbfdm/default/prerm)
-Package/libbbfdm-wolfssl/prerm = $(Package/libbbfdm/default/prerm)
-Package/libbbfdm-mbedtls/prerm = $(Package/libbbfdm/default/prerm)
+Package/libbbf_dm-openssl/prerm = $(Package/libbbf_dm/default/prerm)
+Package/libbbf_dm-wolfssl/prerm = $(Package/libbbf_dm/default/prerm)
+Package/libbbf_dm-mbedtls/prerm = $(Package/libbbf_dm/default/prerm)
 
-Package/libbbfdm/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-openssl/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-wolfssl/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-mbedtls/install = $(Package/libbbfdm/default/install)
+Package/libbbf_dm-openssl/install = $(Package/libbbf_dm/default/install)
+Package/libbbf_dm-wolfssl/install = $(Package/libbbf_dm/default/install)
+Package/libbbf_dm-mbedtls/install = $(Package/libbbf_dm/default/install)
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
-	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api
+	$(INSTALL_DIR) $(1)/usr/include/libbbf_dm
 	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/*.h $(1)/usr/include/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm/dmtree/tr181/device.h $(1)/usr/include/libbbfdm/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/vendor.h $(1)/usr/include/libbbfdm/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbfdm-api/
-	# Work around for backward compatibility
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbf_api/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/libbbfdm_api.h $(1)/usr/include/libbbf_api.h
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/include/*.h $(1)/usr/include/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_dm/dmtree/tr181/device.h $(1)/usr/include/libbbf_dm/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_dm/dmtree/vendor/vendor.h $(1)/usr/include/libbbf_dm/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
+	$(CP) $(PKG_BUILD_DIR)/libbbf_dm/libbbf_dm.so $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbbf_api/libbbf_api.so $(1)/usr/lib/
 endef
 
-$(eval $(call BuildPackage,libbbfdm-api))
-$(eval $(call BuildPackage,libbbfdm))
-$(eval $(call BuildPackage,libbbfdm-openssl))
-$(eval $(call BuildPackage,libbbfdm-wolfssl))
-$(eval $(call BuildPackage,libbbfdm-mbedtls))
-$(eval $(call BuildPackage,bbfdmd))
+$(eval $(call BuildPackage,libbbf_api))
+$(eval $(call BuildPackage,libbbf_dm))
+$(eval $(call BuildPackage,libbbf_dm-openssl))
+$(eval $(call BuildPackage,libbbf_dm-wolfssl))
+$(eval $(call BuildPackage,libbbf_dm-mbedtls))
 
 $(eval $(call BuildPackage,userinterface))

bbf/files/etc/init.d/userinterface

@@ -22,7 +22,7 @@ start_service() {
 	fi
 
 	# Inject firewall rules
-	procd_open_instance userinterface
+	procd_open_instance usp
 	/etc/firewall.userinterface
 	procd_close_instance
 }

bbfdm/files/etc/config/bbfdm

@@ -1,5 +0,0 @@
-
-config bbfdmd 'bbfdmd'
-	option loglevel '1'
-	option refresh_time '10'
-	option transaction_timeout '10'

bulkdata/Makefile

@@ -1,24 +1,28 @@
 #
 # Copyright (C) 2022 iopsys Software Solutions AB
 #
+# This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.0.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=2dd55d9c9eb01ed1b11e16bad9e2c3e8badfffeb
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
+PKG_SOURCE_VERSION:=6e85d2032e66df581fae7c72cd83cc89367b8fc8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_LICENSE:=BSD-3-Clause
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk

dslmngr/files/common/etc/init.d/dsl

@@ -21,6 +21,8 @@ start_service() {
 }
 
 stop_service() {
+	[ -n "$DSLMNGR" ] && service_stop $DSLMNGR
+
 	xtm_remove_devices
 	xdsl_stop
 }
@@ -43,3 +45,4 @@ reload_service() {
 service_triggers() {
         procd_add_reload_trigger dsl
 }
+

endptmngr/Config.in

@@ -0,0 +1,4 @@
+
+config ENDPT_OPEN
+       bool "Use pre-compiled version for Open SDK"
+       default n

endptmngr/Makefile

@@ -0,0 +1,68 @@
+#
+# Copyright (C) 2018 IOPSYS Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=endptmngr
+PKG_VERSION:=0.6
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
+PKG_SOURCE_VERSION:=fb85081443c19b5062bede49c80b1802c0f05d34
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE_FILES:=LICENSE
+
+export BUILD_DIR
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+# All config variable that are passed to the make invocation, directly or
+# indirectly. This ensures that the package is rebuilt on config-changes.
+PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
+
+export CONFIG_BCM_CHIP_ID
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/endptmngr/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Package/endptmngr
+  CATEGORY:=Utilities
+  TITLE:=Broadcom Voice Endpoint Manager
+  URL:=
+  DEPENDS:= +libubox +ubus +libpicoevent +uci +bcmkernel @TARGET_HAS_VOICE @BCM_VOICE
+endef
+
+define Package/endptmngr/description
+	endptmngr
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        rsync -av --exclude=.* ~/git/endptmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+TARGET_CFLAGS += \
+        -Wall \
+        -Werror
+
+define Package/endptmngr/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/endptmngr $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,endptmngr))

endptmngr/files/etc/init.d/endptmngr

@@ -0,0 +1,27 @@
+#!/bin/sh /etc/rc.common
+
+START=68
+STOP=12
+
+USE_PROCD=1
+NAME=endptmngr
+
+start_service() {
+	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
+
+	procd_open_instance
+	procd_set_param env hw_board_hasDect=$(db get hw.board.hasDect)
+	procd_set_param command $NAME
+	procd_set_param respawn "5" "0" "3"
+	procd_set_param nice -12
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger asterisk 
+}

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
+# Copyright (C) 2020-2022 IOPSYS Software Solutions AB
 #
 # This is free software, licensed under the BSD-3-Clause
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.3.2
+PKG_VERSION:=9.2.0
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=a68417ec44251e9f619f2682618b06dae083bd32
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
+PKG_SOURCE_VERSION:=6f5852133a503e58747191ea1c7912436013dbbf
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -29,44 +29,33 @@ define Package/icwmp/default
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api
-endef
-
-define Package/icwmp
-  $(Package/icwmp/default)
-  VARIANT:=default
-  DEFAULT_VARIANT:=1
-  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbf_api
 endef
 
 define Package/icwmp-openssl
   $(Package/icwmp/default)
   TITLE += (openssl)
-  VARIANT:=openssl
   DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
-  CONFLICTS := icwmp icwmp-mbedtls icwmp-wolfssl
+  VARIANT:=openssl
 endef
 
 define Package/icwmp-wolfssl
   $(Package/icwmp/default)
   TITLE += (wolfssl)
-  VARIANT:=wolfssl
   DEPENDS += +PACKAGE_icwmp-wolfssl:libwolfssl
-  CONFLICTS := icwmp icwmp-mbedtls icwmp-openssl
+  CONFLICTS := icwmp-openssl
+  VARIANT:=wolfssl
 endef
 
 define Package/icwmp-mbedtls
   $(Package/icwmp/default)
   TITLE += (mbedtls)
   DEPENDS += +PACKAGE_icwmp-mbedtls:libmbedtls
+  CONFLICTS := icwmp-openssl icwmp-wolfssl
   VARIANT:=mbedtls
-  CONFLICTS := icwmp icwmp-wolfssl icwmp-openssl
+  DEFAULT_VARIANT:=1
 endef
 
-ifeq ($(BUILD_VARIANT),default)
-CMAKE_OPTIONS += -DWITH_OPENSSL=ON
-endif
-
 ifeq ($(BUILD_VARIANT),openssl)
 CMAKE_OPTIONS += -DWITH_OPENSSL=ON
 endif
@@ -110,12 +99,10 @@ define Package/icwmp/default/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
 endef
 
-Package/icwmp/install = $(Package/icwmp/default/install)
 Package/icwmp-openssl/install = $(Package/icwmp/default/install)
 Package/icwmp-wolfssl/install = $(Package/icwmp/default/install)
 Package/icwmp-mbedtls/install = $(Package/icwmp/default/install)
 
-$(eval $(call BuildPackage,icwmp))
 $(eval $(call BuildPackage,icwmp-openssl))
 $(eval $(call BuildPackage,icwmp-wolfssl))
 $(eval $(call BuildPackage,icwmp-mbedtls))

icwmp/files/etc/config/cwmp

@@ -15,6 +15,7 @@ config acs 'acs'
 config cpe 'cpe'
 	option enable '1'
 	option default_wan_interface 'wan'
+	option default_wan6_interface 'wan6'
 	option default_lan_interface 'lan'
 	option log_to_console 'disable'
 	option log_to_file 'disable'

icwmp/files/etc/init.d/icwmpd

@@ -329,6 +329,7 @@ validate_cpe_section()
 	uci_validate_section cwmp cpe "cpe" \
 		'interface:string' \
 		'default_wan_interface:string' \
+		'default_wan6_interface:string' \
 		'log_to_console:or("enable","disable")' \
 		'log_to_file:or("enable","disable")' \
 		'log_severity:or("EMERG", "ALERT", "CRITIC" ,"ERROR", "WARNING", "NOTICE", "INFO", "DEBUG")' \

ieee1905/Makefile

@@ -11,7 +11,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=1717f97c054c232d393c91fa7e95a571bf893680
-PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif

imonitor/files/etc/init.d/imonitor

@@ -18,7 +18,12 @@ start_service() {
 	procd_close_instance
 }
 
+stop() {
+	service_stop imonitor
+}
+
 reload_service() {
 	stop
 	start
 }
+

iop/config

@@ -65,7 +65,7 @@ CONFIG_PACKAGE_ieee1905=y
 CONFIG_PACKAGE_map-agent=m
 CONFIG_PACKAGE_map-controller=m
 CONFIG_PACKAGE_map-topology=y
-CONFIG_PACKAGE_decollector=y
+CONFIG_PACKAGE_wfadatad-collector=y
 
 # Network #
 CONFIG_PACKAGE_netmode=y
@@ -79,13 +79,12 @@ CONFIG_PACKAGE_rulengd=y
 CONFIG_PACKAGE_usermngr=y
 
 # TR-x69 #
-CONFIG_PACKAGE_libbbfdm=y
-CONFIG_PACKAGE_bbfdmd=y
-CONFIG_PACKAGE_icwmp=y
+CONFIG_PACKAGE_uspd-mbedtls=y
+CONFIG_PACKAGE_icwmp-mbedtls=y
 CONFIG_PACKAGE_obuspa=y
 CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc=m
+CONFIG_PACKAGE_stunc-mbedtls=m
 CONFIG_PACKAGE_swmodd=m
 CONFIG_PACKAGE_twamp=m
 CONFIG_PACKAGE_udpecho-client=m

iop/iop.completion

@@ -35,7 +35,8 @@ _iop()
     iopcmds="bootstrap cfe_upgrade cfe_upgrade_latest extract_core \
              feeds_update genconfig generate_tarballs install_key \
              scp_changes setup_host ssh_install_key status \
-             update_package update_feed_branches ssh_upgrade smoketest"
+             update_package update_feed_branches ssh_upgrade smoketest \
+             add_refs"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 

iop/scripts/add_refs.sh

@@ -0,0 +1,26 @@
+#! /bin/bash
+
+declare -A refs=( \
+	["."]="https://git.openwrt.org/openwrt/openwrt.git" \
+	["feeds/openwrt_luci"]="https://git.openwrt.org/project/luci.git" \
+	["feeds/openwrt_packages"]="https://git.openwrt.org/feed/packages.git" \
+	["feeds/openwrt_routing"]="https://git.openwrt.org/feed/routing.git" \
+	["feeds/openwrt_telephony"]="https://git.openwrt.org/feed/telephony.git" \
+	);
+
+function rem_refs {
+	for key in "${!refs[@]}"
+	do
+		git -C "$key" remote remove openwrt
+	done
+}
+
+function add_refs {
+	for key in "${!refs[@]}"
+	do
+		git -C "$key" remote add openwrt "${refs[$key]}"
+#		echo "Remotes for ${key}:"
+#		git -C "$key" remote -v
+#		echo ""
+	done
+}

iop/scripts/feeds_update.sh

@@ -42,6 +42,17 @@ function feeds_update {
 		./scripts/feeds install -p targets $target
 	done
 
+	# Workaround for bug in 22.03.0-rc4 where installed target path has been
+	# moved to target/linux/feeds but Config.in and Makefile from installed
+	# targets are not properly included from the new location.
+	# This hack is to be removed once the issues are fixed.
+	# Note that the above block of code might no longer necessary because
+	# targets no longer need to be installed explicitly.
+	echo "Working around installed-target-bug"
+	for f in target/linux/feeds/*; do
+		ln -vsf "feeds/$(basename "$f")" "target/linux/$(basename "$f")"
+	done
+
 	# install all packages
 	./scripts/feeds install -a
 

iwatchdog/files/etc/init.d/iwatchdog

@@ -32,3 +32,8 @@ start_service() {
     procd_set_param respawn
     procd_close_instance
 }
+
+#stop() {
+#	service_stop /sbin/iwatchdog
+#}
+

libethernet/Makefile

@@ -20,7 +20,6 @@ endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=LGPL-2.1-only
 PKG_LICENSE_FILES:=LICENSE
-PKG_BUILD_DEPENDS:=+TARGET_brcmbca:bcmkernel
 
 include $(INCLUDE_DIR)/package.mk
 

libqos/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=7.2.100
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3a37af002fee1c0d35da49cefee2d24ee92a5d0a
+PKG_SOURCE_VERSION:=d9197880d4b2fb55cbbd92865194abee8ab7d4ca
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libqos.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -20,7 +20,6 @@ endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=LGPL-2.1-only
 PKG_LICENSE_FILES:=LICENSE
-PKG_BUILD_DEPENDS:=+TARGET_brcmbca:bcmkernel
 
 include $(INCLUDE_DIR)/package.mk
 

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.2.100
+PKG_VERSION:=7.2.99
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d6e14d7a0b747ca09d3f6843cea9ae3584d18dd3
+PKG_SOURCE_VERSION:=1027252b47c31952feb158285b15e9ae09c8049f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

loop-detector/files/loop_detection.init

@@ -20,6 +20,10 @@ start_service() {
 	fi
 }
 
+stop() {
+	service_stop /sbin/loop-detector
+}
+
 service_triggers()
 {
 	procd_add_reload_trigger loop_detection
@@ -29,3 +33,4 @@ reload_service() {
 	stop
 	start
 }
+

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.3.1.1
+PKG_VERSION:=4.3.0.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a6c5d7cbbc6363e123cfacc9333e5ae507f6dcd7
+PKG_SOURCE_VERSION:=b1f3c5ff5534efaf057229fffb6009448b4e6b98
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=LICENSE
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-agent
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-agent
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif

map-controller/Makefile

@@ -12,7 +12,7 @@ PKG_SOURCE_VERSION:=fb600940ac54456bcde650ccee7055f7c9bb785b
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-controller
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-controller
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif

map-topology/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.1.19
+PKG_VERSION:=2.5.1.18
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=7b2f5dc086207dd74c5c56421dea65b7dabb6944
+PKG_SOURCE_VERSION:=4320fa30e73b916ae6e4ff489294640e61feeb34
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-topology.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif

mcastmngr/files/common/etc/init.d/mcast

@@ -51,6 +51,10 @@ boot() {
 	start
 }
 
+stop_service() {
+	service_stop "${PROG_EXE}"
+}
+
 reload_service() {
 	stop
 	start

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.2.4
+PKG_VERSION:=7.0.2.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=902d7a9586c3faa16337fef71f538daa878a47b8
+PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
+PKG_SOURCE_VERSION:=293c9f1aa30b2ffd80f6cd210c63647d1b53f08b
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

obuspa/files/etc/init.d/obuspa

@@ -1025,7 +1025,7 @@ register_service()
 			"${respawn_threshold:-5}" \
 			"${respawn_timeout:-10}" "${respawn_retry:-3}"
 
-	procd_set_param watch bbfdm
+	procd_set_param watch usp.raw
 	procd_close_instance
 }
 
@@ -1059,7 +1059,7 @@ service_triggers() {
 	# Create a reload trigger if schema update avaialble
 	procd_open_trigger
 		json_add_array
-			json_add_string "" "bbfdm"
+			json_add_string "" "usp.raw"
 			json_add_array
 				json_add_string "" "if"
 				json_add_array

owsd/files/owsd.init

@@ -404,6 +404,11 @@ start_service() {
 
 }
 
+#stop_service()
+#{
+#	service_stop ${PROG}
+#}
+
 reload_service() {
         stop
         start

periodicstats/Makefile

@@ -1,22 +1,23 @@
 #
-# Copyright (C) 2021-2023 IOPSYS Software Solutions AB
+# Copyright (C) 2021 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.4.1
+PKG_VERSION:=1.2.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/periodicstats.git
-PKG_SOURCE_VERSION:=415b7b59d7cd84cb133b20e27eca63a8cd74a155
+PKG_SOURCE_VERSION:=6c68428405bc88a9990e855f911aecc86f07f4a8
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/periodicstats.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_LICENSE:=BSD-3-Clause
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
@@ -25,7 +26,7 @@ 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 +libbbf_api
 endef
 
 define Package/periodicstats/description

periodicstats/files/etc/init.d/periodicstats

@@ -1,11 +1,15 @@
 #!/bin/sh /etc/rc.common
 
 START=99
-STOP=01
+STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/periodicstatsd
 
+service_running() {
+	ubus -t 10 wait_for usp.raw
+}
+
 start_service() {
 	local enable
 
@@ -25,3 +29,9 @@ start_service() {
 service_triggers() {
 	procd_add_reload_trigger periodicstats
 }
+
+reload_service() {
+	stop
+	start
+}
+

peripheral_manager/files/etc/init.d/peripheral_manager

@@ -22,4 +22,6 @@ service_running() {
 
 stop_service() {
     ubus call leds set '{"state":"alloff"}'
+    service_stop /sbin/peripheral_manager
 }
+

qosmngr/Makefile

@@ -11,7 +11,7 @@ PKG_VERSION:=1.0.5
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2e6d5650cb30e5ae4cc47c1fb9d85b48c49e6100
+PKG_SOURCE_VERSION:=56ebfed11f8f2eb376afda02ebac929c5ad4ee9b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/qosmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

qosmngr/files/airoha/etc/uci-defaults/60-qos_config_generate

@@ -0,0 +1,64 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+ethwan="$(db -q get hw.board.ethernetWanPort)"
+
+populate_no_of_queue(){
+    queue_num=8
+
+    # writing no. of queue per port into file and read on classify generate
+    if [ ! -d "/tmp/qos" ]; then
+	    mkdir -p "/tmp/qos"
+    fi
+    no_queue_file="/tmp/qos/no_queue_per_port"
+    touch "$no_queue_file"
+    echo $queue_num >"$no_queue_file"
+}
+
+generate_queue(){
+    section="$1"
+
+    config_get ifname "$section" "ifname"
+
+    if [ "$ifname" != "$ethwan" ]; then
+        return 0
+    fi
+
+    # guaranteed number of queues
+    no_of_q="0 1 2 3 4 5 6 7"
+
+    i=0
+    local total_q=$((${no_of_q##* } + 1))
+    for i in $no_of_q; do
+        order=$((total_q - i))
+        uci add qos queue
+        uci rename qos.@queue[-1]="q_${i}_${ifname}"
+        uci set qos.@queue[-1].enable="1"
+        uci set qos.@queue[-1].ifname="$ifname"
+        uci set qos.@queue[-1].precedence="$order"
+        uci set qos.@queue[-1].scheduling="SP"
+        uci set qos.@queue[-1].rate="0"
+        uci set qos.@queue[-1].burst_size="0"
+        uci set qos.@queue[-1].weight="1"
+    done
+
+    uci commit qos
+}
+
+populate_no_of_queue
+
+if [ -s "/etc/config/qos" ]; then
+    if uci -q get qos.@queue[0] >/dev/null; then
+	# return if there is any valid content
+	exit
+    else
+	rm -f /etc/config/qos
+    fi
+fi
+touch /etc/config/qos
+
+# generate qos queue config
+config_load ports
+config_foreach generate_queue ethport
+

qosmngr/files/airoha/lib/qos/qos.sh

@@ -14,14 +14,6 @@ include /lib/ethernet
 . /lib/qos/common/shaper.sh
 . /lib/qos/airoha.sh
 
-get_rate_per_queue() {
-	echo "0"
-}
-
-get_burst_size_per_queue() {
-	echo "0"
-}
-
 configure_qos() {
     # queue configuration is being done after shaper configuration,
     # If port shapingrate configuration on DISC device is called after queue configuration then

qosmngr/files/broadcom/etc/uci-defaults/60-qos_config_generate

@@ -1,19 +1,27 @@
 #!/bin/sh
 
-. /lib/qos/qos.sh
+. /lib/functions.sh
 
 ethwan="$(db -q get hw.board.ethernetWanPort)"
+cpu_model="$(cat /proc/socinfo  | grep 'SoC Name' | cut -d':' -f2)"
 
 queue_num=8
 
 populate_no_of_queue(){
+	case $cpu_model in
+		BCM68[3,4,5]*) queue_num=4 ;;
+	esac
+        if grep -qE '[0-9]+ archer$' /proc/devices; then
+                queue_num=4
+        fi
+
 	# writing no. of queue per port into file and read on classify generate
 	if [ ! -d "/tmp/qos" ]; then
 		mkdir -p "/tmp/qos"
 	fi
 	no_queue_file="/tmp/qos/no_queue_per_port"
 	touch "$no_queue_file"
-	echo $1 >"$no_queue_file"
+	echo $queue_num >"$no_queue_file"
 }
 
 generate_queue(){
@@ -22,16 +30,13 @@ generate_queue(){
 	config_get ifname "$section" "ifname"
 
 	local is_lan=0
-	queue_num=$(qosmngr -q $ifname)
-
 	if [ "$ifname" != "$ethwan" ]; then
 		is_lan=1
-		populate_no_of_queue $queue_num
 	fi
 
 	local no_of_q="0 1 2 3 4 5 6 7"
 
-	if [ $is_lan -eq 1 ] && [ $queue_num -eq 4 ]; then
+	if [ $is_lan -eq 1 ] -a [ $queue_num -eq 4 ]; then
 		no_of_q="0 1 2 3"
 	fi
 
@@ -45,14 +50,16 @@ generate_queue(){
 		uci set qos.@queue[-1].ifname="$ifname"
 		uci set qos.@queue[-1].precedence="$order"
 		uci set qos.@queue[-1].scheduling="SP"
-		uci set qos.@queue[-1].rate=$(get_rate_per_queue)
-		uci set qos.@queue[-1].burst_size=$(get_burst_size_per_queue)
+		uci set qos.@queue[-1].rate="0"
+		uci set qos.@queue[-1].burst_size="0"
 		uci set qos.@queue[-1].weight="1"
 	done
 
 	uci commit qos
 }
 
+populate_no_of_queue
+
 if [ -s "/etc/config/qos" ]; then
 	if uci -q get qos.@queue[0] >/dev/null; then
 		exit

qosmngr/files/broadcom/lib/qos/qos.sh

@@ -15,14 +15,6 @@ SP_Q_PRIO=7
 cfg_name=""
 cfg_type=""
 
-get_rate_per_queue() {
-	echo "0"
-}
-
-get_burst_size_per_queue() {
-	echo "0"
-}
-
 # Function to handle a queue order and
 # update total number of queues
 handle_q_order() {

qosmngr/files/common/etc/uci-defaults/61-qos_classify_generate

@@ -60,6 +60,7 @@ generate_icmp_rule(){
 
 generate_classify(){
 
+
 	no_queue_file="/tmp/qos/no_queue_per_port"
 	queue_num=$(cat "$no_queue_file")
 	rm -f "$no_queue_file"

qosmngr/files/linux/etc/uci-defaults/60-qos_config_generate

@@ -0,0 +1,57 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+ethwan="$(db -q get hw.board.ethernetWanPort)"
+
+populate_no_of_queue(){
+    queue_num=8
+
+    # writing no. of queue per port into file and read on classify generate
+    if [ ! -d "/tmp/qos" ]; then
+            mkdir -p "/tmp/qos"
+    fi
+    no_queue_file="/tmp/qos/no_queue_per_port"
+    touch "$no_queue_file"
+    echo $queue_num >"$no_queue_file"
+}
+
+generate_queue(){
+	section="$1"
+
+	config_get ifname "$section" "ifname"
+
+	local no_of_q="0 1 2 3 4 5 6 7"
+
+	i=0
+	local total_q=$((${no_of_q##* } + 1))
+        for i in $no_of_q; do
+		order=$((total_q - i))
+		uci add qos queue
+		uci rename qos.@queue[-1]="q_${i}_${ifname}"
+		uci set qos.@queue[-1].enable="1"
+		uci set qos.@queue[-1].ifname="$ifname"
+		uci set qos.@queue[-1].precedence="$order"
+		uci set qos.@queue[-1].scheduling="SP"
+		uci set qos.@queue[-1].rate="1000000"
+		uci set qos.@queue[-1].burst_size="1500"
+		uci set qos.@queue[-1].weight="1"
+	done
+
+	uci commit qos
+}
+
+populate_no_of_queue
+
+if [ -s "/etc/config/qos" ]; then
+	if uci -q get qos.@queue[0] >/dev/null; then
+		# return if there is any valid content
+		exit
+	else
+		rm -f /etc/config/qos
+	fi
+fi
+touch /etc/config/qos
+
+config_load ports
+config_foreach generate_queue ethport

qosmngr/files/linux/lib/qos/qos.sh

@@ -14,14 +14,6 @@ POLICER_COUNT=0
 Q_COUNT=0
 SP_Q_PRIO=7
 
-get_rate_per_queue() {
-	echo "1000000"
-}
-
-get_burst_size_per_queue() {
-	echo "1500"
-}
-
 # Function to handle a queue order and
 # update total number of queues
 handle_q_order() {

rulengd/files/etc/init.d/rulengd

@@ -13,6 +13,10 @@ start_service() {
 	procd_close_instance
 }
 
+stop() {
+	service_stop rulengd
+}
+
 service_triggers()
 {
 	procd_add_reload_trigger ruleng
@@ -22,3 +26,4 @@ reload_service() {
 	stop
 	start
 }
+

stunc/Makefile

@@ -1,6 +1,7 @@
 #
 # Copyright (C) 2020-2022 IOPSYS Software Solutions AB
 #
+# This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
@@ -8,38 +9,28 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.1.15
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/stunc.git
-PKG_SOURCE_VERSION:=b8231dc570ecc914b52d9e3f8fc9c009280d1791
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
+PKG_SOURCE_VERSION:=09f9868a79e1b5037a99a97fd4dee678869fe98a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-MAKE_PATH:=src
-
 define Package/stunc/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbfdm-api
-endef
-
-define Package/stunc
-  $(Package/stunc/default)
-  TITLE += (default)
-  DEPENDS += +libopenssl
-  VARIANT:=default
-  DEFAULT_VARIANT:=1
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbf_api
 endef
 
 define Package/stunc-mbedtls
@@ -47,34 +38,29 @@ define Package/stunc-mbedtls
   TITLE += (mbedtls)
   DEPENDS += +PACKAGE_stunc-mbedtls:libmbedtls
   VARIANT:=mbedtls
-  CONFLICTS := stunc stunc-openssl stunc-wolfssl
+  DEFAULT_VARIANT:=1
 endef
 
 define Package/stunc-openssl
   $(Package/stunc/default)
   TITLE += (openssl)
   DEPENDS += +PACKAGE_stunc-openssl:libopenssl
+  CONFLICTS := stunc-mbedtls
   VARIANT:=openssl
-  CONFLICTS := stunc stunc-mbedtls stunc-wolfssl
 endef
 
 define Package/stunc-wolfssl
   $(Package/stunc/default)
   TITLE += (wolfssl)
   DEPENDS += +PACKAGE_stunc-wolfssl:libwolfssl
+  CONFLICTS := stunc-mbedtls stunc-openssl
   VARIANT:=wolfssl
-  CONFLICTS := stunc stunc-openssl stunc-mbedtls
 endef
 
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
-ifeq ($(BUILD_VARIANT),default)
-  MAKE_FLAGS += \
-	USE_OPENSSL="yes"
-endif
-
 ifeq ($(BUILD_VARIANT),wolfssl)
   MAKE_FLAGS += \
 	USE_WOLFSSL="yes"
@@ -101,18 +87,16 @@ define Package/stunc/default/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/libstunc.so $(1)/usr/lib/bbfdm/libstunc.so
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/stunc $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libstunc.so $(1)/usr/lib/bbfdm/libstunc.so
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/stunc $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/stunc $(1)/etc/init.d/stunc
 	$(INSTALL_DATA) ./files/etc/config/stunc $(1)/etc/config/stunc
 endef
 
-Package/stunc/install = $(Package/stunc/default/install)
 Package/stunc-openssl/install = $(Package/stunc/default/install)
 Package/stunc-wolfssl/install = $(Package/stunc/default/install)
 Package/stunc-mbedtls/install = $(Package/stunc/default/install)
 
-$(eval $(call BuildPackage,stunc))
 $(eval $(call BuildPackage,stunc-openssl))
 $(eval $(call BuildPackage,stunc-wolfssl))
 $(eval $(call BuildPackage,stunc-mbedtls))

sulu/sulu-base/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-base
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.0.12
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=624710be04dcdba5434840c539518d22a18e537a
+PKG_SOURCE_VERSION:=351ffa099670a52c1c9a8fbd2d19139c1735d858
 PKG_MIRROR_HASH:=skip
 
 SULU_MOD:=core

sulu/sulu-builder/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-builder
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.0.13
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=c50a4a74376a1f3d1f14eb1476fee4e328f3cf90
+PKG_SOURCE_VERSION:=d257f8ff1320165370341df63517f7788bf49ae1
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/sulu-$(PKG_VERSION)/sulu-builder-$(PKG_SOURCE_VERSION)

sulu/sulu-lcm/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-lcm
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.0.10
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git
-PKG_SOURCE_VERSION:=29515d3a3031d528cb603a8931156bf617fee885
+PKG_SOURCE_VERSION:=64a0e12f2ff2ddb8c62a8029fef0434e96d53e7c
 PKG_MIRROR_HASH:=skip
 
 SULU_PLUGIN_INSTALL:=1

sulu/sulu-parental-control/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-parental-control
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.0.12
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-parental-control.git
-PKG_SOURCE_VERSION:=9f460d0851c52a433ec5fef079e6105b5ebeb225
+PKG_SOURCE_VERSION:=0c7fb3da8ceb929256e755988ef6d46e377f2aa6
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

swmodd/Config.in

@@ -3,7 +3,9 @@ menu "Configuration"
 
 	config SWMODD_LXC_SUPPORT
 		bool "Handles LXC based containers"
-		default y
+		default n
+		depends on PACKAGE_swmodd
+		select PACKAGE_liblxc
 
 	config SWMODD_OCI_SUPPORT
 		bool "Handles OCI containers"
@@ -17,37 +19,4 @@ menu "Configuration"
 		depends on PACKAGE_swmodd
 		select PACKAGE_skopeo
 		select PACKAGE_umoci
-
-	config SWMODD_KERNEL_OPTIONS
-		bool "Enable kernel support for LXC and OCI containers"
-		default y
-		select KERNEL_CGROUPS
-		select KERNEL_CGROUP_SCHED
-		select KERNEL_CGROUP_DEVICE
-		select KERNEL_CGROUP_FREEZER
-		select KERNEL_CGROUP_CPUACCT
-		select KERNEL_CGROUP_NET_PRIO
-		select KERNEL_NET_CLS_CGROUP
-		select KERNEL_NAMESPACES
-		select KERNEL_DEVPTS_MULTIPLE_INSTANCES
-		select KERNEL_POSIX_MQUEUE
-		select KERNEL_FAIR_GROUP_SCHED
-		select KERNEL_RT_GROUP_SCHED
-		select KERNEL_MEMCG
-		select KERNEL_MEMCG_KMEM
-		select KERNEL_CPUSETS
-		select PACKAGE_kmod-ikconfig
-		help
-		  Select needed kernel options for LXC and CRUN related utilities. Options
-		  include cgroups, namespaces and other miscellaneous options. These
-		  options unfortunately can not be installed as a module.
-
-	config SWMODD_NETWORKING
-		bool "Enable networking support for LXC/OCI containers"
-		default y
-		select PACKAGE_kmod-veth
-		select PACKAGE_kmod-macvlan
-		help
-		  Enable "veth pair device" and "macvlan"
-
 endmenu

swmodd/Makefile

@@ -1,17 +1,17 @@
 #
-# Copyright (C) 2022-2023 IOPSYS Software Solutions AB
+# Copyright (C) 2022 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.2.2
+PKG_VERSION:=2.1.23
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/swmodd.git
-PKG_SOURCE_VERSION:=db0805d7833a27afc9a42edd094209978f43e311
+PKG_SOURCE_VERSION:=0a85f80e93c14a6adddd74ce0a2138f7d3f971ae
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -31,7 +31,7 @@ define Package/swmodd
   DEPENDS:=+libuci +libubox +ubus +libuuid +opkg +libcurl \
 	    +PACKAGE_liblxc:liblxc +@BUSYBOX_CONFIG_BUSYBOX \
 	    +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT +@BUSYBOX_CONFIG_SCRIPT \
-	    +swmodd-cgroup +jq +libbbfdm-api
+	    +swmodd-cgroup +jq +libbbf_api
 endef
 
 define Package/swmodd/description

twamp/Makefile

@@ -6,18 +6,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.3.1
+PKG_VERSION:=1.2.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/twamp-light.git
-PKG_SOURCE_VERSION:=8bab6ac3f0e85f450946089a025e86ceb75f699b
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/twamp-light.git
+PKG_SOURCE_VERSION:=4811dd9fed8829fc8d0bcb67aba5d47e977b6d1a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,7 +27,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TWAMP Light Client(TR-390)
-  DEPENDS:=+libuci +ubox +libubus +libbbfdm-api
+  DEPENDS:=+libuci +ubox +libubus +libbbf_api
 endef
 
 define Package/$(PKG_NAME)/description

udpecho/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udpecho
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/udpecho.git
-PKG_SOURCE_VERSION:=8964b6e29347181f0d52da5c3b8d075737ea1a52
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/udpecho.git
+PKG_SOURCE_VERSION:=fd03a488979c06b5571cc6b47670cb145499ae81
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -22,7 +22,7 @@ endif
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
@@ -34,7 +34,7 @@ define Package/$(PKG_NAME)-server
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF UDP Echo Server
-  DEPENDS:=+libuci +libbbfdm-api
+  DEPENDS:=+libuci +libbbf_api
 endef
 
 define Package/$(PKG_NAME)-client

usermngr/Makefile

@@ -1,22 +1,22 @@
 #
-# Copyright (C) 2022-2023 IOPSYS Software Solutions AB
+# Copyright (C) 2022 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=467e30c6a41ce4b133284283a7a17d763e6921ff
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/usermngr.git
+PKG_SOURCE_VERSION:=22dc3260872080b63677654c401c33ce57ae9fbb
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,7 +27,7 @@ define Package/usermngr
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  DEPENDS:= +shadow-utils +libbbfdm-api
+  DEPENDS:= +shadow-utils +libbbf_api
   TITLE:=Package to add Device.Users. datamodel support
 endef
 

uspd/Makefile

@@ -0,0 +1,96 @@
+#
+# Copyright (C) 2019 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=uspd
+PKG_VERSION:=2.2.29
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
+PKG_SOURCE_VERSION:=75c3538a9fbaf22e8df1a64eb363b4a8be6b9494
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/uspd/default
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=Datamodel ubus backend
+  DEPENDS:=+USE_GLIBC:librt +libubox +ubus +libbbf_api +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
+           +@BBF_TR181 +@BBF_TR104 +@BBF_TR143
+endef
+
+define Package/uspd-mbedtls
+  $(Package/uspd/default)
+  TITLE += (mbedtls)
+  DEPENDS += +PACKAGE_uspd-mbedtls:libbbf_dm-mbedtls
+  VARIANT:=mbedtls
+  DEFAULT_VARIANT:=1
+endef
+
+define Package/uspd-openssl
+  $(Package/uspd/default)
+  TITLE += (openssl)
+  DEPENDS += +PACKAGE_uspd-openssl:libbbf_dm-openssl
+  CONFLICTS := uspd-mbedtls
+  VARIANT:=openssl
+endef
+
+define Package/uspd-wolfssl
+  $(Package/uspd/default)
+  TITLE += (wolfssl)
+  DEPENDS += +PACKAGE_uspd-wolfssl:libbbf_dm-wolfssl
+  CONFLICTS := uspd-mbedtls uspd-openssl
+  VARIANT:=wolfssl
+endef
+
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE \
+	-Wall -Werror \
+	-DUSPD_MAX_MSG_LEN="10485760"
+
+TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
+ifeq ($(BUILD_VARIANT),openssl)
+  MAKE_FLAGS += USE_OPENSSL="yes"
+endif
+
+ifeq ($(BUILD_VARIANT),wolfssl)
+  MAKE_FLAGS += USE_WOLFSSL="yes"
+endif
+
+ifeq ($(BUILD_VARIANT),mbedtls)
+  MAKE_FLAGS += USE_MBEDTLS="yes"
+endif
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/uspd/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/uspd/default/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_BIN) ./files/etc/init.d/uspd $(1)/etc/init.d/uspd
+	$(INSTALL_CONF) ./files/etc/config/uspd $(1)/etc/config/uspd
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uspd $(1)/usr/sbin/
+endef
+
+Package/uspd-openssl/install = $(Package/uspd/default/install)
+Package/uspd-wolfssl/install = $(Package/uspd/default/install)
+Package/uspd-mbedtls/install = $(Package/uspd/default/install)
+
+$(eval $(call BuildPackage,uspd-openssl))
+$(eval $(call BuildPackage,uspd-wolfssl))
+$(eval $(call BuildPackage,uspd-mbedtls))

uspd/files/etc/config/uspd

@@ -0,0 +1,6 @@
+config uspd 'usp'
+	option granularitylevel  '0'
+	option debug '0'
+	option loglevel  '1'
+	option refresh_time '10'
+	option transaction_timeout '10'

uspd/files/etc/init.d/uspd

@@ -4,30 +4,27 @@ START=96
 STOP=10
 
 USE_PROCD=1
-PROG=/usr/sbin/bbfdmd
+PROG=/usr/sbin/uspd
 
-log() {
-	echo "${@}"|logger -t bbfdmd.init -p info
-}
-
-validate_bbfdm_bbfdmd_section()
+validate_uspd_usp_section()
 {
-	uci_validate_section bbfdm bbfdmd "bbfdmd" \
+	uci_validate_section uspd uspd "usp" \
 		'enabled:bool:true' \
+		'granularitylevel:uinteger' \
 		'debug:bool:false' \
 		'loglevel:uinteger' \
 		'sock:string' \
 		'transaction_timeout:string'
 }
 
-configure_bbfdmd()
+configure_uspd()
 {
 	local enabled debug sock transaction_timeout
 
-	config_load bbfdm
+	config_load uspd
 
-	validate_bbfdm_bbfdmd_section || {
-		log "Validation of bbfdmd section failed"
+	validate_uspd_usp_section || {
+		log "Validation of usp section failed"
 		return 1;
 	}
 
@@ -64,8 +61,8 @@ start_service() {
 	ubus -t 5 wait_for network.device
 	[ "$?" -eq 0 ] && sysctl_reload=1
 
-	procd_open_instance bbf
-	configure_bbfdmd
+	procd_open_instance usp
+	configure_uspd
 	procd_set_param respawn
 	procd_close_instance
 
@@ -73,11 +70,10 @@ start_service() {
 }
 
 reload_service() {
-	ubus -t 5 wait_for network.device
 	apply_sysctl_configuration
 }
 
 service_triggers()
 {
-	procd_add_reload_trigger "bbfdm" "network"
+	procd_add_reload_trigger "uspd" "network"
 }

wfa-capi/Makefile

@@ -1,17 +1,17 @@
 #
-# Copyright (C) 2021-2023 IOPSYS
+# Copyright (C) 2021 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=capiagent
-PKG_VERSION:=2.1.0
+PKG_NAME:=wfa-capi
+PKG_VERSION:=2.0.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=3e671db8f567b19c109fc13b25bc571c4c73a962
-PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/capiagent.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfa-capi.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -24,18 +24,18 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 
 
-#define Package/capiagent/config
+#define Package/wfa-capi/config
 #  source "$(SOURCE)/Config.in"
 #endef
 
-define Package/capiagent
-  TITLE+= capiagent (daemon implementing Wi-Fi Alliance's CAPI commands)
+define Package/wfa-capi
+  TITLE+= wfa-capi (agent daemon for Wi-Fi Alliance's CAPI commands)
   DEPENDS= +libubox +libuci +libubus +libnl-genl +libeasy +libwifi \
 	   +libjson-c +libblobmsg-json +ubus +libieee1905
 endef
 
-define Package/capiagent/description
- This package provides agent for the WiFi Alliance's CAPI specification.
+define Package/wfa-capi/description
+ This package provides agent for WiFi Alliance's CAPI specification.
 endef
 
 TARGET_CFLAGS += \
@@ -46,7 +46,7 @@ TARGET_CFLAGS += \
 MAKE_PATH:=src
 
 
-define Package/capiagent/install
+define Package/wfa-capi/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/lib/wifi/capi
@@ -54,4 +54,4 @@ define Package/capiagent/install
 	$(CP) $(PKG_BUILD_DIR)/src/scripts/* $(1)/lib/wifi/capi
 endef
 
-$(eval $(call BuildPackage,capiagent))
+$(eval $(call BuildPackage,wfa-capi))

wfadatad/Makefile

@@ -4,14 +4,14 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=decollector
-PKG_VERSION:=4.0.2.0
+PKG_NAME:=wfadatad
+PKG_VERSION:=4.0.1.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=162654487bfbff7d68d0c87ae9498a3def738d84
-PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
+PKG_SOURCE_VERSION:=b165177f12b2cef129f36bff1be077b65fbc86aa
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/decollector
+define Package/wfadatad-collector
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi DataElements Collector Proxy
@@ -30,13 +30,12 @@ define Package/decollector
 	   +libeasy +libwifiutils +libieee1905 +map-plugin
 endef
 
-define Package/decollector/description
- It implements the WiFi DataElements Agent as defined in the Wi-Fi Alliance's
- DataElements specification.
+define Package/wfadatad-collector/description
+ It implements the WiFi DataElements Collector Proxy component.
 endef
 
 
-define Package/decollector/config
+define Package/wfadatad-collector/config
 	source "$(SOURCE)/Config.in"
 endef
 
@@ -55,7 +54,7 @@ TARGET_CFLAGS += \
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-  rsync -r --exclude=.* ~/git/decollector/ $(PKG_BUILD_DIR)/
+  rsync -r --exclude=.* ~/git/wfadatad/ $(PKG_BUILD_DIR)/
 endef
 endif
 
@@ -64,15 +63,15 @@ MAKE_PATH:=src
 TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_DECOLLECTOR_EASYMESH_VERSION)
 
 EXECS := \
-	$(if $(CONFIG_PACKAGE_decollector),decollector)
+	$(if $(CONFIG_PACKAGE_wfadatad-collector),decollector)
 
 MAKE_FLAGS += EXECS="$(EXECS)"
 
-define Package/decollector/install
+define Package/wfadatad-collector/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/decollector.init $(1)/etc/init.d/decollector
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/decollector $(1)/usr/sbin/
 endef
 
-$(eval $(call BuildPackage,decollector))
+$(eval $(call BuildPackage,wfadatad-collector))

xmppc/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/xmppc.git
-PKG_SOURCE_VERSION:=6576bad7849ca4027dd1214086a91eb046f7aa53
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/xmppc.git
+PKG_SOURCE_VERSION:=63ba23c1dc5de3d136a3c1568ae9de08762fd0d0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -22,11 +22,9 @@ endif
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
-MAKE_PATH:=src
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
@@ -34,7 +32,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF xmpp Client
-  DEPENDS:=+libuci +libubox +libstrophe +libubus +libbbfdm-api
+  DEPENDS:=+libuci +libubox +libstrophe +libubus +libbbf_api
 endef
 
 define Package/$(PKG_NAME)/description
@@ -53,9 +51,9 @@ TARGET_CFLAGS += \
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/xmppc $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/xmppc $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/*.so $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib/bbfdm
 	$(CP) ./files/* $(1)/
 endef
 

xmppc/files/etc/init.d/xmppc

@@ -17,6 +17,10 @@ start_service() {
 	fi
 }
 
+boot() {
+	start
+}
+
 reload_service() {
 	logger -p crit -t "xmppc" "reloading service()"
 	stop