sulu-builder: 1.0.0

qosmngr: updated QoS clasification
l3 iptables rule with ethx was not matching this was causing incorrect classification to wrong queue. ebtables rule correction done with ethertype,protocol and port to classify packet for destination queue.
2025-12-27 22:50:19 +08:00 · 2022-06-14 17:53:02 +05:30 · 2022-06-09 12:57:03 +05:30 · 2022-06-08 18:12:51 +01:00 · 2022-06-08 18:11:08 +01:00 · 2022-06-08 16:34:31 +02:00
48 changed files with 2832 additions and 1309 deletions
--- a/ated/Makefile
+++ b/ated/Makefile
@@ -1,78 +0,0 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
-#
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ated
-PKG_VERSION:=1.2.2
-PKG_RELEASE:=1
-
-PKG_SOURCE_VERSION:=f614cba983d827d5185c60a6a5a35530621d44d2
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/mediatek/ated.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-# support parallel build
-#PKG_BUILD_PARALLEL:=1
-
-#re create configure scripts if not present.
-#PKG_FIXUP:=autoreconf
-
-# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
-# this way we don't need to pick out the resulting files from the build dir.
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ated
-	CATEGORY:=Utilities
-	TITLE:=Daemon for handling wifi calibration
-	URL:=
-	DEPENDS:= libc
-endef
-
-define Package/ated/description
-	Daemon for handling wifi calibration
-endef
-
-#TARGET_CFLAGS += -I$(LINUX_DIR)/include -I$(LINUX_DIR)/arch/mips/include
-
-MAKE_FLAGS += \
-	v=2 \
-	m=3
-
-
-#TARGET_CPPFLAGS := \
-#	-I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \
-#	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
-#	$(TARGET_CPPFLAGS)
-
-# we donot wwant to have any install.
-define Build/Install/Default
-endef
-
-define Package/ated/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ated $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,ated))
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.6.36
+PKG_VERSION:=6.7.3

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=180119192418dbac64713c3e5efe761a1f8e871e
+PKG_SOURCE_VERSION:=b626edaa7174419a908d6e8d4de052d6ce09ac08
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

@@ -18,8 +18,8 @@ PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENSE

-PKG_FIXUP:=autoreconf
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk

 define Package/libbbf_api
  SECTION:=utils
@@ -85,56 +85,49 @@ define Build/Prepare
 endef
 endif

-TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	-Wall -Werror \
-
-CONFIGURE_ARGS += \
-	--enable-tr181
+CMAKE_OPTIONS += \
+	-DBBF_TR181=ON

 ifeq ($(CONFIG_BBF_TR104),y)
-CONFIGURE_ARGS += \
-	--enable-tr104
+CMAKE_OPTIONS += \
+	-DBBF_TR104=ON
 endif

 ifeq ($(CONFIG_BBF_TR143),y)
-CONFIGURE_ARGS += \
-	--enable-tr143
+CMAKE_OPTIONS += \
+	-DBBF_TR143=ON
 endif

 ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
-CONFIGURE_ARGS += \
-	--enable-vendor-extension
+CMAKE_OPTIONS += \
+	-DBBF_VENDOR_EXTENSION=ON

-CONFIGURE_ARGS += \
-	BBF_VENDOR_LIST="$(CONFIG_BBF_VENDOR_LIST)" \
-	BBF_VENDOR_PREFIX="$(CONFIG_BBF_VENDOR_PREFIX)"
+CMAKE_OPTIONS += \
+	-DBBF_VENDOR_LIST:String="$(CONFIG_BBF_VENDOR_LIST)" \
+	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)"

 endif ##CONFIG_BBF_VENDOR_EXTENSION

 ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
-CONFIGURE_ARGS += \
-	--enable-json-plugin
+CMAKE_OPTIONS += \
+	-DBBF_JSON_PLUGIN=ON
 endif

 ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
-CONFIGURE_ARGS += \
-	--enable-shared-library
+CMAKE_OPTIONS += \
+	-DBBF_DOTSO_PLUGIN=ON
 endif

 ifeq ($(BUILD_VARIANT),openssl)
-CONFIGURE_ARGS += --enable-libopenssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
 endif

 ifeq ($(BUILD_VARIANT),wolfssl)
-CONFIGURE_ARGS += --enable-libwolfssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
 endif

 ifeq ($(BUILD_VARIANT),mbedtls)
-CONFIGURE_ARGS += --enable-libmbedtls
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
 endif

 define Package/libbbf_api/install
@@ -148,7 +141,7 @@ define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/lib/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 endef

@@ -174,7 +167,7 @@ define Build/InstallDev
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/usr/lib/
 	touch $(1)/usr/lib/libbbf_api.so
 endef

--- a/dectmngr/Makefile
+++ b/dectmngr/Makefile
@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.1
+PKG_VERSION:=3.5.2

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8c94908eb230dc453dd2f5575be6c06b086b2e7d
+PKG_SOURCE_VERSION:=0b48e92372c737855569c0b4f7966da7b06ec6b1
 PKG_MIRROR_HASH:=skip
 endif

--- a/dectmngr/files/etc/dspg/04130211.bin
+++ b/dectmngr/files/etc/dspg/04130211.bin
--- a/easy-soc-libs/Makefile
+++ b/easy-soc-libs/Makefile
@@ -13,7 +13,7 @@ PKG_RELEASE:=1
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e4f811b7cd2836cdcce5ea0f97f515a317da5bc3
+PKG_SOURCE_VERSION:=9d8ca7d62108dd4e47ad338b9a7f6fc651b55563
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
--- a/endptmngr/Makefile
+++ b/endptmngr/Makefile
@@ -13,7 +13,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=2390a3503990e04e33e8e448ad9dccc00f206908
+PKG_SOURCE_VERSION:=60d4be347f87cf7ee6dd2f4f0ab82006db220ac6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -30,7 +30,7 @@ PKG_BUILD_PARALLEL:=1
 # indirectly. This ensures that the package is rebuilt on config-changes.
 PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD

-export CONFIG_BRCM_SDK_VER_504021
+export CONFIG_BRCM_SDK_VER_504040
 export CONFIG_BCM_CHIP_ID

 include $(INCLUDE_DIR)/package.mk
--- a/evoice/Makefile
+++ b/evoice/Makefile
@@ -5,18 +5,20 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=evoice
-PKG_VERSION:=0.2.1
+PKG_VERSION:=0.2.4

 LOCAL_DEV=0
+LOCAL_DEV_EVOICE_DIR=~/voip/evoice
+
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
-PKG_SOURCE_VERSION:=f2477946f9e142d01820b38e32ce98a781e0310e
+PKG_SOURCE_VERSION:=b9bc076b25f68cc46f8ca4328f75abe0bacc5d0a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

-PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE


@@ -31,7 +33,10 @@ define Package/$(PKG_NAME)
 	SUBMENU:=Telephony
 	TITLE:=Ensemble Voice
 	URL:=
-	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +TARGET_iopsys_brcm63xx_arm:bcmkernel +TARGET_iopsys_econet:kmod-voip_driver
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl\
+		+TARGET_iopsys_brcm63xx_arm:bcmkernel\
+		+TARGET_iopsys_econet:kmod-voip_driver\
+		+TARGET_iopsys_econet:voip_app
 endef

 define Package/$(PKG_NAME)/description
@@ -40,32 +45,54 @@ endef

 ifeq ($(LOCAL_DEV),1)
 # If you want to build the code from your own local repositiory enable
-# LOCAL_DEV and change the path below to your own git repository.
+# LOCAL_DEV and set LOCAL_DEV_EVOICE_DIR to your own git repository.
 define Build/Prepare
-	rsync -av /swdev/bide/evoice_clean/* $(PKG_BUILD_DIR)/
+	@echo "======================================================="
+	@echo "DEVELOPMENT BUILD! rsync $(LOCAL_DEV_EVOICE_DIR) to $(PKG_BUILD_DIR)"
+	@echo "======================================================="
+	rsync -a $(LOCAL_DEV_EVOICE_DIR)/* $(PKG_BUILD_DIR)/
 endef
 endif

+IDIR = $(STAGING_DIR)/usr/include
+TONES_INI_REQUIRED=
+
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 	TARGET_PLATFORM=BROADCOM
-	export IDIR = $(STAGING_DIR)/usr/include
-	export BDIR = bcm963xx/userspace/private/apps/voice
-	export _XFLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc -I$(IDIR)/bcm963xx/xchg/bos/publicInc -I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
+	BDIR = bcm963xx/userspace/private/apps/voice
+	CC_FLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc\
+		-I$(IDIR)/bcm963xx/xchg/bos/publicInc\
+		-I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
+	TRG=SVrgBcmFxs
 else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
 	TARGET_PLATFORM=ECONET
+	TONES_INI_REQUIRED=y
+	TRG=SVrgMtekOwrt
 endif

+# disable temporarily some not important warnings, force PIC
+CC_FLAGS_VS=$(CC_FLAGS) -Wno-unused-parameter -Wno-unused-function -fPIC
+
 export TARGET_PLATFORM

+#used and altered by BIDE makefiles
+export _XFLAGS
+
+BIDE_MAKE_OPTS = -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk\
+	SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix LIF=cerder DBG=dbg

 define Build/Compile
 	@echo "TARGET_PLATFORM=${TARGET_PLATFORM}"
-	+$(MAKE) -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix TRG=SVrgBcmFxs LIF=cerder DBG=dbg
-	+$(MAKE) -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix TRG=libvoiceservice LIF=cerder DBG=dbg
+	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS)" TRG=$(TRG)
+
+	@echo "clean libvoiceservice before building shared lib!"
+	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS_VS)" TRG=libvoiceservice cleanall
+	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS_VS)" TRG=libvoiceservice
 endef

 define Package/evoice/install
 	$(CP) ./files/* $(1)/
+	$(if $(TONES_INI_REQUIRED),,$(RM) $(1)/etc/evoice/tones.ini)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/evoice $(1)/usr/sbin/
--- a/evoice/files/etc/config/voice
+++ b/evoice/files/etc/config/voice
@@ -44,18 +44,33 @@ config Capabilities 'Capabilities'

 config CapabilitiesCodec 'Codec1'
 	option Codec 'G.711ALaw'
+	option BitRate '64000'
+	option PacketizationPeriod '20,30'
+	option SilenceSupression '1'

 config CapabilitiesCodec 'Codec2'
 	option Codec 'G.711MuLaw'
+	option BitRate '64000'
+	option PacketizationPeriod '20,30'
+	option SilenceSupression '1'

 config CapabilitiesCodec 'Codec3'
 	option Codec 'G.726'
-
+	option BitRate '32000'
+	option PacketizationPeriod '20,30'
+	option SilenceSupression '0'
+	
 config CapabilitiesCodec 'Codec4'
 	option Codec 'G.722'
-
-config CapabilitiesCodec 'Codec5'
+	option BitRate '64000'
+	option PacketizationPeriod '20,30'
+	option SilenceSupression '0'
+	
+config CapabilitiesCodec 'Codec4'
 	option Codec 'G.729'
+	option BitRate '8000'
+	option PacketizationPeriod '20,30'
+	option SilenceSupression '0'

 config CodecProfile '1CodecProfile1'
 	option Enable '1'
--- a/evoice/files/etc/evoice/tones.ini
+++ b/evoice/files/etc/evoice/tones.ini
--- a/evoice/files/etc/evoice/voicecap
+++ b/evoice/files/etc/evoice/voicecap
@@ -1,38 +0,0 @@
-# Capabilties are platform dependent. Keep these separated from customer configuration
- 
-config capabilities_prm 'limits'
-	option MaxCallLogCount '100'
-
-config capabilities_prm 'features'
-	option QIModelsSupported 'G.107'
-
-config CapabilitiesCodec 'Codec1'
-	option Codec 'G.711ALaw'
-	option BitRate '64000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '1'
-
-config CapabilitiesCodec 'Codec2'
-	option Codec 'G.711MuLaw'
-	option BitRate '64000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '1'
-
-config CapabilitiesCodec 'Codec3'
-	option Codec 'G.726'
-	option BitRate '32000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '0'
-	
-config CapabilitiesCodec 'Codec4'
-	option Codec 'G.722'
-	option BitRate '64000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '0'
-	
-config CapabilitiesCodec 'Codec4'
-	option Codec 'G.729'
-	option BitRate '8000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '0'
-	
--- a/evoice/files/etc/evoice/voicedm
+++ b/evoice/files/etc/evoice/voicedm
@@ -3,6 +3,7 @@ config account 'map_board'
   option HW_Has_Voice 'hw.board.hasVoice'
   option HW_Has_DECT 'hw.board.hasDect'
   option HW_Nr_Of_POTS_Ports 'hw.board.VoicePorts'
+   option HW_VoiceDSP 'hw.board.VoiceDSP'
   option ProductID 'device.deviceinfo.ModelName'
   option I3_VERSION 'device.deviceinfo.SoftwareVersion'
   option SerialNumber 'device.deviceinfo.SerialNumber'
--- a/evoice/files/etc/init.d/evoice
+++ b/evoice/files/etc/init.d/evoice
@@ -5,6 +5,7 @@ STOP=12

 USE_PROCD=1
 NAME=evoice
+VOICE_UCI_CONFIG=voice

 start_service() {
 	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
@@ -20,3 +21,6 @@ reload_service() {
 	start
 }

+service_triggers() {
+	procd_add_reload_trigger $VOICE_UCI_CONFIG
+}
--- a/gryphon-led-module/Makefile
+++ b/gryphon-led-module/Makefile
@@ -44,13 +44,17 @@ MODULE_INCLUDE=-I$(PKG_BUILD_DIR)

 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 	LINUX_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.19
-	MODULES_SUBDIR:=lib/modules/4.19.183
+	MODULES_SUBDIR:=lib/modules/4.19.225
 	TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_PREFIX)-

 	ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"63158" "6856" "6858"))
 		# These targets use a 64-bit kernel
 		LINUX_KARCH:=arm64
 		TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_PREFIX)-
+	else ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"6855" "6756" "47622" "63148" "63178"))
+		# These targets use a 32-bit arm-sfp kernel
+		LINUX_KARCH:=arm
+		TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_PREFIX)-
 	endif
 	# For some reason, Broadcom's kernel does not set the include paths correctly when compiling out-of-tree modules
 	EXTRA_KCPPFLAGS:="-I $(LINUX_DIR)/../bcmkernel/include -I $(LINUX_DIR)/arch/arm/mach-bcm963xx/include"
--- a/icwmp/Config_cwmp.in
+++ b/icwmp/Config_cwmp.in
@@ -12,19 +12,3 @@ config CWMP_ACS_MULTI
 config CWMP_ACS_HDM
 	bool "Select HDM as ACS server"
 endchoice
-
-config CWMP_DEBUG
-	bool "Compile with debug options"
-	depends on PACKAGE_icwmp || \
-		   PACKAGE_icwmp-openssl || \
-		   PACKAGE_icwmp-wolfssl || \
-		   PACKAGE_icwmp-mbedtls
-	default y
-
-config CWMP_DEVEL_DEBUG
-	bool "Compile with development debug options (deprecated)"
-	depends on PACKAGE_icwmp || \
-		   PACKAGE_icwmp-openssl || \
-		   PACKAGE_icwmp-wolfssl || \
-		   PACKAGE_icwmp-mbedtls
-	default n
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.8
+PKG_VERSION:=8.4.14

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=00d037ce851495aca6365f2189849c6030f305df
+PKG_SOURCE_VERSION:=a3be4dd092de5e98022ccd29f10a5724863a360a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

@@ -28,6 +28,9 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_DEBUG \
 	CONFIG_CWMP_DEVEL_DEBUG

+# Avoid striping of binary
+STRIP:=:
+
 include $(INCLUDE_DIR)/package.mk

 define Package/icwmp/default
@@ -78,20 +81,14 @@ endef

 ifeq ($(BUILD_VARIANT),openssl)
 CONFIGURE_ARGS += --enable-libopenssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-TARGET_LDFLAGS += "-lssl"
 endif

 ifeq ($(BUILD_VARIANT),wolfssl)
 CONFIGURE_ARGS += --enable-libwolfssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
-TARGET_LDFLAGS += "-lwolfssl"
 endif

 ifeq ($(BUILD_VARIANT),mbedtls)
 CONFIGURE_ARGS += --enable-libmbedtls
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-TARGET_LDFLAGS += "-lmbedtls"
 endif

 ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
@@ -104,16 +101,6 @@ CONFIGURE_ARGS += \
 	--enable-acs=hdm
 endif

-ifeq ($(CONFIG_CWMP_DEBUG),y)
-CONFIGURE_ARGS += \
-	--enable-debug
-endif
-
-ifeq ($(CONFIG_CWMP_DEVEL_DEBUG),y)
-CONFIGURE_ARGS += \
-	--enable-devel
-endif
-
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
 ifneq ($(USE_LOCAL),)
 define Build/Prepare
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ieee1905
-PKG_VERSION:=4.9.0
+PKG_VERSION:=4.9.2

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=69b27e3e1509b9192c529fbba6a329cc0532cfbb
+PKG_SOURCE_VERSION:=a5b0ffd78579d0b85f82aeba0a827535209e777d
 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
--- a/libmicroxml/Makefile
+++ b/libmicroxml/Makefile
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libmicroxml
-PKG_VERSION:=2012-06-11
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/mirror/microxml.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=72965423184f24cc0b963d91c2d1863cdb01b6aa
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-PKG_LICENSE:=LGPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libmicroxml
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=XML library
-  MAINTAINER:=Luka Perkov <luka@openwrt.org>
-endef
-
-define Package/libmicroxml/description
- A micro sized XML library
-endef
-
-CONFIGURE_ARGS += \
-	--disable-threads \
-	--enable-static \
-	--enable-shared
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/microxml.h $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_BUILD_DIR)/microxml.pc $(1)/usr/lib/pkgconfig
-endef
-
-define Package/libmicroxml/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
-endef
-
-$(eval $(call BuildPackage,libmicroxml))
--- a/libmicroxml/patches/100-fix-memleak.patch
+++ b/libmicroxml/patches/100-fix-memleak.patch
@@ -1,130 +0,0 @@
-diff --git a/mxml-file.c b/mxml-file.c
-index 02eca9d..f10d202 100644
--- a/mxml-file.c
-+++ b/mxml-file.c
-@@ -363,9 +363,12 @@ mxmlSaveFile(mxml_node_t    *node,	/* I - Node to write */
-   * Write the node...
-   */
- 
-  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc, global)) < 0)
-+  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc, global)) < 0){
-+    global_free(global);
-     return (-1);
-
-+  }
-+  
-+  global_free(global);
-   if (col > 0)
-     if (putc('\n', fp) < 0)
-       return (-1);
-@@ -1448,6 +1451,7 @@ mxml_load_data(
-   if ((buffer = malloc(64)) == NULL)
-   {
-     mxml_error("Unable to allocate string buffer!");
-+    global_free(global);
-     return (NULL);
-   }
- 
-@@ -2083,11 +2087,12 @@ mxml_load_data(
- 		 node->parent ? node->parent->value.element.name : "(null)");
- 
-       mxmlDelete(first);
-
-+      global_free(global);
-       return (NULL);
-     }
-   }
- 
-+  global_free(global);
-   if (parent)
-     return (parent);
-   else
-@@ -2102,7 +2107,7 @@ error:
-   mxmlDelete(first);
- 
-   free(buffer);
-
-+  global_free(global);
-   return (NULL);
- }
- 
-diff --git a/mxml-private.c b/mxml-private.c
-index 4378ca3..ea6e452 100644
--- a/mxml-private.c
-+++ b/mxml-private.c
-@@ -41,6 +41,32 @@
-  * This code currently supports AIX, HP-UX, Linux, Mac OS X, Solaris, and
-  * Windows.  It might work on the BSDs and IRIX, but I haven't tested that.
-  */
-+void *global_mem[16] = {0};
-+
-+static void *global_calloc(int x, int size)
-+{
-+  int i;
-+  void *m = calloc(x, size);
-+  for (i = ((sizeof(global_mem)/sizeof(global_mem[0])) - 1); i > 0; i--) {
-+    global_mem[i] = global_mem[i-1];
-+  }
-+  global_mem[0] = m;
-+  return m;
-+}
-+
-+void global_free(void *m)
-+{
-+  int i;
-+  if (m == NULL)
-+    return;
-+  for (i = ((sizeof(global_mem)/sizeof(global_mem[0])) - 1); i >= 0; i--) {
-+    if (global_mem[i] == m) {
-+      global_mem[i] = NULL;
-+      free(m);
-+      break;
-+    }
-+  }
-+}
- 
- #if defined(__sun) || defined(_AIX)
- #  pragma fini(_mxml_fini)
-@@ -148,7 +174,6 @@ mxml_real_cb(mxml_node_t *node)		/* I - Current node */
-   return (MXML_REAL);
- }
- 
-
- #ifdef HAVE_PTHREAD_H			/**** POSIX threading ****/
- #  include <pthread.h>
- 
-@@ -190,7 +215,6 @@ _MXML_FINI(void)
-   }
- }
- 
-
- /*
-  * '_mxml_global()' - Get global data.
-  */
-@@ -205,7 +229,7 @@ _mxml_global(void)
- 
-   if ((global = (_mxml_global_t *)pthread_getspecific(_mxml_key)) == NULL)
-   {
-    global = (_mxml_global_t *)calloc(1, sizeof(_mxml_global_t));
-+    global = (_mxml_global_t *)global_calloc(1, sizeof(_mxml_global_t));
-     pthread_setspecific(_mxml_key, global);
- 
-     global->num_entity_cbs = 1;
-@@ -288,7 +312,7 @@ _mxml_global(void)
- 
-   if ((global = (_mxml_global_t *)TlsGetValue(_mxml_tls_index)) == NULL)
-   {
-    global = (_mxml_global_t *)calloc(1, sizeof(_mxml_global_t));
-+    global = (_mxml_global_t *)global_calloc(1, sizeof(_mxml_global_t));
- 
-     global->num_entity_cbs = 1;
-     global->entity_cbs[0]  = _mxml_entity_cb;
-diff --git a/mxml-private.h b/mxml-private.h
-index c591208..72ed338 100644
--- a/mxml-private.h
-+++ b/mxml-private.h
-@@ -43,3 +43,4 @@ typedef struct _mxml_global_s
- extern _mxml_global_t	*_mxml_global(void);
- extern int		_mxml_entity_cb(const char *name);
- 
-+extern void global_free(void *m);
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -1,16 +1,16 @@
 #
-# Copyright (C) 2020-21 IOPSYS Software Solutions AB
+# Copyright (C) 2020-22 IOPSYS Software Solutions AB
 #

 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=7.2.2
+PKG_VERSION:=2.8.0.5
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8168d68c118d0dde0ff798fd0c8ed1d6a18bc99d
+PKG_SOURCE_VERSION:=747379e69f3dbc98e6d151dc44d995ca23690520
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>

-PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE

 LOCAL_DEV=0
--- a/map-agent/files/lib/wifi/multiap
+++ b/map-agent/files/lib/wifi/multiap
@@ -774,11 +774,14 @@ set_uplink_backhaul_info() {
 	local ul_1905id=$1
 	local ul_mac=$2

-	json_load "$(cat $MAPFILE)"
-	json_add_string "backhaul_device_id" "$ul_1905id"
-	json_add_string "backhaul_macddr" "$ul_mac"
-	json_dump > "$MAPFILE"
-	json_cleanup
+	(
+		flock -x 200
+		json_load "$(cat $MAPFILE)"
+		json_add_string "backhaul_device_id" "$ul_1905id"
+		json_add_string "backhaul_macddr" "$ul_mac"
+		json_dump > "$MAPFILE"
+		json_cleanup
+	) 200>/var/lock/map.backhaul.lock
 }

 set_uplink() {
@@ -792,7 +795,10 @@ set_uplink() {
 	json_add_string "type" "$type"
 	json_add_string "ifname" "$ifname"
 	json_add_string "macaddr" "$hwaddr"
-	json_dump > "$MAPFILE"
+	(
+		flock -x 200
+		json_dump > "$MAPFILE"
+	) 200>/var/lock/map.backhaul.lock
 	json_cleanup

 	config_load mapagent
@@ -816,7 +822,14 @@ unset_uplink() {
 		ubus call map.agent toggle_fh '{"enable":false, "prevent_island":true, "ifname":"all"}'
 	fi

-	rm -f "$MAPFILE" > /dev/null 2>&1
+	(
+		flock -x 200
+		json_load "$(cat $MAPFILE)"
+		json_get_var bk_type type
+		json_cleanup
+
+		[ "$type" = "$bk_type" ] && rm -f "$MAPFILE" > /dev/null 2>&1
+	) 200>/var/lock/map.backhaul.lock
 }

 func=$1
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -1,16 +1,13 @@
 #
-# Copyright (C) 2020 IOPSYS Software Solutions AB
+# Copyright (C) 2020-22 IOPSYS Software Solutions AB
 #

 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=6.0.21
+PKG_VERSION:=2.7.0.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a388472887744d404825ee5602ab906bf1fc225c
-
-PKG_LICENSE:=PROPRIETARY IOPSYS
-PKG_LICENSE_FILES:=LICENSE
+PKG_SOURCE_VERSION:=02f8f83b2886673771066ef15b05caf05a2432e0

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -20,6 +17,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif

+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk

 define Package/map-controller
--- a/map-topology/Makefile
+++ b/map-topology/Makefile
@@ -1,38 +1,40 @@
 #
-# Copyright (C) 2020 iopsys
+# Copyright (C) 2020-22 IOPSYS Software Solutions AB
 #

 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=map-topology
-PKG_VERSION:=4.0.1
+PKG_VERSION:=2.5.0.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=f0c36d13b19c100639a8f657a6a027bbfd74b802
+PKG_SOURCE_VERSION:=0198acea26b165248551494ad22306e46988af49
 PKG_SOURCE_PROTO:=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
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=ieee1905
-PKG_LICENSE:=PROPRIETARY IOPSYS
+
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk

 define Package/map-topology
 	CATEGORY:=Utilities
 	DEPENDS:=+libubox +ubus +libpthread +libuci +libeasy \
-		 +libavahi-nodbus-support
+		 +libavahi-nodbus-support +libnetfilter-conntrack +libnfnetlink +libmnl
 	TITLE:=Utility to build topology of a multi-AP network
 endef

 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-I$(STAGING_DIR)/usr/include/libnetfilter_conntrack \
 	-D_GNU_SOURCE

 define Package/map-topology/description
--- a/periodicstats/Makefile
+++ b/periodicstats/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=periodicstats
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.3

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2779815d2b87e5966e27cfafe88070d0a8970a25
+PKG_SOURCE_VERSION:=fe349c3074f7bffdbf15cacd77b6853b6b1665c7
 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
--- a/qosmngr/files/lib/qos/broadcom.sh
+++ b/qosmngr/files/lib/qos/broadcom.sh
@@ -4,6 +4,7 @@

 IP_RULE=""
 BR_RULE=""
+BR6_RULE=""

 POLICER_COUNT=0
 INTF_NAME=""
@@ -291,6 +292,7 @@ flush_chains() {

 init_broute_rule() {
 	BR_RULE=""
+	BR6_RULE=""
 }

 broute_filter_on_src_if() {
@@ -326,6 +328,82 @@ broute_filter_on_ether_type() {
 	BR_RULE="$BR_RULE --proto $1"
 }

+broute_filter_on_ether_type6() {
+	BR6_RULE="$BR6_RULE --proto IPv6"
+}
+
+ebt_match_src_ip() {
+        BR_RULE="$BR_RULE --ip-src $1"
+}
+
+ebt_match_dst_ip() {
+        BR_RULE="$BR_RULE --ip-dst $1"
+}
+
+ebt_match_ipv6_src_ip() {
+        BR_RULE="$BR_RULE --ip6-src $1"
+}
+
+ebt_match_ipv6_dst_ip() {
+        BR_RULE="$BR_RULE --ip6-dst $1"
+}
+
+ebt_match_ip_src_port() {
+        BR_RULE="$BR_RULE --ip-source-port $1"
+}
+
+ebt_match_ip_dst_port() {
+        BR_RULE="$BR_RULE --ip-destination-port $1"
+}
+
+ebt_match_ipv6_src_port() {
+	#when ethertype is not configured by user then both proto rules of ipv4
+	#and ipv6 to be installed so update BR6_RULE string as well otherwise
+	#update BR_RULE only for installation of ipv6 proto rule only.
+	if [ ! -z "$BR6_RULE" ]; then
+		BR6_RULE="$BR6_RULE --ip6-source-port $1"
+	else
+		BR_RULE="$BR_RULE --ip6-source-port $1"
+	fi
+}
+
+ebt_match_ipv6_dst_port() {
+	#when ethertype is not configured by user then both proto rules of ipv4
+	#and ipv6 to be installed so update BR6_RULE string as well otherwise
+	#update BR_RULE only for installation of ipv6 proto rule only.
+	if [ ! -z "$BR6_RULE" ]; then
+		BR6_RULE="$BR6_RULE --ip6-destination-port $1"
+	else
+		BR_RULE="$BR_RULE --ip6-destination-port $1"
+	fi
+}
+
+ebt_match_ip_protocol() {
+        BR_RULE="$BR_RULE --ip-proto $1"
+}
+
+ebt_match_ipv6_protocol() {
+	#when ethertype is not configured by user then both proto rules of ipv4
+	#and ipv6 to be installed so update BR6_RULE string as well otherwise
+	#update BR_RULE only for installation of ipv6 proto rule only.
+	if [ ! -z "$BR6_RULE" ]; then
+		BR6_RULE="$BR6_RULE --ip6-proto $1"
+	else
+		BR_RULE="$BR_RULE --ip6-proto $1"
+	fi
+}
+
+ebt_match_ipv6_dscp() {
+	#when ethertype is not configured by user then both proto rules of ipv4
+	#and ipv6 to be installed so update BR6_RULE string as well otherwise
+	#update BR_RULE only for installation of ipv6 proto rule only.
+	if [ ! -z "$BR6_RULE" ]; then
+		BR6_RULE="$BR6_RULE --ip6-tclass $1"
+	else
+		BR_RULE="$BR_RULE --ip6-tclass $1"
+	fi
+}
+
 broute_filter_on_dscp() {
 	# The broadcom option --ip-dscp-extend actually accepts tos
 	# and not dscp and that too in hex, hence, perform the conversion
@@ -352,11 +430,145 @@ broute_filter_on_vid() {
 }

 broute_rule_set_traffic_class() {
+	#when ethertype is not configured by user then both proto rules of ipv4
+	#and ipv6 to be installed so update BR6_RULE string as well otherwise
+	#update BR_RULE only for installation of ipv6 proto rule only.
 	BR_RULE="$BR_RULE -j mark --mark-or 0x$1 --mark-target ACCEPT"
+	if [ ! -z "$BR6_RULE" ]; then
+		BR6_RULE="$BR6_RULE -j mark --mark-or 0x$1 --mark-target ACCEPT"
+	fi
 }

 broute_append_rule() {
+	#when ethertype is not configured by user then both proto rules of ipv4
+	#and ipv6 to be installed otherwise install ipv6 proto rule only.
 	echo "ebtables -t broute -A qos $BR_RULE" >> /tmp/qos/classify.ebtables
+	if [ -n "$BR6_RULE" ]; then
+		echo "ebtables -t broute -A qos $BR6_RULE" >> /tmp/qos/classify.ebtables
+	fi
+}
+
+set_ip_addr()
+{
+        local cid=$1
+        local match_src_ip_func=$2
+        local match_dst_ip_func=$3
+
+        config_get src_ip "$cid" "src_ip"
+        config_get dst_ip "$cid" "dest_ip"
+
+        if [ ! -z "$src_ip" ]; then
+                $match_src_ip_func "$src_ip"
+        fi
+
+        if [ ! -z "$dst_ip" ]; then
+                $match_dst_ip_func "$dst_ip"
+        fi
+}
+
+set_ports()
+{
+        local cid=$1
+        local match_src_port_func=$2
+        local match_dst_port_func=$3
+	local src_port=""
+	local dst_port=""
+	local src_port_range=""
+	local dst_port_range=""
+
+        config_get src_port "$cid" "src_port"
+        config_get dst_port "$cid" "dest_port"
+        config_get src_port_range "$cid" "src_port_range"
+        config_get dst_port_range "$cid" "dest_port_range"
+
+        if ! [ -z $src_port ] && ! [ -z $src_port_range ]; then
+                $match_src_port_func "$src_port:$src_port_range"
+        elif [ ! -z $src_port ]; then
+                $match_src_port_func $src_port
+        fi
+
+        if ! [ -z $dst_port ] && ! [ -z $dst_port_range ]; then
+                $match_dst_port_func "$dst_port:$dst_port_range"
+        elif [ ! -z $dst_port ]; then
+                $match_dst_port_func $dst_port
+	fi
+}
+
+protocol_string_to_num()
+{
+        local value=-1
+
+        case "$1" in
+		*[0-9]*)	value="$1"
+                ;;
+                TCP|tcp)        value=6
+                ;;
+                UDP|udp)        value=17
+                ;;
+                ICMP|icmp)      value=1
+                ;;
+                ICMPv6|icmpv6)  value=58
+                ;;
+                IGMP|igmp)      value=2
+                ;;
+                SCTP|sctp)      value=132
+                ;;
+                *) value=-1
+                ;;
+        esac
+        echo $value
+}
+
+broute_ipv4_rule_options()
+{
+	local cid=$1
+	config_get protocol "$cid" "proto"
+	config_get dscp_filter "$cid" "dscp_filter"
+
+	set_ip_addr $cid ebt_match_src_ip ebt_match_dst_ip
+
+	if [ ! -z $dscp_filter ]; then
+		broute_filter_on_dscp "$dscp_filter"
+	fi
+
+	if [ ! -z $protocol ]; then
+		local proto_num=$(protocol_string_to_num "$protocol")
+		ebt_match_ip_protocol "$proto_num"
+
+		#port installation for protol tcp/udp/sctp
+		if [ $proto_num = "6" ] || [ $proto_num = "17" ] || [ $proto_num = "132" ] ; then
+			set_ports "$cid" ebt_match_ip_src_port ebt_match_ip_dst_port
+		fi
+	fi
+}
+
+broute_ipv6_rule_options()
+{
+	local cid=$1
+
+	config_get protocol "$cid" "proto"
+	config_get dscp_filter "$cid" "dscp_filter"
+
+	set_ip_addr $cid ebt_match_ipv6_src_ip ebt_match_ipv6_dst_ip
+
+	if [ ! -z $dscp_filter ]; then
+		local tos_val
+		local tos_hex
+
+		tos_val=$(($dscp_filter<<2))
+		tos_hex=$(printf "%x" $tos_val)
+		ebt_match_ipv6_dscp "$tos_hex"
+	fi
+
+	if [ ! -z $protocol ]; then
+		local proto_num=$(protocol_string_to_num "$protocol")
+		ebt_match_ipv6_protocol "$proto_num"
+
+		#port installation for protol tcp/udp/sctp
+		if [ $proto_num = "6" ] || [ $proto_num = "17" ] || [ $proto_num = "132" ]; then
+			set_ports "$cid" ebt_match_ipv6_src_port ebt_match_ipv6_dst_port
+		fi
+	fi
 }

 handle_ebtables_rules() {
@@ -364,6 +576,8 @@ handle_ebtables_rules() {
 	local is_l2_rule=0
 	local src_dhcp_options=""
 	local dst_dhcp_options=""
+	local protocol=""
+	local ip_version=""

 	init_broute_rule

@@ -381,8 +595,9 @@ handle_ebtables_rules() {
 	config_get dst_clid "$sid" "dst_client_id" # dhcp option 61
 	config_get src_ucid "$sid" "src_user_class_id" # dhcp option 77
 	config_get dst_ucid "$sid" "dst_user_class_id" # dhcp option 77
-
 	config_get traffic_class "$sid" "traffic_class"
+	config_get protocol "$sid" "proto"
+

 	if [ -n "$src_if" ]; then
 		for interf in $(db -q get hw.board.ethernetPortOrder); do
@@ -409,13 +624,6 @@ handle_ebtables_rules() {
 		is_l2_rule=1
 	fi

-	if [ -n "$dscp_filter" ]; then
-		# filter on ethertype and proto is same thing
-		broute_filter_on_ether_type IPv4
-		broute_filter_on_dscp $dscp_filter
-		is_l2_rule=1
-	fi
-
 	if [ -n "$eth_type" ]; then
 		broute_filter_on_ether_type $eth_type
 		is_l2_rule=1
@@ -426,6 +634,47 @@ handle_ebtables_rules() {
 		is_l2_rule=1
 	fi

+	case $eth_type in
+	IPv4|IPV4|0800)
+			ip_version=4
+		;;
+	IPv6|IPV6|86DD)
+			ip_version=6
+		;;
+	*)
+		if [ -z "$eth_type" ]; then
+			case $src_ip$dest_ip in
+			*.*)
+				ip_version=4
+				broute_filter_on_ether_type "IPv4"
+				;;
+			*:*)
+				ip_version=6
+				broute_filter_on_ether_type "IPv6"
+				;;
+			*)
+				if [ -n "$protocol" ] || [ -n "$dscp_filter" ]; then
+					ip_version=1 #neither ether_type nor ip address used
+					#ethertype is not configured by user so install 
+					#both proto ipv4 and ipv6 rule
+					BR6_RULE="$BR_RULE"
+					broute_filter_on_ether_type "IPv4"
+					broute_filter_on_ether_type6 "IPv6"
+				fi
+			esac
+		fi
+	esac
+
+	if [ $ip_version = "4" ] || [ $ip_version = "1" ]; then
+		broute_ipv4_rule_options "$sid"
+		is_l2_rule=1
+	fi
+
+	if [ $ip_version = "6" ] || [ $ip_version = "1" ]; then
+		broute_ipv6_rule_options "$sid"
+		is_l2_rule=1
+	fi
+
 	# first process options that will help figure our source mac address
 	# dhcp option for "vendor class id"
 	if [ -n "$src_vcid" ]; then
@@ -851,11 +1100,16 @@ pre_configure_queue() {
 		mkdir -p /tmp/qos/queue_stats/$intf
 		touch /tmp/qos/queue_stats/$intf/q_idx
 		echo 0 > /tmp/qos/queue_stats/$intf/q_idx
+
+#		tm initialization pushing ahead of delcfg as
+#		porttminit bydefault configures all queue as SP configuration.
+#		that was causing WRR queue configuration failure.
+		tmctl porttminit --devtype 0 --if $intf --flag 0 --numqueues 8
+
 		i=0
 		for i in 0 1 2 3 4 5 6 7; do
 			tmctl delqcfg --devtype 0 --if $intf --qid $i &>/dev/null
 		done
-		tmctl porttminit --devtype 0 --if $intf --flag 0 --numqueues 8

 		mkdir -p /tmp/qos/$intf
 		touch /tmp/qos/$intf/q_order
--- a/questd/Makefile
+++ b/questd/Makefile
@@ -1,21 +1,20 @@
 #
-# Copyright (C) 2013-2020 iopsys
+# Copyright (C) 2013-2022 iopsys
 #

 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=questd
-PKG_VERSION:=5.2.3
+PKG_VERSION:=5.2.4

-PKG_SOURCE_VERSION:=cf54bd65ec821ac67f3aa1caeebcd3ea9aae07ad
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
-
+PKG_SOURCE_VERSION:=2ca3ae0c29dcbbf01282f6118eb8d5e5bc9a1c45
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+endif

 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
@@ -23,8 +22,6 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk

-PKG_INSTALL:=
-
 define Package/questd
 	CATEGORY:=Utilities
 	DEPENDS:=+libuci +libubox +ubus +libpthread
@@ -36,6 +33,13 @@ define Package/questd/description
 	this information via ubus
 endef

+ifeq ($(LOCAL_DEV),1)
+CMAKE_OPTIONS:=-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+define Build/Prepare
+	$(CP) -rf ~/git/code/questd/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 define Package/questd/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/sbin
--- a/rulengd/Makefile
+++ b/rulengd/Makefile
@@ -1,23 +1,22 @@
 #
-# Copyright (C) 2018 iopsys
+# Copyright (C) 2018-2022 iopsys
 #

 include $(TOPDIR)/rules.mk

 PKG_NAME:=rulengd
-PKG_VERSION:=1.2.6
+PKG_VERSION:=1.2.7
 PKG_RELEASE:=1
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1

+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
-PKG_SOURCE_VERSION:=e323bebe85cd7fb4eeb6cee535188227bc9b81e3
+PKG_SOURCE_VERSION:=1f247e1afc845f47348febffa55fe40d8b552737
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
+endif
+
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE

@@ -35,6 +34,14 @@ define Package/rulengd/description
 	rulengd listens for events and executes speficied methods if the incoming event arguments contain speficied ones.
 endef

+#CMAKE_OPTIONS:=-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/code/rulengd/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 define Package/rulengd/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/bin
--- a/shflags/Makefile
+++ b/shflags/Makefile
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2012-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=shflags
-PKG_VERSION:=2012-06-11
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/kward/shflags.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c12b30cebb92b49c5edb6df255c0952c65b4ddc6
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-PKG_LICENSE:=LGPL-2.1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/shflags
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=shflags
-  DEPENDS:=+getopt
-  URL:=http://code.google.com/p/shflags/
-  MAINTAINER:=Luka Perkov <luka@openwrt.org>
-endef
-
-define Package/shflags/description
- command-line flags module for Unix shell scripts
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Build/Install
-endef
-
-define Package/shflags/install
-	$(INSTALL_DIR) $(1)/usr/share/shflags
-	$(CP) $(PKG_BUILD_DIR)/source/1.0/src/shflags  $(1)/usr/share/shflags/shflags.sh
-endef
-
-$(eval $(call BuildPackage,shflags))
--- a/shflags/patches/000-strip.patch
+++ b/shflags/patches/000-strip.patch
@@ -1,763 +0,0 @@
--- a/source/1.0/src/shflags
-+++ b/source/1.0/src/shflags
-@@ -1,91 +1,10 @@
-# $Id$
-# vim:et:ft=sh:sts=2:sw=2
-#
-# Copyright 2008 Kate Ward. All Rights Reserved.
-# Released under the LGPL (GNU Lesser General Public License)
-#
-# shFlags -- Advanced command-line flag library for Unix shell scripts.
-# http://code.google.com/p/shflags/
-#
-# Author: kate.ward@forestent.com (Kate Ward)
-#
-# This module implements something like the google-gflags library available
-# from http://code.google.com/p/google-gflags/.
-#
-# FLAG TYPES: This is a list of the DEFINE_*'s that you can do.  All flags take
-# a name, default value, help-string, and optional 'short' name (one-letter
-# name).  Some flags have other arguments, which are described with the flag.
-#
-# DEFINE_string: takes any input, and intreprets it as a string.
-#
-# DEFINE_boolean: typically does not take any argument: say --myflag to set
-#   FLAGS_myflag to true, or --nomyflag to set FLAGS_myflag to false.
-#   Alternately, you can say
-#     --myflag=true  or --myflag=t or --myflag=0  or
-#     --myflag=false or --myflag=f or --myflag=1
-#   Passing an option has the same affect as passing the option once.
-#
-# DEFINE_float: takes an input and intreprets it as a floating point number. As
-#   shell does not support floats per-se, the input is merely validated as
-#   being a valid floating point value.
-#
-# DEFINE_integer: takes an input and intreprets it as an integer.
-#
-# SPECIAL FLAGS: There are a few flags that have special meaning:
-#   --help (or -?)  prints a list of all the flags in a human-readable fashion
-#   --flagfile=foo  read flags from foo.  (not implemented yet)
-#   --              as in getopt(), terminates flag-processing
-#
-# EXAMPLE USAGE:
-#
-#   -- begin hello.sh --
-#   #! /bin/sh
-#   . ./shflags
-#   DEFINE_string name 'world' "somebody's name" n
-#   FLAGS "$@" || exit $?
-#   eval set -- "${FLAGS_ARGV}"
-#   echo "Hello, ${FLAGS_name}."
-#   -- end hello.sh --
-#
-#   $ ./hello.sh -n Kate
-#   Hello, Kate.
-#
-# NOTE: Not all systems include a getopt version that supports long flags. On
-# these systems, only short flags are recognized.
-
-#==============================================================================
-# shFlags
-#
-# Shared attributes:
-#   flags_error: last error message
-#   flags_return: last return value
-#
-#   __flags_longNames: list of long names for all flags
-#   __flags_shortNames: list of short names for all flags
-#   __flags_boolNames: list of boolean flag names
-#
-#   __flags_opts: options parsed by getopt
-#
-# Per-flag attributes:
-#   FLAGS_<flag_name>: contains value of flag named 'flag_name'
-#   __flags_<flag_name>_default: the default flag value
-#   __flags_<flag_name>_help: the flag help string
-#   __flags_<flag_name>_short: the flag short name
-#   __flags_<flag_name>_type: the flag type
-#
-# Notes:
-# - lists of strings are space separated, and a null value is the '~' char.
-
-# return if FLAGS already loaded
- [ -n "${FLAGS_VERSION:-}" ] && return 0
- FLAGS_VERSION='1.0.3'
- 
-# return values
- FLAGS_TRUE=0
- FLAGS_FALSE=1
- FLAGS_ERROR=2
- 
-# reserved flag names
- FLAGS_RESERVED='ARGC ARGV ERROR FALSE HELP PARENT RESERVED TRUE VERSION'
- 
- _flags_debug() { echo "flags:DEBUG $@" >&2; }
-@@ -93,7 +12,6 @@ _flags_warn() { echo "flags:WARN $@" >&2
- _flags_error() { echo "flags:ERROR $@" >&2; }
- _flags_fatal() { echo "flags:FATAL $@" >&2; }
- 
-# specific shell checks
- if [ -n "${ZSH_VERSION:-}" ]; then
-   setopt |grep "^shwordsplit$" >/dev/null
-   if [ $? -ne ${FLAGS_TRUE} ]; then
-@@ -107,20 +25,15 @@ if [ -n "${ZSH_VERSION:-}" ]; then
-   fi
- fi
- 
-#
-# constants
-#
- 
-# getopt version
- __FLAGS_GETOPT_VERS_STD=0
- __FLAGS_GETOPT_VERS_ENH=1
- __FLAGS_GETOPT_VERS_BSD=2
- 
- getopt >/dev/null 2>&1
- case $? in
-  0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;;  # bsd getopt
-+  0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;;
-   2)
-    # TODO(kward): look into '-T' option to test the internal getopt() version
-     if [ "`getopt --version`" = '-- ' ]; then
-       __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD}
-     else
-@@ -133,82 +46,49 @@ case $? in
-     ;;
- esac
- 
-# getopt optstring lengths
- __FLAGS_OPTSTR_SHORT=0
- __FLAGS_OPTSTR_LONG=1
- 
- __FLAGS_NULL='~'
- 
-# flag info strings
- __FLAGS_INFO_DEFAULT='default'
- __FLAGS_INFO_HELP='help'
- __FLAGS_INFO_SHORT='short'
- __FLAGS_INFO_TYPE='type'
- 
-# flag lengths
- __FLAGS_LEN_SHORT=0
- __FLAGS_LEN_LONG=1
- 
-# flag types
- __FLAGS_TYPE_NONE=0
- __FLAGS_TYPE_BOOLEAN=1
- __FLAGS_TYPE_FLOAT=2
- __FLAGS_TYPE_INTEGER=3
- __FLAGS_TYPE_STRING=4
- 
-# set the constants readonly
- __flags_constants=`set |awk -F= '/^FLAGS_/ || /^__FLAGS_/ {print $1}'`
- for __flags_const in ${__flags_constants}; do
-  # skip certain flags
-   case ${__flags_const} in
-     FLAGS_HELP) continue ;;
-     FLAGS_PARENT) continue ;;
-   esac
-  # set flag readonly
-   if [ -z "${ZSH_VERSION:-}" ]; then
-     readonly ${__flags_const}
-  else  # handle zsh
-+  else
-     case ${ZSH_VERSION} in
-       [123].*) readonly ${__flags_const} ;;
-      *) readonly -g ${__flags_const} ;;  # declare readonly constants globally
-+      *) readonly -g ${__flags_const} ;;
-     esac
-   fi
- done
- unset __flags_const __flags_constants
- 
-#
-# internal variables
-#
-
-__flags_boolNames=' '  # space separated list of boolean flag names
-__flags_longNames=' '  # space separated list of long flag names
-__flags_shortNames=' '  # space separated list of short flag names
-
-__flags_columns=''  # screen width in columns
-__flags_opts=''  # temporary storage for parsed getopt flags
-
-#------------------------------------------------------------------------------
-# private functions
-#
-
-# Define a flag.
-#
-# Calling this function will define the following info variables for the
-# specified flag:
-#   FLAGS_flagname - the name for this flag (based upon the long flag name)
-#   __flags_<flag_name>_default - the default value
-#   __flags_flagname_help - the help string
-#   __flags_flagname_short - the single letter alias
-#   __flags_flagname_type - the type of flag (one of __FLAGS_TYPE_*)
-#
-# Args:
-#   _flags__type: integer: internal type of flag (__FLAGS_TYPE_*)
-#   _flags__name: string: long flag name
-#   _flags__default: default flag value
-#   _flags__help: string: help string
-#   _flags__short: string: (optional) short flag name
-# Returns:
-#   integer: success of operation, or error
-+
-+__flags_boolNames=' '
-+__flags_longNames=' '
-+__flags_shortNames=' '
-+__flags_columns=''
-+__flags_opts=''
-+
- _flags_define()
- {
-   if [ $# -lt 4 ]; then
-@@ -226,16 +106,13 @@ _flags_define()
- 
-   _flags_return_=${FLAGS_TRUE}
- 
-  # TODO(kward): check for validity of the flag name (e.g. dashes)
- 
-  # check whether the flag name is reserved
-   echo " ${FLAGS_RESERVED} " |grep " ${_flags_name_} " >/dev/null
-   if [ $? -eq 0 ]; then
-     flags_error="flag name (${_flags_name_}) is reserved"
-     _flags_return_=${FLAGS_ERROR}
-   fi
- 
-  # require short option for getopt that don't support long options
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} \
-       -a ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} \
-       -a "${_flags_short_}" = "${__FLAGS_NULL}" ]
-@@ -244,7 +121,6 @@ _flags_define()
-     _flags_return_=${FLAGS_ERROR}
-   fi
- 
-  # check for existing long name definition
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
-     if _flags_itemInList "${_flags_name_}" \
-         ${__flags_longNames} ${__flags_boolNames}
-@@ -255,7 +131,6 @@ _flags_define()
-     fi
-   fi
- 
-  # check for existing short name definition
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} \
-       -a "${_flags_short_}" != "${__FLAGS_NULL}" ]
-   then
-@@ -266,9 +141,6 @@ _flags_define()
-     fi
-   fi
- 
-  # handle default value. note, on several occasions the 'if' portion of an
-  # if/then/else contains just a ':' which does nothing. a binary reversal via
-  # '!' is not done because it does not work on all shells.
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
-     case ${_flags_type_} in
-       ${__FLAGS_TYPE_BOOLEAN})
-@@ -301,7 +173,7 @@ _flags_define()
-         fi
-         ;;
- 
-      ${__FLAGS_TYPE_STRING}) ;;  # everything in shell is a valid string
-+      ${__FLAGS_TYPE_STRING}) ;;
- 
-       *)
-         flags_error="unrecognized flag type '${_flags_type_}'"
-@@ -311,7 +183,6 @@ _flags_define()
-   fi
- 
-   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
-    # store flag information
-     eval "FLAGS_${_flags_name_}='${_flags_default_}'"
-     eval "__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}=${_flags_type_}"
-     eval "__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT}=\
-@@ -319,7 +190,6 @@ _flags_define()
-     eval "__flags_${_flags_name_}_${__FLAGS_INFO_HELP}=\"${_flags_help_}\""
-     eval "__flags_${_flags_name_}_${__FLAGS_INFO_SHORT}='${_flags_short_}'"
- 
-    # append flag name(s) to list of names
-     __flags_longNames="${__flags_longNames}${_flags_name_} "
-     __flags_shortNames="${__flags_shortNames}${_flags_short_} "
-     [ ${_flags_type_} -eq ${__FLAGS_TYPE_BOOLEAN} ] && \
-@@ -333,17 +203,6 @@ _flags_define()
-   return ${flags_return}
- }
- 
-# Return valid getopt options using currently defined list of long options.
-#
-# This function builds a proper getopt option string for short (and long)
-# options, using the current list of long options for reference.
-#
-# Args:
-#   _flags_optStr: integer: option string type (__FLAGS_OPTSTR_*)
-# Output:
-#   string: generated option string for getopt
-# Returns:
-#   boolean: success of operation (always returns True)
- _flags_genOptStr()
- {
-   _flags_optStrType_=$1
-@@ -358,7 +217,6 @@ _flags_genOptStr()
-             ${_flags_flag_} ${__FLAGS_INFO_SHORT}`
-         if [ "${_flags_shortName_}" != "${__FLAGS_NULL}" ]; then
-           _flags_opts_="${_flags_opts_}${_flags_shortName_}"
-          # getopt needs a trailing ':' to indicate a required argument
-           [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \
-               _flags_opts_="${_flags_opts_}:"
-         fi
-@@ -366,7 +224,6 @@ _flags_genOptStr()
- 
-       ${__FLAGS_OPTSTR_LONG})
-         _flags_opts_="${_flags_opts_:+${_flags_opts_},}${_flags_flag_}"
-        # getopt needs a trailing ':' to indicate a required argument
-         [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \
-             _flags_opts_="${_flags_opts_}:"
-         ;;
-@@ -379,15 +236,6 @@ _flags_genOptStr()
-   return ${FLAGS_TRUE}
- }
- 
-# Returns flag details based on a flag name and flag info.
-#
-# Args:
-#   string: long flag name
-#   string: flag info (see the _flags_define function for valid info types)
-# Output:
-#   string: value of dereferenced flag variable
-# Returns:
-#   integer: one of FLAGS_{TRUE|FALSE|ERROR}
- _flags_getFlagInfo()
- {
-   _flags_name_=$1
-@@ -399,13 +247,6 @@ _flags_getFlagInfo()
-   if [ -n "${_flags_value_}" ]; then
-     flags_return=${FLAGS_TRUE}
-   else
-    # see if the _flags_name_ variable is a string as strings can be empty...
-    # note: the DRY principle would say to have this function call itself for
-    # the next three lines, but doing so results in an infinite loop as an
-    # invalid _flags_name_ will also not have the associated _type variable.
-    # Because it doesn't (it will evaluate to an empty string) the logic will
-    # try to find the _type variable of the _type variable, and so on. Not so
-    # good ;-)
-     _flags_typeVar_="__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}"
-     _flags_strToEval_="_flags_type_=\"\${${_flags_typeVar_}:-}\""
-     eval "${_flags_strToEval_}"
-@@ -424,15 +265,6 @@ _flags_getFlagInfo()
-   return ${flags_return}
- }
- 
-# check for presense of item in a list. passed a string (e.g. 'abc'), this
-# function will determine if the string is present in the list of strings (e.g.
-# ' foo bar abc ').
-#
-# Args:
-#   _flags__str: string: string to search for in a list of strings
-#   unnamed: list: list of strings
-# Returns:
-#   boolean: true if item is in the list
- _flags_itemInList()
- {
-   _flags_str_=$1
-@@ -449,34 +281,22 @@ _flags_itemInList()
-   return ${flags_return}
- }
- 
-# Returns the width of the current screen.
-#
-# Output:
-#   integer: width in columns of the current screen.
- _flags_columns()
- {
-   if [ -z "${__flags_columns}" ]; then
-    # determine the value and store it
-     if eval stty size >/dev/null 2>&1; then
-      # stty size worked :-)
-       set -- `stty size`
-       __flags_columns=$2
-     elif eval tput cols >/dev/null 2>&1; then
-       set -- `tput cols`
-       __flags_columns=$1
-     else
-      __flags_columns=80  # default terminal width
-+      __flags_columns=80
-     fi
-   fi
-   echo ${__flags_columns}
- }
- 
-# Validate a boolean.
-#
-# Args:
-#   _flags__bool: boolean: value to validate
-# Returns:
-#   bool: true if the value is a valid boolean
- _flags_validateBoolean()
- {
-   _flags_bool_=$1
-@@ -492,12 +312,6 @@ _flags_validateBoolean()
-   return ${flags_return}
- }
- 
-# Validate a float.
-#
-# Args:
-#   _flags__float: float: value to validate
-# Returns:
-#   bool: true if the value is a valid float
- _flags_validateFloat()
- {
-   _flags_float_=$1
-@@ -507,10 +321,10 @@ _flags_validateFloat()
-   else
-     flags_return=${FLAGS_TRUE}
-     case ${_flags_float_} in
-      -*)  # negative floats
-+      -*)
-         _flags_test_=`expr "${_flags_float_}" : '\(-[0-9][0-9]*\.[0-9][0-9]*\)'`
-         ;;
-      *)  # positive floats
-+      *)
-         _flags_test_=`expr "${_flags_float_}" : '\([0-9][0-9]*\.[0-9][0-9]*\)'`
-         ;;
-     esac
-@@ -521,22 +335,16 @@ _flags_validateFloat()
-   return ${flags_return}
- }
- 
-# Validate an integer.
-#
-# Args:
-#   _flags__integer: interger: value to validate
-# Returns:
-#   bool: true if the value is a valid integer
- _flags_validateInteger()
- {
-   _flags_int_=$1
- 
-   flags_return=${FLAGS_TRUE}
-   case ${_flags_int_} in
-    -*)  # negative ints
-+    -*)
-       _flags_test_=`expr "${_flags_int_}" : '\(-[0-9][0-9]*\)'`
-       ;;
-    *)  # positive ints
-+    *)
-       _flags_test_=`expr "${_flags_int_}" : '\([0-9][0-9]*\)'`
-       ;;
-   esac
-@@ -546,23 +354,12 @@ _flags_validateInteger()
-   return ${flags_return}
- }
- 
-# Parse command-line options using the standard getopt.
-#
-# Note: the flag options are passed around in the global __flags_opts so that
-# the formatting is not lost due to shell parsing and such.
-#
-# Args:
-#   @: varies: command-line options to parse
-# Returns:
-#   integer: a FLAGS success condition
- _flags_getoptStandard()
- {
-   flags_return=${FLAGS_TRUE}
-   _flags_shortOpts_=`_flags_genOptStr ${__FLAGS_OPTSTR_SHORT}`
- 
-  # check for spaces in passed options
-   for _flags_opt_ in "$@"; do
-    # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06
-     _flags_match_=`echo "x${_flags_opt_}x" |sed 's/ //g'`
-     if [ "${_flags_match_}" != "x${_flags_opt_}x" ]; then
-       flags_error='the available getopt does not support spaces in options'
-@@ -585,15 +382,6 @@ _flags_getoptStandard()
-   return ${flags_return}
- }
- 
-# Parse command-line options using the enhanced getopt.
-#
-# Note: the flag options are passed around in the global __flags_opts so that
-# the formatting is not lost due to shell parsing and such.
-#
-# Args:
-#   @: varies: command-line options to parse
-# Returns:
-#   integer: a FLAGS success condition
- _flags_getoptEnhanced()
- {
-   flags_return=${FLAGS_TRUE}
-@@ -617,17 +405,6 @@ _flags_getoptEnhanced()
-   return ${flags_return}
- }
- 
-# Dynamically parse a getopt result and set appropriate variables.
-#
-# This function does the actual conversion of getopt output and runs it through
-# the standard case structure for parsing. The case structure is actually quite
-# dynamic to support any number of flags.
-#
-# Args:
-#   argc: int: original command-line argument count
-#   @: varies: output from getopt parsing
-# Returns:
-#   integer: a FLAGS success condition
- _flags_parseGetopt()
- {
-   _flags_argc_=$1
-@@ -638,35 +415,26 @@ _flags_parseGetopt()
-   if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then
-     set -- $@
-   else
-    # note the quotes around the `$@' -- they are essential!
-     eval set -- "$@"
-   fi
- 
-  # provide user with number of arguments to shift by later
-  # NOTE: the FLAGS_ARGC variable is obsolete as of 1.0.3 because it does not
-  # properly give user access to non-flag arguments mixed in between flag
-  # arguments. Its usage was replaced by FLAGS_ARGV, and it is being kept only
-  # for backwards compatibility reasons.
-   FLAGS_ARGC=`expr $# - 1 - ${_flags_argc_}`
- 
-  # handle options. note options with values must do an additional shift
-   while true; do
-     _flags_opt_=$1
-     _flags_arg_=${2:-}
-     _flags_type_=${__FLAGS_TYPE_NONE}
-     _flags_name_=''
- 
-    # determine long flag name
-     case "${_flags_opt_}" in
-      --) shift; break ;;  # discontinue option parsing
-+      --) shift; break ;;
- 
-      --*)  # long option
-+      --*)
-         _flags_opt_=`expr "${_flags_opt_}" : '--\(.*\)'`
-         _flags_len_=${__FLAGS_LEN_LONG}
-         if _flags_itemInList "${_flags_opt_}" ${__flags_longNames}; then
-           _flags_name_=${_flags_opt_}
-         else
-          # check for negated long boolean version
-           if _flags_itemInList "${_flags_opt_}" ${__flags_boolNames}; then
-             _flags_name_=`expr "${_flags_opt_}" : 'no\(.*\)'`
-             _flags_type_=${__FLAGS_TYPE_BOOLEAN}
-@@ -675,12 +443,10 @@ _flags_parseGetopt()
-         fi
-         ;;
- 
-      -*)  # short option
-+      -*)
-         _flags_opt_=`expr "${_flags_opt_}" : '-\(.*\)'`
-         _flags_len_=${__FLAGS_LEN_SHORT}
-         if _flags_itemInList "${_flags_opt_}" ${__flags_shortNames}; then
-          # yes. match short name to long name. note purposeful off-by-one
-          # (too high) with awk calculations.
-           _flags_pos_=`echo "${__flags_shortNames}" \
-               |awk 'BEGIN{RS=" ";rn=0}$0==e{rn=NR}END{print rn}' \
-                   e=${_flags_opt_}`
-@@ -690,14 +456,12 @@ _flags_parseGetopt()
-         ;;
-     esac
- 
-    # die if the flag was unrecognized
-     if [ -z "${_flags_name_}" ]; then
-       flags_error="unrecognized option (${_flags_opt_})"
-       flags_return=${FLAGS_ERROR}
-       break
-     fi
- 
-    # set new flag value
-     [ ${_flags_type_} -eq ${__FLAGS_TYPE_NONE} ] && \
-         _flags_type_=`_flags_getFlagInfo \
-             "${_flags_name_}" ${__FLAGS_INFO_TYPE}`
-@@ -746,7 +510,6 @@ _flags_parseGetopt()
-         ;;
-     esac
- 
-    # handle special case help flag
-     if [ "${_flags_name_}" = 'help' ]; then
-       if [ ${FLAGS_help} -eq ${FLAGS_TRUE} ]; then
-         flags_help
-@@ -756,12 +519,10 @@ _flags_parseGetopt()
-       fi
-     fi
- 
-    # shift the option and non-boolean arguements out.
-     shift
-     [ ${_flags_type_} != ${__FLAGS_TYPE_BOOLEAN} ] && shift
-   done
- 
-  # give user back non-flag arguments
-   FLAGS_ARGV=''
-   while [ $# -gt 0 ]; do
-     FLAGS_ARGV="${FLAGS_ARGV:+${FLAGS_ARGV} }'$1'"
-@@ -773,43 +534,18 @@ _flags_parseGetopt()
-   return ${flags_return}
- }
- 
-#------------------------------------------------------------------------------
-# public functions
-#
-
-# A basic boolean flag. Boolean flags do not take any arguments, and their
-# value is either 1 (false) or 0 (true). For long flags, the false value is
-# specified on the command line by prepending the word 'no'. With short flags,
-# the presense of the flag toggles the current value between true and false.
-# Specifying a short boolean flag twice on the command results in returning the
-# value back to the default value.
-#
-# A default value is required for boolean flags.
-#
-# For example, lets say a Boolean flag was created whose long name was 'update'
-# and whose short name was 'x', and the default value was 'false'. This flag
-# could be explicitly set to 'true' with '--update' or by '-x', and it could be
-# explicitly set to 'false' with '--noupdate'.
-+
- DEFINE_boolean() { _flags_define ${__FLAGS_TYPE_BOOLEAN} "$@"; }
- 
-# Other basic flags.
- DEFINE_float()   { _flags_define ${__FLAGS_TYPE_FLOAT} "$@"; }
- DEFINE_integer() { _flags_define ${__FLAGS_TYPE_INTEGER} "$@"; }
- DEFINE_string()  { _flags_define ${__FLAGS_TYPE_STRING} "$@"; }
- 
-# Parse the flags.
-#
-# Args:
-#   unnamed: list: command-line flags to parse
-# Returns:
-#   integer: success of operation, or error
- FLAGS()
- {
-  # define a standard 'help' flag if one isn't already defined
-   [ -z "${__flags_help_type:-}" ] && \
-       DEFINE_boolean 'help' false 'show this help' 'h'
- 
-  # parse options
-   if [ $# -gt 0 ]; then
-     if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then
-       _flags_getoptStandard "$@"
-@@ -818,7 +554,6 @@ FLAGS()
-     fi
-     flags_return=$?
-   else
-    # nothing passed; won't bother running getopt
-     __flags_opts='--'
-     flags_return=${FLAGS_TRUE}
-   fi
-@@ -832,23 +567,11 @@ FLAGS()
-   return ${flags_return}
- }
- 
-# This is a helper function for determining the `getopt` version for platforms
-# where the detection isn't working. It simply outputs debug information that
-# can be included in a bug report.
-#
-# Args:
-#   none
-# Output:
-#   debug info that can be included in a bug report
-# Returns:
-#   nothing
- flags_getoptInfo()
- {
-  # platform info
-   _flags_debug "uname -a: `uname -a`"
-   _flags_debug "PATH: ${PATH}"
- 
-  # shell info
-   if [ -n "${BASH_VERSION:-}" ]; then
-     _flags_debug 'shell: bash'
-     _flags_debug "BASH_VERSION: ${BASH_VERSION}"
-@@ -857,7 +580,6 @@ flags_getoptInfo()
-     _flags_debug "ZSH_VERSION: ${ZSH_VERSION}"
-   fi
- 
-  # getopt info
-   getopt >/dev/null
-   _flags_getoptReturn=$?
-   _flags_debug "getopt return: ${_flags_getoptReturn}"
-@@ -866,39 +588,16 @@ flags_getoptInfo()
-   unset _flags_getoptReturn
- }
- 
-# Returns whether the detected getopt version is the enhanced version.
-#
-# Args:
-#   none
-# Output:
-#   none
-# Returns:
-#   bool: true if getopt is the enhanced version
- flags_getoptIsEnh()
- {
-   test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_ENH}
- }
- 
-# Returns whether the detected getopt version is the standard version.
-#
-# Args:
-#   none
-# Returns:
-#   bool: true if getopt is the standard version
- flags_getoptIsStd()
- {
-   test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD}
- }
- 
-# This is effectively a 'usage()' function. It prints usage information and
-# exits the program with ${FLAGS_FALSE} if it is ever found in the command line
-# arguments. Note this function can be overridden so other apps can define
-# their own --help flag, replacing this one, if they want.
-#
-# Args:
-#   none
-# Returns:
-#   integer: success of operation (always returns true)
- flags_help()
- {
-   if [ -n "${FLAGS_HELP:-}" ]; then
-@@ -953,19 +652,14 @@ flags_help()
-         echo "${flags_helpStr_}" >&2
-       else
-         echo "  ${flags_flagStr_}  ${flags_help_}" >&2
-        # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06
-        # because it doesn't like empty strings when used in this manner.
-         flags_emptyStr_="`echo \"x${flags_flagStr_}x\" \
-             |awk '{printf "%"length($0)-2"s", ""}'`"
-         flags_helpStr_="  ${flags_emptyStr_}  ${flags_defaultStr_}"
-         flags_helpStrLen_=`expr "${flags_helpStr_}" : '.*'`
-         if [ ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD} \
-             -o ${flags_helpStrLen_} -lt ${flags_columns_} ]; then
-          # indented to match help string
-           echo "${flags_helpStr_}" >&2
-         else
-          # indented four from left to allow for longer defaults as long flag
-          # names might be used too, making things too long
-           echo "    ${flags_defaultStr_}" >&2
-         fi
-       fi
-@@ -978,12 +672,6 @@ flags_help()
-   return ${FLAGS_TRUE}
- }
- 
-# Reset shflags back to an uninitialized state.
-#
-# Args:
-#   none
-# Returns:
-#   nothing
- flags_reset()
- {
-   for flags_name_ in ${__flags_longNames}; do
-@@ -1000,7 +688,6 @@ flags_reset()
-     eval ${flags_strToEval_}
-   done
- 
-  # reset internal variables
-   __flags_boolNames=' '
-   __flags_longNames=' '
-   __flags_shortNames=' '
--- a/stunc/Makefile
+++ b/stunc/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.8
+PKG_VERSION:=1.1.11

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
-PKG_SOURCE_VERSION:=2628f2c9e0b99064a703a1ad069f0f298bc36076
+PKG_SOURCE_VERSION:=5afef8d2040fa31a73e6320c8a65b891a88518de
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -64,19 +64,16 @@ TARGET_CFLAGS += \
 	-Wall -Werror

 ifeq ($(BUILD_VARIANT),wolfssl)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
  MAKE_FLAGS += \
 	USE_WOLFSSL="yes"
 endif

 ifeq ($(BUILD_VARIANT),mbedtls)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/mbedtls
  MAKE_FLAGS += \
 	USE_MBEDTLS="yes"
 endif

 ifeq ($(BUILD_VARIANT),openssl)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
  MAKE_FLAGS += \
 	USE_OPENSSL="yes"
 endif
--- a/stunc/files/etc/config/stunc
+++ b/stunc/files/etc/config/stunc
@@ -8,5 +8,5 @@ config stunc 'stunc'
 	option min_keepalive '30'
 	option max_keepalive '3600'
 #	option client_port 7547
-	option log_level '0'
+	option log_level '1'

--- a/sulu-builder/Config.in
+++ b/sulu-builder/Config.in
@@ -0,0 +1,126 @@
+menu "Configuration"
+	depends on PACKAGE_sulu-builder
+
+menu "SULU_CORE"
+	depends on PACKAGE_sulu-builder
+	config SULU_CORE_ENABLE
+	bool "Enable this plugin"
+	default y
+
+	config SULU_CORE_URL
+		string "SULU url"
+		default "https://dev.iopsys.eu/websdk/sulu.git"
+
+	config SULU_CORE_VERSION
+		string "SULU repo version"
+		default "b78372c6e57cf056e1af56e77a5dbf764cce81bb"
+endmenu
+
+menu "SULU_PLUGIN_LCM"
+	depends on PACKAGE_sulu-builder
+	config SULU_PLUGIN_LCM_ENABLE
+	bool "Enable this plugin"
+	default y
+
+	config SULU_PLUGIN_LCM_NAME
+		depends on SULU_PLUGIN_LCM_ENABLE
+		string "Plugin_name"
+		default "sulu-lcm"
+
+	config SULU_PLUGIN_LCM_URL
+		depends on SULU_PLUGIN_LCM_ENABLE
+		string "URL"
+		default "https://dev.iopsys.eu/websdk/sulu-lcm.git"
+
+	config SULU_PLUGIN_LCM_VERSION
+		depends on SULU_PLUGIN_LCM_ENABLE
+		string "Version"
+		default "ae0da97828665aa953459c7f49ed26c656819d4d"
+endmenu
+
+menu "SULU_PLUGIN_MULTIAP"
+	depends on PACKAGE_sulu-builder
+	config SULU_PLUGIN_MULTIAP_ENABLE
+	bool "Enable this plugin"
+	default y
+
+	config SULU_PLUGIN_MULTIAP_NAME
+		depends on SULU_PLUGIN_MULTIAP_ENABLE
+		string "Plugin_name"
+		default "sulu-multi-ap"
+
+	config SULU_PLUGIN_MULTIAP_URL
+		depends on SULU_PLUGIN_MULTIAP_ENABLE
+		string "URL"
+		default "https://dev.iopsys.eu/websdk/sulu-multi-ap.git"
+
+	config SULU_PLUGIN_MULTIAP_VERSION
+		depends on SULU_PLUGIN_MULTIAP_ENABLE
+		string "Version"
+		default "00ce39ef82a5fb46eca24abf8abf69355179ec3b"
+endmenu
+
+menu "SULU_THEME_IOPSYS"
+	depends on PACKAGE_sulu-builder
+	config SULU_THEME_IOPSYS_ENABLE
+	bool "Enable this plugin"
+	default y
+
+	config SULU_THEME_IOPSYS_NAME
+		depends on SULU_THEME_IOPSYS_ENABLE
+		string "Plugin_name"
+		default "sulu-theme-iopsys"
+
+	config SULU_THEME_IOPSYS_URL
+		depends on SULU_THEME_IOPSYS_ENABLE
+		string "URL"
+		default "https://dev.iopsys.eu/websdk/sulu-theme-iopsys.git"
+
+	config SULU_THEME_IOPSYS_VERSION
+		depends on SULU_THEME_IOPSYS_ENABLE
+		string "Version"
+		default "e80fea80cdf8d49db0ae70b5c26a5dab49b8a20d"
+endmenu
+
+menu "SULU_PLUGIN_CUSTOM"
+	depends on PACKAGE_sulu-builder
+	config SULU_PLUGIN_CUSTOM_ENABLE
+	bool "Enable this plugin"
+	default n
+
+	config SULU_PLUGIN_CUSTOM_NAME
+		depends on SULU_PLUGIN_CUSTOM_ENABLE
+		string "Plugin_name"
+		default "custom_app"
+
+	config SULU_PLUGIN_CUSTOM_URL
+		depends on SULU_PLUGIN_CUSTOM_ENABLE
+		string "URL"
+		default ""
+
+	config SULU_PLUGIN_CUSTOM_VERSION
+		depends on SULU_PLUGIN_CUSTOM_ENABLE
+		string "Version"
+endmenu
+
+menu "SULU_THEME_CUSTOM"
+	depends on PACKAGE_sulu-builder
+	config SULU_THEME_CUSTOM_ENABLE
+	bool "Enable this plugin"
+	default n
+
+	config SULU_THEME_CUSTOM_NAME
+		depends on SULU_THEME_CUSTOM_ENABLE
+		string "Plugin_name"
+		default "plugin_theme_custom"
+
+	config SULU_THEME_CUSTOM_URL
+		depends on SULU_THEME_CUSTOM_ENABLE
+		string "URL"
+		default ""
+
+	config SULU_THEME_CUSTOM_VERSION
+		depends on SULU_THEME_CUSTOM_ENABLE
+		string "Version"
+endmenu
+endmenu
--- a/sulu-builder/Makefile
+++ b/sulu-builder/Makefile
@@ -0,0 +1,154 @@
+#
+# Copyright (C) 2021-2022 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=sulu-builder
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
+PKG_SOURCE_VERSION:=13d88f2ad9193951ff711b89500f57c48fdc9635
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=node-yarn/host # Use host tools
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/${PKG_NAME}
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=Build sulu from source
+	DEPENDS:=+nginx
+	MENU:=1
+endef
+
+define Package/${PKG_NAME}/description
+	SULU-CE ReactJS based Web UI builder.
+endef
+
+define Package/${PKG_NAME}/config
+	source "$(SOURCE)/Config.in"
+endef
+
+# Sulu core and other dependent needs to be updated in Config.in
+SULU_DL_FILE:=sulu-${PKG_VERSION}-${CONFIG_SULU_CORE_VERSION}.tar.gz
+define Download/sulu_core
+  FILE:=$(SULU_DL_FILE)
+  URL:=$(CONFIG_SULU_CORE_URL)
+  PROTO:=git
+  SUBDIR:=core
+  VERSION:=${CONFIG_SULU_CORE_VERSION}
+  HASH:=skip
+endef
+
+ifeq ($(CONFIG_SULU_CORE_ENABLE),y)
+$(eval $(call Download,sulu_core))
+endif
+
+SULU_PLUGIN_LCM_DL:=${CONFIG_SULU_PLUGIN_LCM_NAME}_plugin-${CONFIG_SULU_PLUGIN_LCM_VERSION}.tar.gz
+define Download/sulu_plugin_lcm
+  FILE:=${SULU_PLUGIN_LCM_DL}
+  URL:=${CONFIG_SULU_PLUGIN_LCM_URL}
+  PROTO:=git
+  SUBDIR:=plugins/${CONFIG_SULU_PLUGIN_LCM_NAME}
+  VERSION:=${CONFIG_SULU_PLUGIN_LCM_VERSION}
+  HASH:=skip
+endef
+
+ifeq ($(CONFIG_SULU_PLUGIN_LCM_ENABLE),y)
+$(eval $(call Download,sulu_plugin_lcm))
+endif
+
+SULU_PLUGIN_MULTIAP_DL:=${CONFIG_SULU_PLUGIN_MULTIAP_NAME}_plugin-${CONFIG_SULU_PLUGIN_MULTIAP_VERSION}.tar.gz
+define Download/sulu_plugin_multiap
+  FILE:=${SULU_PLUGIN_MULTIAP_DL}
+  URL:=${CONFIG_SULU_PLUGIN_MULTIAP_URL}
+  PROTO:=git
+  SUBDIR:=plugins/${CONFIG_SULU_PLUGIN_MULTIAP_NAME}
+  VERSION:=${CONFIG_SULU_PLUGIN_MULTIAP_VERSION}
+  HASH:=skip
+endef
+
+ifeq ($(CONFIG_SULU_PLUGIN_MULTIAP_ENABLE),y)
+$(eval $(call Download,sulu_plugin_multiap))
+endif
+
+SULU_THEME_IOPSYS_DL:=${CONFIG_SULU_THEME_IOPSYS_NAME}_plugin-${CONFIG_SULU_THEME_IOPSYS_VERSION}.tar.gz
+define Download/sulu_theme_iopsys
+  FILE:=${SULU_THEME_IOPSYS_DL}
+  URL:=${CONFIG_SULU_THEME_IOPSYS_URL}
+  PROTO:=git
+  SUBDIR:=plugins/${CONFIG_SULU_THEME_IOPSYS_NAME}
+  VERSION:=${CONFIG_SULU_THEME_IOPSYS_VERSION}
+  HASH:=skip
+endef
+
+ifeq ($(CONFIG_SULU_THEME_IOPSYS_ENABLE),y)
+$(eval $(call Download,sulu_theme_iopsys))
+endif
+
+SULU_PLUGIN_CUSTOM_DL:=${CONFIG_SULU_PLUGIN_CUSTOM_NAME}_plugin-${CONFIG_SULU_PLUGIN_CUSTOM_VERSION}.tar.gz
+define Download/sulu_plugin_custom
+  FILE:=${SULU_PLUGIN_CUSTOM_DL}
+  URL:=${CONFIG_SULU_PLUGIN_CUSTOM_URL}
+  PROTO:=git
+  SUBDIR:=plugins/${CONFIG_SULU_PLUGIN_CUSTOM_NAME}
+  VERSION:=${CONFIG_SULU_PLUGIN_CUSTOM_VERSION}
+  HASH:=skip
+endef
+
+ifeq ($(CONFIG_SULU_PLUGIN_CUSTOM_ENABLE),y)
+$(eval $(call Download,sulu_plugin_custom))
+endif
+
+SULU_THEME_CUSTOM_DL:=${CONFIG_SULU_THEME_CUSTOM_NAME}_plugin-${CONFIG_SULU_THEME_CUSTOM_VERSION}.tar.gz
+define Download/sulu_theme_custom
+  FILE:=${SULU_THEME_CUSTOM_DL}
+  URL:=${CONFIG_SULU_THEME_CUSTOM_URL}
+  PROTO:=git
+  SUBDIR:=plugins/${CONFIG_SULU_THEME_CUSTOM_NAME}
+  VERSION:=${CONFIG_SULU_THEME_CUSTOM_VERSION}
+  HASH:=skip
+endef
+
+ifeq ($(CONFIG_SULU_THEME_CUSTOM_ENABLE),y)
+$(eval $(call Download,sulu_theme_custom))
+endif
+
+define Build/Prepare
+	$(Build/Prepare/Default)
+	tar xzf $(DL_DIR)/${SULU_DL_FILE} -C $(PKG_BUILD_DIR)
+ifeq ($(CONFIG_SULU_PLUGIN_LCM_ENABLE),y)
+	tar xzf $(DL_DIR)/${SULU_PLUGIN_LCM_DL} -C $(PKG_BUILD_DIR)
+endif
+ifeq ($(CONFIG_SULU_PLUGIN_MULTIAP_ENABLE),y)
+	tar xzf $(DL_DIR)/${SULU_PLUGIN_MULTIAP_DL} -C $(PKG_BUILD_DIR)
+endif
+ifeq ($(CONFIG_SULU_THEME_IOPSYS_ENABLE),y)
+	tar xzf $(DL_DIR)/${SULU_THEME_IOPSYS_DL} -C $(PKG_BUILD_DIR)
+endif
+ifeq ($(CONFIG_SULU_PLUGIN_CUSTOM_ENABLE),y)
+	tar xzf $(DL_DIR)/${SULU_PLUGIN_CUSTOM_DL} -C $(PKG_BUILD_DIR)
+endif
+ifeq ($(CONFIG_SULU_THEME_CUSTOM_ENABLE),y)
+	tar xzf $(DL_DIR)/${SULU_THEME_CUSTOM_DL} -C $(PKG_BUILD_DIR)
+endif
+endef
+
+define Package/${PKG_NAME}/install
+	$(INSTALL_DIR) $(1)/sulu
+	$(INSTALL_DIR) $(1)/sulu/config
+	$(INSTALL_DIR) $(1)/etc/nginx/
+	$(CP) $(PKG_BUILD_DIR)/build/dist/* $(1)/sulu
+	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/*.json $(1)/sulu/config/
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,${PKG_NAME}))
+
--- a/sulu-builder/files/etc/init.d/sulu
+++ b/sulu-builder/files/etc/init.d/sulu
@@ -0,0 +1,27 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=05
+
+USE_PROCD=1
+
+log() {
+	echo "${@}"|logger -t sulu.init -p debug
+}
+
+start_service() {
+	procd_open_instance sulu
+	# append sulu connection injection
+	procd_close_instance
+
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers()
+{
+	procd_add_config_trigger "config.change" "obuspa" /etc/init.d/sulu reload
+}
--- a/sulu-builder/files/etc/nginx/conf.d/sulu.locations
+++ b/sulu-builder/files/etc/nginx/conf.d/sulu.locations
@@ -0,0 +1,18 @@
+location /config/ {
+	autoindex on;
+	if ($request_method = 'OPTIONS') {
+		add_header 'Access-Control-Allow-Origin' '*';
+		add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+		add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
+		add_header 'Access-Control-Max-Age' 1728000;
+		add_header 'Content-Type' 'text/plain; charset=utf-8';
+		add_header 'Content-Length' 0;
+		return 204;
+	}
+	if ($request_method = 'GET') {
+		add_header 'Access-Control-Allow-Origin' '*' always;
+		add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+		add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
+		add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
+	}
+}
--- a/sulu-builder/files/etc/uci-defaults/90-sulu-set-nginx-conf
+++ b/sulu-builder/files/etc/uci-defaults/90-sulu-set-nginx-conf
@@ -0,0 +1,10 @@
+mkdir -p /tmp/sulu
+
+uci -q get nginx._sulu && exit 0
+
+uci -q set nginx._sulu=server
+uci -q add_list nginx._sulu.listen='8080'
+uci -q add_list nginx._sulu.listen='[::]:8080'
+uci -q set nginx._sulu.root='/sulu'
+uci -q set nginx._sulu.server_name='_sulu'
+uci -q add_list nginx._sulu.include='conf.d/sulu.locations'
--- a/sulu/Makefile
+++ b/sulu/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.10

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=222030dd934438c2340ce751b23840fa4e4848b3
+PKG_SOURCE_VERSION:=13d88f2ad9193951ff711b89500f57c48fdc9635

 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
--- a/swmodd/Makefile
+++ b/swmodd/Makefile
@@ -1,17 +1,16 @@
 #
-# Copyright (C) 2020 IOPSYS
+# Copyright (C) 2022 IOPSYS Software Solutions AB
 #
-# 

 include $(TOPDIR)/rules.mk

 PKG_NAME:=swmodd
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.1.5

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e484557ea7ede6d8ff439081deebd763d4952851
+PKG_SOURCE_VERSION:=2f953ea76b5779a73a540777dfb450982802e4f8
 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
@@ -20,6 +19,9 @@ endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=bbf

+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk

 define Package/swmodd
--- a/swmodd/files/etc/init.d/swmodd
+++ b/swmodd/files/etc/init.d/swmodd
@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common

-START=94
-STOP=10
+START=99
+STOP=01

 USE_PROCD=1
 PROG=/usr/sbin/swmodd
--- a/twamp/Makefile
+++ b/twamp/Makefile
@@ -1,26 +1,22 @@
 #
-# Copyright (C) 2020 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# Copyright (C) 2020-2022 iopsys Software Solutions AB
 #

+
 include $(TOPDIR)/rules.mk

 PKG_NAME:=twamp
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.2.0

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/twamp.git
-PKG_SOURCE_VERSION:=c9b6b0fe35e137e967ccef63a9e1253155a59078
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/twamp-light.git
+PKG_SOURCE_VERSION:=4dfc8609fb0cefaaf9e86b559b1e10488117cf07
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

-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
 PKG_BUILD_DEPENDS:=bbf
@@ -31,12 +27,12 @@ define Package/$(PKG_NAME)
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=TRx69
-  TITLE:=BBF TWAMP/TWAMP Light feature
+  TITLE:=TWAMP Light Client(TR-390)
  DEPENDS:=+libuci +ubox +libubus
 endef

 define Package/$(PKG_NAME)/description
-	BBF TWAMP/TWAMP Light feature
+	TWAMP Client for Performance Measurement from IP Edge to Customer Equipment using TWAMP Light Protocol
 endef

 TARGET_CFLAGS += \
--- a/twamp/files/etc/config/twamp
+++ b/twamp/files/etc/config/twamp
@@ -1,13 +1,11 @@

 config twamp 'twamp'
-	option enable '1'
-	option twamp_light '1'
-	#Log levels: Critical=0, Warning=1, Notice=2, Info=3, Debug=4
-	option log_level '3'
+	option enable '0'
+	#Log levels: Critical=0, Error=1, Warning=2, Notice=3, Info=4, Debug=5
+	option log_level '4'

 config twamp_reflector 'reflector_1'
 	option enable '0'
 	option interface 'wan'
 	option port '862'
 	option max_ttl '1'
-
--- a/twamp/files/etc/firewall.twamp
+++ b/twamp/files/etc/firewall.twamp
@@ -14,7 +14,7 @@ function configure_firewall()
 {
 	local enable port interface

-	config_get enable ${1} enable "0"
+	config_get enable ${1} enable "1"
 	config_get port ${1} port
 	config_get interface ${1} interface
 	if [ "$enable" -eq 0 -o -z "${port}" -o -z "${interface}" ]; then
@@ -27,5 +27,21 @@ function configure_firewall()
 	fi
 }

+function delete_rule()
+{
+        while iptables -w 1 -L zone_${1}_input --line-numbers | grep "TWAMP reflector port" > /dev/null; do
+		iptables -w 1 -D zone_${1}_input $(iptables -w 1 -L zone_${1}_input --line-numbers | grep "TWAMP reflector port" | head -1|awk '{print $1}');
+	done
+}
+
+# Loop through all interfaces and delete the twamp reflector rule from interface's input chain
+config_load network
+config_foreach delete_rule interface
+
 config_load twamp
+config_get twamp_enable twamp enable "0"
+if [ "${twamp_enable}" -eq "0" ]; then
+	exit 0;
+fi
+
 config_foreach configure_firewall twamp_reflector
--- a/twamp/files/etc/init.d/twampd
+++ b/twamp/files/etc/init.d/twampd
@@ -22,6 +22,9 @@ start_service() {
 reload_service() {
        stop
        start
+        [ -f /etc/firewall.twamp ] && {
+                sh /etc/firewall.twamp
+        }
 }

 service_triggers() {
--- a/udpecho/Makefile
+++ b/udpecho/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=udpecho
-PKG_VERSION:=2.0.0
+PKG_VERSION:=2.0.1

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/udpecho.git
-PKG_SOURCE_VERSION:=aeaf8f5862fff7133e6299ac30ab02c8fbb1ff61
+PKG_SOURCE_VERSION:=19a555c2d460db6bdfcfa53742011fbb6a4ca6af
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/urlfilter/Makefile
+++ b/urlfilter/Makefile
@@ -6,14 +6,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=urlfilter
-PKG_VERSION:=1.1.1
+PKG_VERSION:=1.1.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5a64642ac33e629151788b3ff1de920776bcd2ed
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/urlfilter.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_VERSION:=5a64642ac33e629151788b3ff1de920776bcd2ed
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

--- a/urlfilter/files/etc/bbfdm/json/urlfilter.json
+++ b/urlfilter/files/etc/bbfdm/json/urlfilter.json
@@ -0,0 +1,385 @@
+{
+	"json_plugin_version": 1,
+	"Device.{BBF_VENDOR_PREFIX}URLFilter.": {
+		"type": "object",
+		"version": "2.14",
+		"protocols": [
+			"cwmp",
+			"usp"
+		],
+		"access": false,
+		"array": false,
+		"Enable": {
+			"type": "boolean",
+			"version": "2.14",
+			"read": true,
+			"write": true,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "urlfilter",
+						"section": {
+							"name": "globals"
+						},
+						"option": {
+							"name": "enable"
+						}
+					}
+				}
+			]
+		},
+		"GlobalBlacklist": {
+			"type": "boolean",
+			"version": "2.14",
+			"read": true,
+			"write": true,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "urlfilter",
+						"section": {
+							"name": "globals"
+						},
+						"option": {
+							"name": "global_blacklist"
+						}
+					}
+				}
+			]
+		},
+		"BlacklistURL": {
+			"type": "string",
+			"version": "2.14",
+			"read": true,
+			"write": true,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"list": {
+				"datatype": "string"
+			},
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "urlfilter",
+						"section": {
+							"name": "globals"
+						},
+						"list": {
+							"name": "blacklist_url"
+						}
+					}
+				}
+			]
+		},
+		"ProfileNumberOfEntries": {
+			"type": "unsignedInt",
+			"read": true,
+			"write": false,
+			"version": "2.14",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],			
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "urlfilter",
+						"section": {
+							"type": "profile"
+						},
+						"option": {
+							"name": "@Count"
+						}
+					}
+				}
+			]	
+		},
+		"Device.{BBF_VENDOR_PREFIX}URLFilter.Profile.{i}.": {
+			"type": "object",
+			"version": "2.14",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"access": true,
+			"array": true,
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "urlfilter",
+						"section": {
+							"type": "profile"
+						},
+						"dmmapfile": "dmmap_urlfilter_profile"
+					}
+				}
+			],
+			"WhitelistURL": {
+				"type": "string",
+				"version": "2.14",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"list": {
+					"datatype": "string"
+				},
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "profile"
+							},
+							"list": {
+								"name": "whitelist_url"
+							}
+						}
+					}
+				]
+			},
+			"BlacklistURL": {
+				"type": "string",
+				"version": "2.14",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"list": {
+					"datatype": "string"
+				},
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "profile"
+							},
+							"list": {
+								"name": "blacklist_url"
+							}
+						}
+					}
+				]
+			}
+		},
+		"FilterNumberOfEntries": {
+			"type": "unsignedInt",
+			"read": true,
+			"write": false,
+			"version": "2.14",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],			
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "urlfilter",
+						"section": {
+							"type": "filter"
+						},
+						"option": {
+							"name": "@Count"
+						}
+					}
+				}
+			]
+		},
+		"Device.{BBF_VENDOR_PREFIX}URLFilter.Filter.{i}.": {
+			"type": "object",
+			"version": "2.14",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"access": true,
+			"array": true,
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "urlfilter",
+						"section": {
+							"type": "filter"
+						},
+						"dmmapfile": "dmmap_urlfilter_filter"
+					}
+				}
+			],
+			"Enable": {
+				"type": "boolean",
+				"version": "2.14",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "filter"
+							},
+							"option": {
+								"name": "enable"
+							}
+						}
+					}
+				]
+			},
+			"Profile": {
+				"type": "string",
+				"version": "2.14",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "filter"
+							},
+							"option": {
+								"name": "profile"
+							}
+						}
+					}
+				]
+			},
+			"MacAddress": {
+				"type": "string",
+				"version": "2.14",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"list": {
+					"datatype": "string"
+				},
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "filter"
+							},
+							"list": {
+								"name": "macaddr"
+							}
+						}
+					}
+				]
+			},
+			"Day": {
+				"type": "string",
+				"version": "2.14",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"list": {
+					"datatype": "string"
+				},
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "filter"
+							},
+							"list": {
+								"name": "day"
+							}
+						}
+					}
+				]
+			},
+			"StartTime": {
+				"type": "string",
+				"version": "2.14",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "filter"
+							},
+							"option": {
+								"name": "start_time"
+							}
+						}
+					}
+				]
+			},
+			"Duration": {
+				"type": "string",
+				"version": "2.14",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "urlfilter",
+							"section": {
+								"type": "filter"
+							},
+							"option": {
+								"name": "duration"
+							}
+						}
+					}
+				]
+			}
+		}
+	}
+}
+
--- a/usp-js/Makefile
+++ b/usp-js/Makefile
@@ -1,7 +1,12 @@
+#
+# Copyright (C) 2022 IOPSYS
+#
+#
+
 include $(TOPDIR)/rules.mk

 PKG_NAME:=usp-js
-PKG_VERSION:=0.0.1
+PKG_VERSION:=1.0.1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/usp-js.git
@@ -9,26 +14,58 @@ PKG_SOURCE_VERSION:=7e285eb006414f230a3c17acf1b6f4c31c987447
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=node-yarn/host
 include $(INCLUDE_DIR)/package.mk

-define Package/usp-js
+define Package/usp-js/default
  SECTION:=libs
  CATEGORY:=Libraries
  TITLE:=A JS library for USP(TR369) protocol
-  DEPENDS:=+quickjs +quickjs-websocket
 endef

 define Package/usp-js/description
  A JS library to provide USP(TR369) protocol functionality for an usp controller.
 endef

-define Build/Compile
-	cd $(PKG_BUILD_DIR) && npm install @types/node --save-dev && yarn qjs
+define Package/usp-js-quickjs
+  $(Package/usp-js/default)
+  TITLE += (QuickJS)
+  DEPENDS:=+quickjs +quickjs-websocket
+  VARIANT:=quickjs
+  DEFAULT_VARIANT:=1
 endef

-define Package/usp-js/install
+define Package/usp-js-nodejs
+  $(Package/usp-js/default)
+  TITLE += (NodeJS)
+  DEPENDS:=+node
+  VARIANT:=nodejs
+endef
+
+ifeq ($(BUILD_VARIANT),nodejs)
+define Build/Compile
+	cd $(PKG_BUILD_DIR) && yarn install && yarn build
+endef
+else
+define Build/Compile
+	cd $(PKG_BUILD_DIR) && yarn install && yarn qjs
+endef
+endif
+
+define Package/usp-js-quickjs/install
 	$(INSTALL_DIR) $(1)/usr/lib/usp-js
 	$(CP) $(PKG_BUILD_DIR)/qjs/* $(1)/usr/lib/usp-js/
 endef

-$(eval $(call BuildPackage,usp-js))
+define Package/usp-js-nodejs/install
+	$(INSTALL_DIR) $(1)/usr/lib/node_modules/usp-js
+	$(INSTALL_DIR) $(1)/usr/lib/node_modules/usp-js/node_modules
+	$(CP) $(PKG_BUILD_DIR)/node/* $(1)/usr/lib/node_modules/usp-js/
+	$(CP) $(PKG_BUILD_DIR)/node_modules/* $(1)/usr/lib/node_modules/usp-js/node_modules/
+endef
+
+$(eval $(call BuildPackage,usp-js-nodejs))
+$(eval $(call BuildPackage,usp-js-quickjs))
--- a/uspd/Makefile
+++ b/uspd/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=uspd
-PKG_VERSION:=2.2.7
+PKG_VERSION:=2.2.9

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
-PKG_SOURCE_VERSION:=ff39170a3e0595a67763a61ac81b2f99b5bf11d7
+PKG_SOURCE_VERSION:=23f5fab7428eaac3db4d732d80224c3cf581207b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -26,14 +26,14 @@ define Package/uspd/default
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=Datamodel ubus backend
-  DEPENDS:=+libubox +ubus +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
+  DEPENDS:=+USE_GLIBC:librt +libubox +ubus +@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 += +libbbfdm-mbedtls
+  DEPENDS += +PACKAGE_uspd-mbedtls:libbbfdm-mbedtls
  VARIANT:=mbedtls
  DEFAULT_VARIANT:=1
 endef
@@ -41,7 +41,7 @@ endef
 define Package/uspd-openssl
  $(Package/uspd/default)
  TITLE += (openssl)
-  DEPENDS += +libbbfdm-openssl
+  DEPENDS += +PACKAGE_uspd-openssl:libbbfdm-openssl
  CONFLICTS := uspd-mbedtls
  VARIANT:=openssl
 endef
@@ -49,17 +49,29 @@ endef
 define Package/uspd-wolfssl
  $(Package/uspd/default)
  TITLE += (wolfssl)
-  DEPENDS += +libbbfdm-wolfssl
+  DEPENDS += +PACKAGE_uspd-wolfssl:libbbfdm-wolfssl
  CONFLICTS := uspd-mbedtls uspd-openssl
  VARIANT:=wolfssl
 endef

 TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
 	-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)/
--- a/wfadatad/Makefile
+++ b/wfadatad/Makefile
@@ -1,23 +1,23 @@
 #
-# Copyright (C) 2021 IOPSYS Software Solutions AB
+# Copyright (C) 2021-2022 IOPSYS Software Solutions AB
 #

 include $(TOPDIR)/rules.mk

 PKG_NAME:=wfadatad
-PKG_VERSION:=7.0.5
+PKG_VERSION:=2.8.0.1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6548ed2d6aaf957d799188d4ff43894c2dd575cb
+PKG_SOURCE_VERSION:=01fd303670eef525e35c5337c4cf15418588273f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=PROPRIETARY IOPSYS
+
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk
Author	SHA1	Message	Date
vdutta	941ac906f6	sulu-builder: 1.0.0	2022-06-14 17:53:02 +05:30
Amit Kumar	26a3790bbd	qosmngr: updated QoS clasification l3 iptables rule with ethx was not matching this was causing incorrect classification to wrong queue. ebtables rule correction done with ethertype,protocol and port to classify packet for destination queue.	2022-06-09 12:57:03 +05:30
Amin Ben Ramdhane	755442556d	uspd: 2.2.9	2022-06-08 18:12:51 +01:00
Amin Ben Ramdhane	164e9f21c9	bbf: 6.7.3	2022-06-08 18:11:08 +01:00
Grzegorz Sluja	9a5643cf43	dectmngr: Fix scenario when active call hangs up and return to onhold call	2022-06-08 16:34:31 +02:00
vdutta	671e8189c0	urlfilter: 1.1.2	2022-06-08 20:02:36 +05:30
vdutta	c31158a7ad	bbf: 6.7.2	2022-06-08 09:31:41 +05:30
Sukru Senli	9e46a57443	sulu: 1.0.10	2022-06-07 19:59:42 +02:00
vdutta	161cd71da8	bbf: 6.7.1	2022-06-07 21:46:42 +05:30
vdutta	1b6126456b	icwmp: 8.4.14	2022-06-07 20:48:22 +05:30
vdutta	f69864554a	stunc: 1.1.11	2022-06-07 19:10:16 +05:30
vdutta	61a5751e0b	bbf: 6.7.0	2022-06-07 10:41:33 +05:30
Vivek Kumar Dutta	78d3dfec15	Revert "bbf: 7.0.0" This reverts commit `f5ed3a7ff1`	2022-06-07 05:06:51 +00:00
Amin Ben Ramdhane	f5ed3a7ff1	bbf: 7.0.0	2022-06-06 19:37:10 +01:00
Amin Ben Ramdhane	681041b7c3	bbf: compile using cmake instead of autotools	2022-06-06 19:34:43 +01:00
vdutta	264e1daf5c	uspd: 2.2.8	2022-06-06 19:41:31 +05:30
vdutta	c19ee4f050	stunc: 1.1.10	2022-06-06 19:39:00 +05:30
vdutta	d225c215ee	icwmp: 8.4.13	2022-06-06 19:36:03 +05:30
vdutta	adcba33657	bbf: 6.6.45	2022-06-06 19:33:12 +05:30
Jakob Olsson	29ec062b90	map-topology: 2.5.0.2	2022-06-03 17:09:33 +02:00
Grzegorz Sluja	4feecbd438	Update package dectmngr a2fe770 Dectmngr fixes for call waiting and 3way call 0d7d2b3 Improvements for handset status update	2022-06-03 13:27:30 +02:00
Grzegorz Sluja	525f5c11b0	endptmngr: Support call waiting and 3 way call for DECT	2022-06-03 13:26:15 +02:00
Rahul	d9800428c0	Revert "qos: Avoid stats to be reseted on qos reload" This reverts commit `3eb4b07880`.	2022-06-03 14:35:53 +05:30
Jakob Olsson	339ff22025	map-agent: 2.8.0.5	2022-06-03 09:37:07 +02:00
Hemlata Bhatt	4d94374162	evoice : Fixed a bug that some UBUS events not being generated correctly	2022-06-02 16:51:41 +02:00
Jakob Olsson	4b1cc22250	map-agent: 2.8.0.4	2022-06-02 15:16:51 +02:00
Amin Ben Ramdhane	fcdd71177b	bbf: 6.6.44	2022-06-02 13:35:05 +01:00
Jakob Olsson	d100832548	wfadatad: 2.8.0.1	2022-06-02 09:59:56 +02:00
Arun Muthusamy	3eb4b07880	qos: Avoid stats to be reseted on qos reload	2022-06-02 06:13:27 +00:00
Jakob Olsson	6214cbb4e7	map-topology: 2.5.0.1	2022-06-01 11:15:23 +02:00
Jakob Olsson	e183005a9f	map-controller: 2.7.0.1	2022-06-01 10:17:43 +02:00
Jakob Olsson	960d44942c	map-agent: 2.8.0.3	2022-05-31 15:59:04 +02:00
Wenpeng Song	d2aca948fb	evoice: update config file remove /etc/evoice/voicecap	2022-05-31 13:45:51 +00:00
Wenpeng Song	bf9b057ef3	evoice: libvoiceservice CodecProfile update	2022-05-31 13:35:17 +00:00
Wenpeng Song	703105b4cf	evoice: Add service_triggers() in the init script to reload service after uci commit	2022-05-31 13:31:06 +00:00
Yalu Zhang	99dd785dfd	Update package endptmngr and dectmngr dectmngr-3.5.2: Release the call completely when the first handset rejects an incoming call endptmngr: Send CALL_REJECT event to Asterisk when DECT handset rejects the call	2022-05-31 14:59:15 +02:00
Wenpeng Song	9f02022353	evoice: libvoiceservice VoIPProfile update	2022-05-31 10:59:46 +02:00
Jakob Olsson	6bcd934ab3	map-agent: 2.8.0.2	2022-05-31 09:52:29 +02:00
Jakob Olsson	1888c1ead8	map-agent: 2.8.0.1	2022-05-31 09:52:25 +02:00
Sukru Senli	6557ba4cd6	wfadatad: 2.8.0.0 with new license update	2022-05-30 14:40:38 +02:00
Sukru Senli	db998e69e3	map-controller: 2.7.0.0 with new license update	2022-05-30 14:33:32 +02:00
vdutta	e9d563ce03	usp-js: Fix install paths	2022-05-30 17:54:25 +05:30
vdutta	b33a390839	usp-js: Added nodejs variant	2022-05-30 17:21:13 +05:30
Sukru Senli	53f80fbf10	map-agent: 2.8.0.0 with new license update	2022-05-30 13:28:07 +02:00
Sukru Senli	96fc14c22f	map-topology: 2.5.0.0 with new license update	2022-05-30 13:23:58 +02:00
Sukru Senli	476a593656	multi-ap modules licensed BSD-3-Clause	2022-05-30 13:09:53 +02:00
suvendhu	dd9b7a8774	twamp: 1.2.0	2022-05-30 09:23:24 +00:00
Jakob Olsson	3f214bb959	map-agent: 2.7.2.6	2022-05-30 11:02:28 +02:00
Sukru Senli	f02b097ba3	usp-js: add license	2022-05-28 18:38:04 +02:00
Sukru Senli	431d29733d	smwodd: add license	2022-05-28 18:34:26 +02:00
Sukru Senli	352f1d0cbc	ated: remove unused package	2022-05-28 18:13:36 +02:00
Sukru Senli	4fde49b43a	evoice: update PKG_LICENSE	2022-05-28 18:10:05 +02:00
Sukru Senli	a4576e43e9	map-topology: correct license	2022-05-28 18:06:13 +02:00
Sukru Senli	6d7a8e5417	shflags: remove unused package	2022-05-28 17:56:46 +02:00
Sukru Senli	d05c0fa6e3	libmicroxml: remove unused package	2022-05-28 17:54:35 +02:00
Grzegorz Bielski	02b3f1d091	evoice: use hw.board.VoiceDSP	2022-05-27 16:11:28 +02:00
Sukru Senli	759a12b759	sulu: 1.0.9	2022-05-27 15:32:16 +02:00
Sukru Senli	4f7c30f13a	evoice: dependency fixes	2022-05-27 15:13:42 +02:00
Grzegorz Bielski	902b3bb8bc	evoice: 0.2.3	2022-05-27 15:10:19 +02:00
vdutta	ece17326c8	bbf: 6.6.43	2022-05-26 18:54:48 +05:30
Grzegorz Bielski	497d17dafc	evoice: add tones.ini for Mediatek platform	2022-05-26 14:10:50 +02:00
Sukru Senli	36ef73caaa	sulu: 1.0.8	2022-05-25 17:09:06 +02:00
vdutta	6142d82806	bbf: 6.6.42	2022-05-25 20:09:52 +05:30
Jakob Olsson	adf314079b	map-agent: 2.7.2.5	2022-05-25 16:32:19 +02:00
sverma	036e57ac4e	wfadatad: 2.7.0.7	2022-05-25 19:41:07 +05:30
vdutta	f2393cd8f1	icwmp: 8.4.12	2022-05-25 19:39:25 +05:30
Sukru Senli	ae91e016f5	sulu: 1.0.7	2022-05-25 15:33:50 +02:00
vdutta	1adfc0815f	swmodd: 2.1.5	2022-05-25 18:15:27 +05:30
vdutta	acdf50d88d	questd: 5.2.4	2022-05-25 18:08:48 +05:30
vdutta	30804d3556	rulengd: 1.2.7	2022-05-25 16:48:14 +05:30
Jakob Olsson	5307d393f6	ieee1905: 4.9.2	2022-05-25 12:41:29 +02:00
vdutta	75a6c7479c	bbf: 6.6.41	2022-05-24 19:17:51 +05:30
vdutta	8c20ef4ec7	bbf: Heartbeat support	2022-05-24 19:11:06 +05:30
vdutta	98bebf3da1	icwmp: Heartbeat support	2022-05-24 19:09:53 +05:30
Wenpeng Song	4d8d09523e	eVoice: Fix some issues in libvoiceservice for VoiceServices.{i}.SIP.	2022-05-24 08:22:28 +00:00
vdutta	0b5a69bc31	bbf: 6.6.39	2022-05-24 11:57:01 +05:30
vdutta	641f9eaad2	swmodd: 2.1.4	2022-05-24 11:52:14 +05:30
Hemlata Bhatt	269b13e868	Provide UBUS events and objects	2022-05-23 19:51:17 +02:00
nevadita.chatterjee	b96a5d307f	map-topology:2.4.0.5	2022-05-23 16:16:02 +05:30
Sukru Senli	cb25e6708d	sulu: 1.0.6	2022-05-23 11:40:34 +02:00
Sukru Senli	60e3c70e57	sulu: 1.0.5	2022-05-20 15:44:21 +02:00
Jakob Olsson	e0ba2b94dd	map-topology: 2.4.0.4	2022-05-20 13:09:53 +02:00
Grzegorz Bielski	559c1996b9	evoice: update libvoiceservice	2022-05-20 09:49:21 +02:00
vdutta	33d951b0ec	periodicstats: 1.1.3	2022-05-20 10:09:18 +05:30
vdutta	c270d3cf09	icwmp: 8.4.10	2022-05-20 08:40:33 +05:30
Jakob Olsson	00a687cd4a	map-topology: 2.4.0.3	2022-05-19 14:52:38 +02:00
Jakob Olsson	24ecfe7f34	ieee1905: 4.9.1	2022-05-19 14:52:38 +02:00
Jakob Olsson	b5ff544f79	wfadatad: 2.7.0.6	2022-05-19 14:52:38 +02:00
Jakob Olsson	d3153244e4	map-topology: 2.4.0.2	2022-05-19 14:52:38 +02:00
Grzegorz Bielski	2227c01289	evoice: compile libvoiceservice	2022-05-19 12:40:15 +02:00
Piotr Kubik	f0407b8a37	gryphon-led-module: Update toolchains for new arch 'armsfp'	2022-05-19 12:20:15 +02:00
Amin Ben Ramdhane	62935f5016	bbf: 6.6.38	2022-05-18 16:47:26 +01:00
Amin Ben Ramdhane	3b7b6fd627	udpecho: 2.0.1	2022-05-18 16:45:21 +01:00
vdutta	d68a6add62	icwmp: 8.4.9	2022-05-18 21:05:22 +05:30
vdutta	12b6a72a48	stunc: 1.1.9	2022-05-18 20:57:22 +05:30
Jakob Olsson	812fad8c5b	map-agent: 2.7.2.4	2022-05-18 14:54:14 +02:00
Jakob Olsson	0a4f296858	map-agent: multiap: lock operations on backhaul file	2022-05-18 10:32:46 +02:00
Amit KUmar	62d3efd67e	map-topology: per host statistics collection included conntrack netfilter library	2022-05-18 13:54:22 +05:30
Jakob Olsson	e6780b20fb	map: prepend all multiap packages version number with the supported revision	2022-05-17 15:11:40 +02:00
Jakob Olsson	84af7641ec	map-agent: 7.2.3	2022-05-17 15:07:59 +02:00
Amit KUmar	a0195bf457	qosmngr: WRR schdeuling configuration sequence corrected in initialization as first tm initialization then delcfg. porttminit bydefault does queue configuration as SP.	2022-05-17 11:38:59 +00:00
Jakob Olsson	17ba9d0d6f	map-controller: 6.0.22	2022-05-17 13:09:30 +02:00
Grzegorz Bielski	71963c914f	evoice: bring back TARGET_PLATFORM, remove conditionals during install	2022-05-17 12:11:01 +02:00
Grzegorz Bielski	374892c869	evoice: handle Econet and Broadcom targets	2022-05-17 10:38:50 +02:00
Amin Ben Ramdhane	af5a788d3e	bbf: 6.6.37	2022-05-16 20:27:35 +01:00
Andreas Gnau	36f4a69b2e	Update feed [ iopsys ] package [ easy-soc-libs ] ------------------------------------------------------------------------------- * 9d8ca7d rdpa: Fix data types for SDK 5.04L04 * 34d925c libwifi: extend struct wifi_phytype ------------------------------------------------------------------------------- commit 9d8ca7d62108dd4e47ad338b9a7f6fc651b55563 Author: Piotr Kubik <piotr.kubik@iopsys.eu> Date: 2022-05-10 11:44:34 +0200 rdpa: Fix data types for SDK 5.04L04 Base directory -> / libqos/broadcom/include/rdpa/bdmf_data_types.h \| 2 ++ libqos/broadcom/include/rdpa/rdpa_drv.h \| 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ------------------------------------------------------------------------------- commit 34d925c4db0eb581c424bc51333d92999e7401d8 Author: Anjan Chanda <anjan.chanda@iopsys.eu> Date: 2022-05-06 11:09:26 +0200 libwifi: extend struct wifi_phytype Base directory -> / libwifi/VERSION.txt \| 2 +- libwifi/wifi.h \| 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) -------------------------------------------------------------------------------	2022-05-16 21:24:33 +02:00
Piotr Kubik	214bb6939f	endptmngr: Update Broadcom SDK 5.04 version	2022-05-16 19:56:24 +02:00