qosmngr: update queue setup

Update q setup that allows better coverage of q setup specially in
mixed mode scheduling.
Also remove dead code related to stats since that is already taken
care of by qosmngr daemon now.
And lastly, simplify the logic to calculate q precedence.

ated/Makefile

@@ -0,0 +1,78 @@
+#
+# 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))

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.19
+PKG_VERSION:=6.8.9.3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=5278cabfc34ec1a055dc7c3547ac7066df6b78e8
+PKG_SOURCE_VERSION:=6a5a73ecc4ca4a8ca6fa47157d9da719172e07ed
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

dectmngr/Makefile

@@ -14,7 +14,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2f54f0af98d787a6e485bac9ef410d8ea47cf9c5
+PKG_SOURCE_VERSION:=54ebb54162fae9fdd6e327e430cf57aa217c176d
 PKG_MIRROR_HASH:=skip
 endif
 

easy-qos/Makefile

@@ -19,7 +19,7 @@ define Package/easy-qos
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet)
+  DEPENDS:=@TARGET_iopsys_brcm63xx_arm
 endef
 
 define Package/easy-qos/description

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.5.8
+PKG_VERSION:=6.4.44
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0b7292471d89793a050fe44fbc70ea129e7c9291
+PKG_SOURCE_VERSION:=e4f811b7cd2836cdcce5ea0f97f515a317da5bc3
 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
@@ -38,36 +38,26 @@ endef
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
-  TARGET_WIFI_TYPE=BROADCOM
   CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
   TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
-  TARGET_WIFI_TYPE=MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_MAC80211
+  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
 else ifeq ($(CONFIG_TARGET_iopsys_x86),y)
   TARGET_PLATFORM=TEST
-  TARGET_WIFI_TYPE=TEST
   TARGET_CFLAGS +=-DIOPSYS_TEST
 else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
   TARGET_PLATFORM=TEST
-  TARGET_WIFI_TYPE=TEST
   TARGET_CFLAGS +=-DIOPSYS_TEST
-else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
-  TARGET_PLATFORM=ECONET
-  TARGET_WIFI_TYPE=MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_ECONET
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)
   TARGET_PLATFORM=MAC80211
-  TARGET_WIFI_TYPE=MAC80211
   TARGET_CFLAGS +=-DIOPSYS_MAC80211
 endif
 
 export TARGET_PLATFORM
-export TARGET_WIFI_TYPE
 
 subdirs := \
 	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
@@ -97,7 +87,6 @@ MAKE_FLAGS += \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	FPIC="$(FPIC)" \
 	PLATFORM="$(TARGET_PLATFORM)" \
-	WIFI_TYPE="$(TARGET_WIFI_TYPE)" \
 	subdirs="$(subdirs)"
 
 ifeq ($(LOCAL_DEV),1)

easy-soc-libs/ethernet.mk

@@ -2,7 +2,7 @@
 define Package/libethernet
   $(call Package/easy-soc-libs)
   TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_econet:ecnt_api
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig
 endef
 
 define Package/libethernet/config

endptmngr/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=endptmngr
-PKG_VERSION:=0.6
+PKG_VERSION:=0.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:=ab61e54a457beae3a552c09e0bfaad06a32f34ea
+PKG_SOURCE_VERSION:=c099d6b0438f945d91bf3c9718da730a8a52ff27
 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_504040
+export CONFIG_BRCM_SDK_VER_504021
 export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk

evoice/Makefile

@@ -5,23 +5,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=evoice
-PKG_VERSION:=0.2.22
+PKG_VERSION:=0.2.1
 
 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:=7adbb0ebc7c25b3c5607f92db023c00a3ce00218
+PKG_SOURCE_VERSION:=f2477946f9e142d01820b38e32ce98a781e0310e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=bbf
 
 # All config variable that are passed to the make invocation, directly or
 # indirectly. This ensures that the package is rebuilt on config-changes.
@@ -34,10 +31,7 @@ define Package/$(PKG_NAME)
 	SUBMENU:=Telephony
 	TITLE:=Ensemble Voice
 	URL:=
-	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl\
-		+TARGET_iopsys_brcm63xx_arm:bcmkernel\
-		+TARGET_iopsys_econet:kmod-voip_driver\
-		+TARGET_iopsys_econet:voip_app
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +TARGET_iopsys_brcm63xx_arm:bcmkernel +TARGET_iopsys_econet:kmod-voip_driver
 endef
 
 define Package/$(PKG_NAME)/description
@@ -46,54 +40,32 @@ endef
 
 ifeq ($(LOCAL_DEV),1)
 # If you want to build the code from your own local repositiory enable
-# LOCAL_DEV and set LOCAL_DEV_EVOICE_DIR to your own git repository.
+# LOCAL_DEV and change the path below to your own git repository.
 define Build/Prepare
-	@echo "======================================================="
-	@echo "DEVELOPMENT BUILD! rsync $(LOCAL_DEV_EVOICE_DIR) to $(PKG_BUILD_DIR)"
-	@echo "======================================================="
-	rsync -a $(LOCAL_DEV_EVOICE_DIR)/* $(PKG_BUILD_DIR)/
+	rsync -av /swdev/bide/evoice_clean/* $(PKG_BUILD_DIR)/
 endef
 endif
 
-IDIR = $(STAGING_DIR)/usr/include
-TONES_INI_REQUIRED=
-
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 	TARGET_PLATFORM=BROADCOM
-	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
+	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
 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) $(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
+	+$(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
 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/

evoice/files/etc/config/voice

@@ -39,33 +39,51 @@ config SIPNetwork 'Network1'
 	list CodecList '1CodecProfile5'
 	list CodecList '1CodecProfile4'
 
+config Capabilities 'Capabilities'
+	option FacilityActions 'CW_ACTIVE,CFU_ACTIVE'
+
+config CapabilitiesCodec 'Codec1'
+	option Codec 'G.711ALaw'
+
+config CapabilitiesCodec 'Codec2'
+	option Codec 'G.711MuLaw'
+
+config CapabilitiesCodec 'Codec3'
+	option Codec 'G.726'
+
+config CapabilitiesCodec 'Codec4'
+	option Codec 'G.722'
+
+config CapabilitiesCodec 'Codec5'
+	option Codec 'G.729'
+
 config CodecProfile '1CodecProfile1'
 	option Enable '1'
-	option Codec 'G.711ALaw'
+	option Codec 'Codec1'
 	option PacketizationPeriod '20'
 	option SilenceSupression '1'
 
 config CodecProfile '1CodecProfile2'
 	option Enable '1'
-	option Codec 'G.711MuLaw'
+	option Codec 'Codec2'
 	option PacketizationPeriod '20'
 	option SilenceSupression '1'
 
 config CodecProfile '1CodecProfile3'
 	option Enable '1'
-	option Codec 'G.726'
+	option Codec 'Codec3'
 	option PacketizationPeriod '20'
 	option SilenceSupression '0'
 
 config CodecProfile '1CodecProfile4'
 	option Enable '1'
-	option Codec 'G.722'
+	option Codec 'Codec4'
 	option PacketizationPeriod '20'
 	option SilenceSupression '0'
 
 config CodecProfile '1CodecProfile5'
 	option Enable '1'
-	option Codec 'G.729'
+	option Codec 'Codec5'
 	option PacketizationPeriod '20'
 	option SilenceSupression '0'
 
@@ -204,15 +222,15 @@ config NumberingPlan 'NumberingPlan2'
 	option InterDigitTimerStd '2000'
 	option InterDigitTimerOpen '2000'
 	option TerminationDigit ' '
-	list PrefixList '2PrefixInfo1'
-	list PrefixList '2PrefixInfo2'
-	list PrefixList '2PrefixInfo3'
-	list PrefixList '2PrefixInfo4'
-	list PrefixList '2PrefixInfo5'
-	list PrefixList '2PrefixInfo6'
-	list PrefixList '2PrefixInfo7'
-	list PrefixList '2PrefixInfo8'
-	list PrefixList '2PrefixInfo9'
+	list PrefixList '3PrefixInfo1'
+	list PrefixList '3PrefixInfo2'
+	list PrefixList '3PrefixInfo3'
+	list PrefixList '3PrefixInfo4'
+	list PrefixList '3PrefixInfo5'
+	list PrefixList '3PrefixInfo6'
+	list PrefixList '3PrefixInfo7'
+	list PrefixList '3PrefixInfo8'
+	list PrefixList '3PrefixInfo9'
 
 config NumberingPlan 'NumberingPlan3'
 	option MinimumNumberOfDigits '5'
@@ -220,9 +238,9 @@ config NumberingPlan 'NumberingPlan3'
 	option InterDigitTimerStd '2000'
 	option InterDigitTimerOpen '2000'
 	option TerminationDigit '#'
-	list PrefixList '3PrefixInfo1'
+	list PrefixList '4PrefixInfo1'
 
-config PrefixInfo '2PrefixInfo1'
+config PrefixInfo '3PrefixInfo1'
 	option Enable '1'
 	option PrefixRange '*43#'
 	option PrefixMinNumberOfDigits '4'
@@ -232,7 +250,7 @@ config PrefixInfo '2PrefixInfo1'
 	option FacilityAction 'CW_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo2'
+config PrefixInfo '3PrefixInfo2'
 	option Enable '1'
 	option PrefixRange '#43#'
 	option PrefixMinNumberOfDigits '4'
@@ -242,7 +260,7 @@ config PrefixInfo '2PrefixInfo2'
 	option FacilityAction 'CW_DEACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo3'
+config PrefixInfo '3PrefixInfo3'
 	option Enable '1'
 	option PrefixRange '*21*(X+)#'
 	option PrefixMinNumberOfDigits '9'
@@ -252,7 +270,7 @@ config PrefixInfo '2PrefixInfo3'
 	option FacilityAction 'CFU_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo4'
+config PrefixInfo '3PrefixInfo4'
 	option Enable '1'
 	option PrefixRange '#21#'
 	option PrefixMinNumberOfDigits '4'
@@ -262,7 +280,7 @@ config PrefixInfo '2PrefixInfo4'
 	option FacilityAction 'CFU_DEACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo5'
+config PrefixInfo '3PrefixInfo5'
 	option Enable '1'
 	option PrefixRange '*67*(X+)#'
 	option PrefixMinNumberOfDigits '9'
@@ -272,7 +290,7 @@ config PrefixInfo '2PrefixInfo5'
 	option FacilityAction 'CFB_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo6'
+config PrefixInfo '3PrefixInfo6'
 	option Enable '1'
 	option PrefixRange '#67#'
 	option PrefixMinNumberOfDigits '4'
@@ -282,7 +300,7 @@ config PrefixInfo '2PrefixInfo6'
 	option FacilityAction 'CFB_DEACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo7'
+config PrefixInfo '3PrefixInfo7'
 	option Enable '1'
 	option PrefixRange '*61*(X+(*X+)?)#'
 	option PrefixMinNumberOfDigits '15'
@@ -292,7 +310,7 @@ config PrefixInfo '2PrefixInfo7'
 	option FacilityAction 'CFNR_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo8'
+config PrefixInfo '3PrefixInfo8'
 	option Enable '1'
 	option PrefixRange '#61#'
 	option PrefixMinNumberOfDigits '4'
@@ -302,7 +320,7 @@ config PrefixInfo '2PrefixInfo8'
 	option FacilityAction 'CFNR_DEACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo9'
+config PrefixInfo '3PrefixInfo9'
 	option Enable '1'
 	option PrefixRange '*31*'
 	option PrefixMinNumberOfDigits '4'
@@ -312,7 +330,7 @@ config PrefixInfo '2PrefixInfo9'
 	option FacilityAction 'CA_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '3PrefixInfo1'
+config PrefixInfo '4PrefixInfo1'
 	option Enable '1'
 	option PrefixRange '110|112'
 	option PrefixMinNumberOfDigits '7'

evoice/files/etc/evoice/voicecap

@@ -0,0 +1,38 @@
+# 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'
+	

evoice/files/etc/evoice/voicedm

@@ -3,7 +3,6 @@ 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'
@@ -74,13 +73,6 @@ config codecs 'map_codec'
    option ptime 'voice.CodecProfile@.PacketizationPeriod'
    option dtx 'voice.CodecProfile@.SilenceSupression'
 
-config fxsinfo 'map_fxs'
-   option Enable 'voice.FXS@.Enable'
-   option DialType 'voice.FXS@.DialType'
-   option TransmitGain 'voice.FXS@.TransmitGain'
-   option ReceiveGain  'voice.FXS@.ReceiveGain'
-   option EchoCancellationEnable 'voice.FXS@.EchoCancellationEnable'
-
 config extensioninfo 'map_ext'
    option Enable 'voice.Extension@.Enable'
    option Internal_Number_Phone 'voice.Extension@.ExtensionNumber'

evoice/files/etc/init.d/evoice

@@ -5,7 +5,6 @@ STOP=12
 
 USE_PROCD=1
 NAME=evoice
-VOICE_UCI_CONFIG=voice
 
 start_service() {
 	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
@@ -21,6 +20,3 @@ reload_service() {
 	start
 }
 
-service_triggers() {
-	procd_add_reload_trigger $VOICE_UCI_CONFIG
-}

fdtextract/Makefile

@@ -12,7 +12,7 @@ PKG_VERSION:=1.0
 
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/fdtextract.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e3cefda3b26c9aea3021b20725ce7b31b33eebc4
+PKG_SOURCE_VERSION:=0ebaf1e7d1f09318ae75d0f475a25280742b790e
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2

gryphon-led-module/Makefile

@@ -44,17 +44,13 @@ 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.225
+	MODULES_SUBDIR:=lib/modules/4.19.183
 	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"

icwmp/Config_cwmp.in

@@ -0,0 +1,14 @@
+choice
+       prompt "Select ACS sever"
+       default CWMP_ACS_MULTI
+       depends on PACKAGE_icwmp || \
+		   PACKAGE_icwmp-openssl || \
+		   PACKAGE_icwmp-wolfssl || \
+		   PACKAGE_icwmp-mbedtls
+
+config CWMP_ACS_MULTI
+	bool "No specific ACS, follow standard"
+
+config CWMP_ACS_HDM
+	bool "Select HDM as ACS server"
+endchoice

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.5.9
+PKG_VERSION:=8.4.25.1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=5553a890ae29692d8e3c7e1b1734adb0722b020a
+PKG_SOURCE_VERSION:=cbfff1b644efceca0b5c72d062535bc766ca1e54
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -21,8 +21,14 @@ PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_FIXUP:=autoreconf
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_CWMP_ACS_MULTI \
+	CONFIG_CWMP_ACS_HDM \
+	CONFIG_CWMP_DEBUG \
+	CONFIG_CWMP_DEVEL_DEBUG
+
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
 
 define Package/icwmp/default
   SECTION:=utils
@@ -32,6 +38,20 @@ define Package/icwmp/default
   DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml
 endef
 
+define Package/icwmp/config
+	source "$(SOURCE)/Config_cwmp.in"
+endef
+
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE \
+	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""
+
+define Package/icwmp
+  $(Package/icwmp/default)
+  TITLE += (internal)
+  VARIANT:=internal
+endef
+
 define Package/icwmp-openssl
   $(Package/icwmp/default)
   TITLE += (openssl)
@@ -57,15 +77,25 @@ define Package/icwmp-mbedtls
 endef
 
 ifeq ($(BUILD_VARIANT),openssl)
-CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+CONFIGURE_ARGS += --enable-libopenssl
 endif
 
 ifeq ($(BUILD_VARIANT),wolfssl)
-CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
+CONFIGURE_ARGS += --enable-libwolfssl
 endif
 
 ifeq ($(BUILD_VARIANT),mbedtls)
-CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
+CONFIGURE_ARGS += --enable-libmbedtls
+endif
+
+ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
+CONFIGURE_ARGS += \
+	--enable-acs=multi
+endif
+
+ifeq ($(CONFIG_CWMP_ACS_HDM),y)
+CONFIGURE_ARGS += \
+	--enable-acs=hdm
 endif
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
@@ -98,6 +128,7 @@ Package/icwmp-openssl/install = $(Package/icwmp/default/install)
 Package/icwmp-wolfssl/install = $(Package/icwmp/default/install)
 Package/icwmp-mbedtls/install = $(Package/icwmp/default/install)
 
+$(eval $(call BuildPackage,icwmp))
 $(eval $(call BuildPackage,icwmp-openssl))
 $(eval $(call BuildPackage,icwmp-wolfssl))
 $(eval $(call BuildPackage,icwmp-mbedtls))

icwmp/files/etc/config/cwmp

@@ -17,7 +17,6 @@ config acs 'acs'
 config cpe 'cpe'
 	option enable '1'
 	option default_wan_interface 'wan'
-	option default_lan_interface 'lan'
 	option log_to_console 'disable'
 	option log_to_file 'disable'
 	# log_severity: INFO (Default)	

icwmp/files/etc/init.d/icwmpd

@@ -71,206 +71,6 @@ enable_dhcp_option43() {
 	fi
 }
 
-convert_to_hex() {
-	local val=""
-	local optval="${1}"
-	OPTIND=1
-	while getopts ":" opt "-$optval"
-	do
-		temp=$(printf "%X" "'${OPTARG:-:}")
-		val="${val}:${temp}"
-	done
-
-	echo "${val}"
-}
-
-configure_send_op125() {
-	local sendopt="${1}"
-	local intf="${2}"
-	local uci="${3}"
-	local hex_oui=""
-	local hex_serial=""
-	local hex_class=""
-	local oui_len=0
-	local serial_len=0
-	local class_len=0
-
-	if [ "${uci}" = "network" ]; then
-		local opt125="125:00:00:0D:E9"
-	else
-		local opt125="125,00:00:0D:E9"
-	fi
-
-	config_get oui cpe manufacturer_oui ""
-	if [ -z "${oui}" ]; then
-		oui=$(db -q get device.deviceinfo.ManufacturerOUI)
-	fi
-
-	oui=$(echo "${oui}" | tr 'a-f' 'A-F')
-
-	config_get serial cpe serial_number ""
-	if [ -z "${serial}" ]; then
-		serial=$(db -q get device.deviceinfo.SerialNumber)
-	fi
-
-	config_get class cpe product_class ""
-	if [ -z "${class}" ]; then
-		class=$(db -q get device.deviceinfo.ProductClass)
-	fi
-
-	oui_len=$(echo -n "${oui}" | wc -m)
-	serial_len=$(echo -n "${serial}" | wc -m)
-	class_len=$(echo -n "${class}" | wc -m)
-
-	if [ ${oui_len} -eq 0 ] || [ ${serial_len} -eq 0 ]; then
-		return 0
-	fi
-
-	opt125_len=$((oui_len + serial_len + class_len))
-	if [ ${class_len} -gt 0 ]; then
-		opt125_len=$((opt125_len + 6))
-	else
-		opt125_len=$((opt125_len + 4))
-	fi
-
-	hex_opt125_len=$(printf "%X" "${opt125_len}")
-	opt125="${opt125}:${hex_opt125_len}"
-	hex_oui=$(convert_to_hex "${oui}")
-	if [ -z "${hex_oui}" ]; then
-		return 0
-	fi
-
-	hex_oui_len=$(printf "%X" "${oui_len}")
-	if [ "${uci}" = "network" ]; then
-		opt125="${opt125}:01:${hex_oui_len}${hex_oui}"
-	else
-		opt125="${opt125}:04:${hex_oui_len}${hex_oui}"
-	fi
-
-	hex_serial=$(convert_to_hex "${serial}")
-	if [ -z "${hex_serial}" ]; then
-		return 0
-	fi
-
-	hex_serial_len=$(printf "%X" "${serial_len}")
-	if [ "${uci}" = "network" ]; then
-		opt125="${opt125}:02:${hex_serial_len}${hex_serial}"
-	else
-		opt125="${opt125}:05:${hex_serial_len}${hex_serial}"
-	fi
-
-	if [ ${class_len} -gt 0 ]; then
-		hex_class=$(convert_to_hex "${class}")
-		if [ -z "${hex_class}" ]; then
-			return 0
-		fi
-
-		hex_class_len=$(printf "%X" "${class_len}")
-		if [ "${uci}" = "network" ]; then
-			opt125="${opt125}:03:${hex_class_len}${hex_class}"
-		else
-			opt125="${opt125}:06:${hex_class_len}${hex_class}"
-		fi
-	fi
-
-
-	if [ "${uci}" = "network" ]; then
-		new_send_opt="$sendopt $opt125"
-		uci -q set network.$intf.sendopts="$new_send_opt"
-	else
-		uci -q add_list dhcp.$intf.dhcp_option="$opt125"
-	fi
-}
-
-enable_dnsmasq_option125() {
-	local lan="${1}"
-	local send125_present=0
-	local opt125="125,"
-
-	local proto="$(uci -q get dhcp.$lan.dhcpv4)"
-	if [ "${proto}" = "server" ]; then
-		opt_list="$(uci -q get dhcp.$lan.dhcp_option)"
-
-		for sopt in $opt_list; do
-			if [[ "$sopt" == "$opt125"* ]]; then
-				send125_present=1
-				break
-			fi
-		done
-
-		if [ ${send125_present} -eq 0 ]; then
-			configure_send_op125 "" "${lan}" "dhcp"
-			ubus call uci commit '{"config":"dhcp"}'
-		fi
-	fi
-}
-
-enable_disable_dhcp_option125() {
-	local wan="${1}"
-	local action="${2}"
-
-	local reqopts="$(uci -q get network.$wan.reqopts)"
-	local sendopts="$(uci -q get network.$wan.sendopts)"
-	local proto="$(uci -q get network.$wan.proto)"
-	local newreqopts=""
-	local newsendopts=""
-	local req125_present=0
-	local send125_present=0
-	local network_uci_update=0
-	local opt125="125:"
-
-	for ropt in $reqopts; do
-		case $ropt in
-			125) req125_present=1 ;;
-			*) ;;
-		esac
-	done
-
-	for sopt in $sendopts; do
-		if [[ "$sopt" == "$opt125"* ]]; then
-			send125_present=1
-			break
-		fi
-	done
-
-	if [ "${proto}" == "dhcp" ]; then
-		if [ "${action}" == "enable" ]; then
-			if [ ${req125_present} -eq 0 ]; then
-				newreqopts="$reqopts 125"
-				uci -q set network.$wan.reqopts="$newreqopts"
-				network_uci_update=1
-			fi
-
-			if [ ${send125_present} -eq 0 ]; then
-				configure_send_op125 "${sendopts}" "${wan}" "network"
-				network_uci_update=1
-			fi
-		else
-			if [ ${req125_present} -eq 1 ]; then
-				newreqopts=$(echo ${reqopts/125/})
-				uci -q set network.$wan.reqopts="$newreqopts"
-				network_uci_update=1
-			fi
-
-			if [ ${send125_present} -eq 1 ]; then
-				for sopt in $sendopts; do
-					if [[ "$sopt" == "$opt125"* ]]; then
-						newsendopts=$(echo ${sendopts/"${sopt}"/})
-						uci -q set network.$wan.sendopts="$newreqopts"
-						network_uci_update=1
-						break
-					fi
-				done
-			fi
-		fi
-	fi
-
-	if [ ${network_uci_update} -eq 1 ]; then
-		uci commit network
-		ubus call network reload
-	fi
-}
-
 wait_for_resolvfile() {
 	local time=$1
 	local tm=1
@@ -397,21 +197,11 @@ boot() {
 	config_load cwmp
 	config_get dhcp_discovery acs dhcp_discovery "0"
 
-	config_get wan_interface cpe default_wan_interface "wan"
 	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
 		# Set dhcp option 43 if not already configured
+		config_get wan_interface cpe default_wan_interface "wan"
 		enable_dhcp_option43 "${wan_interface}"
 	fi
-
-	config_get lan_interface cpe default_lan_interface ""
-	if [ -n "${lan_interface}" ]; then
-		# Set dhcp_option 125 if not already configured
-		enable_disable_dhcp_option125 "${wan_interface}" "enable"
-		enable_dnsmasq_option125 "${lan_interface}"
-	else
-		# Remove dhcp option 125 if exists
-		enable_disable_dhcp_option125 "${wan_interface}" "disable"
-	fi
 	
 	config_get ssl_capath acs ssl_capath
 

ieee1905/Makefile

@@ -1,16 +1,16 @@
 #
-# Copyright (C) 2021 IOPSYS
+# Copyright (C) 2021-2022 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.10.6
+PKG_VERSION:=4.10.5
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a213ee8c1f2195bbce1756e033e7a774ef4b5d2a
+PKG_SOURCE_VERSION:=287aeb7120b9904d4c481ceb6ba2fa6c73d4f8a2
 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
@@ -70,7 +70,6 @@ define Package/libieee1905/description
 endef
 
 TARGET_CFLAGS += \
-	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE

iop/config

@@ -50,8 +50,6 @@ CONFIG_PACKAGE_wifimngr=y
 
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-agent=m
-CONFIG_PACKAGE_map-controller=m
 CONFIG_PACKAGE_map-topology=y
 CONFIG_PACKAGE_wfadatad-collector=y
 
@@ -117,8 +115,7 @@ CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_atftp=m
 CONFIG_PACKAGE_atftpd=m
 CONFIG_PACKAGE_ddns-scripts=y
-CONFIG_PACKAGE_dnsmasq=y
-CONFIG_PACKAGE_miniupnpd-iptables=y
+CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_nginx=y
@@ -140,7 +137,7 @@ CONFIG_PACKAGE_ip-bridge=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_iptables-legacy=y
+CONFIG_PACKAGE_iptables=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
@@ -165,7 +162,6 @@ CONFIG_PACKAGE_lscpu=y
 CONFIG_PACKAGE_nand-utils=y
 CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
-CONFIG_PACKAGE_procd-ujail=m
 CONFIG_PACKAGE_rpcd=y
 CONFIG_PACKAGE_rpcd-mod-rpcsys=y
 CONFIG_PACKAGE_rpcd-mod-rrdns=y
@@ -289,10 +285,3 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_NOHUP=y
-
-# Use fw3 iptables-based instead of newer nftables-based fw4
-# TODO: for now we cannot build an image with fw3 and luci-app-firewall (i.e. fw3)
-# Enabling luci-app-firewall enables fw4
-# CONFIG_PACKAGE_luci-app-firewall is not set
-CONFIG_PACKAGE_firewall=y
-# CONFIG_PACKAGE_firewall4 is not set

iop/scripts/feeds_update.sh

@@ -2,65 +2,57 @@
 
 function feeds_update {
 
-	developer=0
-	override=1
-	start=$(date -u +'%s')
-	while getopts "n" opt; do
-		case $opt in
-		n)
-			override=0
-			;;
-		esac
-	done
+    developer=0
+    override=1
+    start=$(date -u +'%s');
+    while getopts "n" opt; do
+	case $opt in
+	    n)
+		override=0
+		;;
+	esac
+    done
 
-	git remote -v | grep -qE '(git@|ssh://)' && developer=1
 
-	cp .config .genconfig_config_bak
+    git remote -v | grep -qE '(git@|ssh://)' && developer=1
 
-	#if -d argument is passed, clone feeds with ssh instead of http
-	if [ $developer == 1 ]; then
-		./scripts/feeds update -g
-	else
-		./scripts/feeds update
-	fi
+    cp .config .genconfig_config_bak
+
+    #if -d argument is passed, clone feeds with ssh instead of http
+    if [ $developer == 1 ]; then
+	./scripts/feeds update -g
+    else
+	./scripts/feeds update
+    fi
 	./scripts/feeds update -ai
 
-	# replace core packages with iopsys versions
-	if [ $override == 1 ]; then
+    # replace core packages with iopsys versions
+    if [ $override == 1 ]; then
 		./scripts/feeds install -f -p openwrt_core -a
-	fi
+    fi
 
-	# targets need to be installed explicitly
-	for target in $(ls ./feeds/targets); do
-		rm -f target/linux/$target
-		./scripts/feeds install -p targets $target
-	done
+    # targets need to be installed explicitly
+    for target in $(ls ./feeds/targets)
+    do
+	rm -f target/linux/$target
+	./scripts/feeds install -p targets $target
+    done
 
-	# Workaround for bug in 22.03.0-rc4 where installed target path has been
-	# moved to target/linux/feeds but Config.in and Makefile from installed
-	# targets are not properly included from the new location.
-	# This hack is to be removed once the issues are fixed.
-	# Note that the above block of code might no longer necessary because
-	# targets no longer need to be installed explicitly.
-	echo "Working around installed-target-bug"
-	for f in target/linux/feeds/*; do
-		ln -vsf "feeds/$(basename "$f")" "target/linux/$(basename "$f")"
-	done
+    # install all packages
+    ./scripts/feeds install -a
 
-	# install all packages
-	./scripts/feeds install -a
+    # remove broken symlinks ( for packages that are no longer in the feed )
+    find -L package/feeds -maxdepth 2 -type l -delete
 
-	# remove broken symlinks ( for packages that are no longer in the feed )
-	find -L package/feeds -maxdepth 2 -type l -delete
+    cp .genconfig_config_bak .config
+    make defconfig
 
-	cp .genconfig_config_bak .config
-	make defconfig
+    # record when we last run this script
+    touch tmp/.iop_bootstrap
 
-	# record when we last run this script
-	touch tmp/.iop_bootstrap
-
-	# always return true
-	exit 0
+    # always return true
+    exit 0
 }
 
 register_command "feeds_update" "Update feeds to point to commit hashes from feeds.conf"
+

iop/scripts/genconfig.sh

@@ -13,12 +13,11 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
-	ramips="target/linux/feeds/iopsys-ramips"
-	econet="target/linux/feeds/iopsys-econet"
-	x86="target/linux/feeds/iopsys-x86"
-	armvirt="target/linux/feeds/iopsys-armvirt"
-	mediatek="target/linux/feeds/iopsys-mediatek"
+	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
+	ramips="target/linux/iopsys-ramips"
+	econet="target/linux/iopsys-econet"
+	x86="target/linux/iopsys-x86"
+	armvirt="target/linux/iopsys-armvirt"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -84,8 +83,8 @@ function genconfig {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
-			local targetpath="./target/linux/feeds/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
+			local targetpath="./target/linux/$TARGET"
 			local profiles=
 			local pfound=0
 
@@ -118,11 +117,9 @@ function genconfig {
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -170,14 +167,6 @@ function genconfig {
 		    return
 		fi
 	    done
-
-	    for p in $iopsys_mediatek; do
-		if [ $p == $profile ]; then
-		    target="iopsys_mediatek"
-			target_config_path="$mediatek/config"
-		    return
-		fi
-	    done
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -330,25 +319,19 @@ function genconfig {
 		fi
 
 		# Special handling for targets which use TARGET_DEVICES 
-		case "$target" in
-		iopsys_ramips | iopsys_econet | iopsys_brcm63xx_arm)
-			# This assumes the device name to be unique within one target,
-			# which is a fair assumption to make.
-			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
-			if [ -z "$mk_file" ]; then
-				echo "Error determining subtarget for $target / ${BOARDTYPE}"
-				return 1
-			fi
-			local subtarget="$(basename "${mk_file%.mk}")"
+		if [ "$target" = "iopsys_ramips" ]; then
+			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			;;
-		*)
+		elif [ "$target" = "iopsys_econet" ]; then
+			subtarget="en7562"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-			;;
-		esac
+		fi
 
 		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
 

iop/scripts/genconfig_min.sh

@@ -12,11 +12,11 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
-	ramips="target/linux/feeds/iopsys-ramips"
-	econet="target/linux/feeds/iopsys-econet"
-	x86="target/linux/feeds/iopsys-x86"
-	armvirt="target/linux/feeds/iopsys-armvirt"
+	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
+	ramips="target/linux/iopsys-ramips"
+	econet="target/linux/iopsys-econet"
+	x86="target/linux/iopsys-x86"
+	armvirt="target/linux/iopsys-armvirt"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -82,8 +82,8 @@ function genconfig_min {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
-			local targetpath="./target/linux/feeds/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
+			local targetpath="./target/linux/$TARGET"
 			local profiles=
 			local pfound=0
 
@@ -310,25 +310,19 @@ function genconfig_min {
 		fi
 
 		# Special handling for targets which use TARGET_DEVICES
-		case "$target" in
-		iopsys_ramips | iopsys_econet | iopsys_brcm63xx_arm)
-			# This assumes the device name to be unique within one target,
-			# which is a fair assumption to make.
-			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
-			if [ -z "$mk_file" ]; then
-				echo "Error determining subtarget for $target / ${BOARDTYPE}"
-				return 1
-			fi
-			local subtarget="$(basename "${mk_file%.mk}")"
+		if [ "$target" = "iopsys_ramips" ]; then
+			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			;;
-		*)
+		elif [ "$target" = "iopsys_econet" ]; then
+			subtarget="en7562"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-			;;
-		esac
+		fi
 
 		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
 

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.10.2.3
+PKG_VERSION:=2.9.0.5
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=96a2a26176b9a478953f19bb8f2cb5d246ca3733
+PKG_SOURCE_VERSION:=10f6f6dc3c149ed5de375b971c685f37554c3a64
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -56,7 +56,6 @@ endef
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-Wno-error=deprecated-declarations \
 	-D_GNU_SOURCE
 
 ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)

map-agent/files/etc/init.d/mapagent

@@ -116,7 +116,7 @@ validate_ap_section() {
 	uci_validate_section mapagent $section "${1}" \
 			'ifname:string' \
 			'device:string' \
-			'band:or("2", "5", "6")' \
+			'band:or("2", "5")' \
 			'enabled:bool:true' \
 			'onboarded:bool:false' \
 			'ssid:string' \

map-agent/files/lib/wifi/multiap

@@ -715,8 +715,6 @@ bsta_blacklist_bssid_set() {
 	shift
 	local bssid="$@"
 
-	return
-
 	wpa_cli -i "$ifname" set_network 0 bssid_ignore "$bssid" > /dev/null 2>&1
 	wpa_cli -i "$ifname" save_config > /dev/null 2>&1
 }
@@ -729,8 +727,6 @@ bsta_blacklist_bssid_clear() {
 		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
 	}
 
-	return
-
 	config_load mapagent
 	config_foreach mapagent_blacklist_by_band bsta
 }
@@ -818,6 +814,12 @@ bsta_use_link() {
 	local bsta=$1
 
 	config_foreach mapagent_disable_bk bsta $bsta
+
+	noht=$(iw $bsta info | grep "no HT")
+	[ -n "$noht" ] &&  {
+		logger -t multiap "no HT hit, issue reassoc $bsta"
+		wpa_cli -i $bsta reassoc
+	}
 }
 
 bsta_swap_to_link() {

map-agent/files/lib/wifi/traffic_separation

@@ -24,31 +24,121 @@ EOF
 
 	ts_create() {
 		_net_setup() {
-			local vid=$1
-			local name="vlan${vid}"
-			local br_dev="${AL_BRIDGE/-/_}"
-			local tag=":t"
-			local self_flags="untagged"
+			local name=$1
+			local vid=$2
+			local proto=$3
+			local dev=$4
+			local port_dev=$5
 
 			[ -z "$(uci -q get network.${name})" ] || return
 
-			uci -q set network.${name}="bridge-vlan"
-			uci -q set network.${name}.name="${name}"
-			uci -q set network.${name}.device="$AL_BRIDGE"
-			uci -q set network.${name}.vlan="$vid"
+			local ip_addr="192.168.${vid}.1"
+			local br_dev="${AL_BRIDGE/-/_}"
+			local tag=":t"
 
-			[ "${vid}" = "${PRIMARY_VID}" ] && self_flags="untagged pvid"
-			uci -q set network.${name}.flags="${self_flags}"
-			uci -q set network.${name}.local='1'
+			[ "${vid}" = "${PRIMARY_VID}" ] && {
+				tag=""
+
+				# Global options
+				[ -z "$(uci -q get network.${br_dev}.vlan_filtering)" ] && {
+					uci -q set network.${br_dev}.vlan_filtering=1;
+				}
+
+				uci -q delete network.lan.proto
+				uci -q delete network.lan.ipaddr
+				uci -q delete network.lan.netmask
+				uci -q delete network.lan.ip6assign
+			}
+
+			uci -q set network.${name}="interface"
+			uci -q set network.${name}.device="$dev"
+			uci -q set network.${name}.is_lan="1"
+
+			if [ "$proto" = "static" ] ; then
+				uci -q set network.${name}.proto="static"
+				# TODO vid > 255
+				uci -q set network.${name}.ipaddr="${ip_addr}"
+				uci -q set network.${name}.netmask="255.255.255.0"
+				uci -q set network.${name}.ip6assign '60'
+			else
+				uci -q set network.${name}.proto="dhcp"
+			fi
+
+			uci -q add network bridge-vlan
+			uci -q set network.@bridge-vlan[-1].device="$AL_BRIDGE"
+			uci -q set network.@bridge-vlan[-1].vlan="$vid"
 
 			for port in $(uci -q get network.${br_dev}.ports) ; do
-				uci -q get network.${name}.ports | grep -q "${port}${tag}" && continue
-				uci -q add_list network.${name}.ports="${port}${tag}"
+				echo $port | grep -q eth || continue
+				uci -q add_list network.@bridge-vlan[-1].ports="${port}${tag}"
 			done
 
+			uci -q add_list network.${br_dev}.ports="$port_dev"
+			uci -q add_list network.@bridge-vlan[-1].ports="$port_dev"
+
 			uci -q commit network
 		}
 
+		_dhcp_setup() {
+			local name=$1
+
+			[ -n "$(uci -q get dhcp.${name})" ] && return
+
+			uci -q set dhcp.${name}=dhcp
+			uci -q set dhcp.${name}.interface="${name}"
+			uci -q set dhcp.${name}.start="100"
+			uci -q set dhcp.${name}.limit="150"
+			uci -q set dhcp.${name}.leasetime="1h"
+			uci -q set dhcp.${name}.dhcpv4="server"
+			uci -q set dhcp.${name}.dhcpv6="server"
+			uci -q set dhcp.${name}.ra="server"
+			uci -q set dhcp.${name}.ra_slaac="1"
+			uci -q add_list dhcp.${name}.ra_flags="managed-config"
+			uci -q add_list dhcp.${name}.ra_flags="other-config"
+
+			uci -q commit dhcp
+		}
+
+		_firewall_setup() {
+			local name=$1
+			local network=$1
+			local vid=$2
+			local zone_exist=0
+
+			config_load firewall
+
+			_process_zone() {
+				local section=$1
+				local new_name=$2
+				local name
+
+				config_get name $section name
+
+				[ "$name" == "$new_name" ] && zone_exist=1
+			}
+
+			config_foreach _process_zone zone $name
+
+			[ "$zone_exist" != "0" ] && return
+
+			[ "${vid}" = "${PRIMARY_VID}" ] && {
+				uci -q delete firewall.lan
+			}
+
+			uci -q add firewall zone
+			uci -q set firewall.@zone[-1].name="$name"
+			uci -q add_list firewall.@zone[-1].network="$network"
+			uci -q set firewall.@zone[-1].input='ACCEPT'
+			uci -q set firewall.@zone[-1].output='ACCEPT'
+			uci -q set firewall.@zone[-1].forward='ACCEPT'
+
+			uci -q add firewall forwarding
+			uci -q set firewall.@forwarding[-1].src="$name"
+			uci -q set firewall.@forwarding[-1].dest="wan"
+
+			uci -q commit firewall
+		}
+
 		vid=$1
 
 		[ -n "$vid" ] || {
@@ -58,17 +148,45 @@ EOF
 			exit 1
 		}
 
-                logger -t vlan "setup ts vid $vid"
-                _net_setup ${vid}
+		ip link show sink${vid} 2> /dev/null || {
+			ip link add sink${vid} type veth peer name sink_peer${vid}
+		}
 
-                echo 0 > /proc/pktfwd_dhd/enable
-                echo 0 > /proc/pktfwd_wl/enable
+		ip link set sink${vid} up
+		ip link set sink_peer${vid} up
+
+		proto="dhcp"
+		[ -x "/usr/sbin/mapcontroller" ] && proto="static" ;
+		_net_setup "vlan${vid}" ${vid} ${proto} "sink${vid}" "sink_peer${vid}"
+
+		[ -x "/usr/sbin/mapcontroller" ] && {
+			_dhcp_setup vlan${vid}
+			_firewall_setup vlan${vid} ${vid}
+		}
 	}
 
 	ts_reload() {
-		# TODO check it again
 		local dhcp_reload=$1
 		restart=""
+		# workaround for missing backhaul wifi.ap.* ubus obj's:
+		# iterate in config and setup bh
+#		config_load wireless
+
+# _setup_bh_iface() {
+#			local sec=$1
+#			local iface=$2
+#			local bridge=$3
+
+#			config_get ifname $sec ifname
+
+#			config_get mode $sec mode
+#			config_get multi_ap $sec multi_ap "0"
+#			[ "$mode" = "ap" -a "$multi_ap" = "1" ] && {
+#				ts_create bh $ifname 1 2 br-map
+#			}
+		#}
+
+#		config_foreach _setup_bh_iface wifi-iface
 
 		bridge_verify_vid_mapping() {
 			local section=$1
@@ -113,39 +231,12 @@ EOF
 		#done
 	}
 
-	ts_cleanup() {
-		local al_bridge=$(uci -q get mapagent.agent.al_bridge)
-		restart=""
-
-		[ "$al_brige" = "" ] && al_bridge="br-lan"
-
-		bridge_device_teardown() {
-			local section=$1
-			local bridge=$2
-			config_get device "$section" device
-
-			[ "$bridge" != "$device" ] && continue
-
-			uci -q delete network.$1
-			restart="1"
-		}
-
-		config_load network
-		config_foreach bridge_device_teardown bridge-vlan $al_bridge
-
-		if [ "$restart" = "1" ]; then
-			dbg "trigger network restart"
-			/etc/init.d/network restart
-		fi
-	}
-
 	local func=$1
 	shift
 
 	case "$func" in
 		create) dbg "create $@"; ts_create $@;;
 		reload) dbg "reload $@"; ts_reload $@;;
-		cleanup) dbg "cleanup $@"; ts_cleanup $@;;
 		--help|help) ts_usage;;
 		*) ts_usage; exit 1;;
 	esac

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.11.0.2
+PKG_VERSION:=2.8.0.6
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f74c6625967c6ab7f413a70fe72a876e5757ac22
+PKG_SOURCE_VERSION:=93caf3a7e69e14929d7e99d197a2b0f9e25c78bc
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -38,7 +38,6 @@ define Package/map-controller/config
 endef
 
 TARGET_CFLAGS += \
-	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE

map-controller/files/etc/config/mapcontroller

@@ -6,8 +6,9 @@ config controller 'controller'
 	option enable_bsta_steer '0'
 	option use_bcn_metrics '0'
 	option use_usta_metrics '0'
-	option primary_vid '0'
+	option primary_vid '1'
 	option primary_pcp '0'
+	option enable_ts '0'
 	option allow_bgdfs '0'
 	option channel_plan '0'
 

map-controller/files/etc/init.d/mapcontroller

@@ -40,7 +40,7 @@ validate_ap_section() {
 	local section="$1"
 
 	uci_validate_section mapcontroller $section "${1}" \
-			'band:or("2", "5", "6")' \
+			'band:or("2", "5")' \
 			'ssid:string' \
 			'encryption:or("sae", "sae+aes", "psk2",
 				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.1.3
+PKG_VERSION:=2.5.0.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=01a58d068adea4636e984291f39d7694ea30860c
+PKG_SOURCE_VERSION:=8fedad83542c451c6dd74da30668edc6f50eafe8
 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
@@ -32,7 +32,6 @@ define Package/map-topology
 endef
 
 TARGET_CFLAGS += \
-	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-I$(STAGING_DIR)/usr/include/libnetfilter_conntrack \

map-topology/files/etc/config/hosts

@@ -2,4 +2,4 @@
 config global 'global'
 	option ageing_timer '1440'
 	option reboot_persistent '0'
-	list ifname 'br-lan'
+	option ifname 'br-lan'

map-topology/files/etc/init.d/topologyd

@@ -24,7 +24,8 @@ validate_topology_config() {
 validate_global_section() {
 	uci_validate_section hosts global "global" \
 		'ageing_timer:uinteger' \
-		'reboot_persistent:bool'
+		'reboot_persistent:bool' \
+		'ifname:string'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "hosts" "Validation of global section failed"

mosquitto-auth-shadow/Makefile

@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2022 Genexis B.V.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#   Erik Karlsson - initial implementation
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mosquitto-auth-shadow
-PKG_VERSION:=1.0.0
-
-PKG_MAINTAINER:=Erik Karlsson <erik.karlsson@genexis.eu>
-PKG_LICENSE:=EPL-2.0
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mosquitto-auth-shadow
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=mosquitto - /etc/shadow authentication plugin
-  DEPENDS:=mosquitto
-  USERID:=mosquitto=200:mosquitto=200 mosquitto=200:shadow=11
-endef
-
-define Package/mosquitto-auth-shadow/description
-  Plugin for the mosquitto MQTT message broker that authenticates
-  users using /etc/shadow
-endef
-
-define Package/mosquitto-auth-shadow/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mosquitto_auth_shadow.so $(1)/usr/lib/
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,mosquitto-auth-shadow))

mosquitto-auth-shadow/files/etc/uci-defaults/14_set-shadow-permissions

@@ -1 +0,0 @@
-chown root:shadow /etc/shadow && chmod 0640 /etc/shadow

mosquitto-auth-shadow/src/Makefile

@@ -1,25 +0,0 @@
-#
-# Copyright (c) 2022 Genexis B.V.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#   Erik Karlsson - initial implementation
-#
-
-TARGETS = mosquitto_auth_shadow.so
-
-all: $(TARGETS)
-
-%.pic.o: %.c
-	$(CC) $(CFLAGS) -Wall -Werror -fPIC -c -o $@ $<
-
-mosquitto_auth_shadow.so: mosquitto_auth_shadow.pic.o
-	$(CC) $(LDFLAGS) -shared -o $@ $^
-
-clean:
-	rm -f *.o $(TARGETS)

mosquitto-auth-shadow/src/mosquitto_auth_shadow.c

@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2022 Genexis B.V.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *   Erik Karlsson - initial implementation
- */
-
-#include <string.h>
-#include <shadow.h>
-#include <crypt.h>
-#include <mosquitto.h>
-#include <mosquitto_broker.h>
-#include <mosquitto_plugin.h>
-
-static int basic_auth_callback(int event, void *event_data, void *userdata)
-{
-	struct mosquitto_evt_basic_auth *ed = event_data;
-	struct spwd spbuf, *sp = NULL;
-	char buf[256];
-	struct crypt_data data;
-	char *hash;
-
-	/* Let other plugins or broker decide about anonymous login */
-	if (ed->username == NULL)
-		return MOSQ_ERR_PLUGIN_DEFER;
-
-	getspnam_r(ed->username, &spbuf, buf, sizeof(buf), &sp);
-
-	if (sp == NULL || sp->sp_pwdp == NULL)
-		return MOSQ_ERR_AUTH;
-
-	/* Empty string as hash means password is not required */
-	if (sp->sp_pwdp[0] == 0)
-		return MOSQ_ERR_SUCCESS;
-
-	if (ed->password == NULL)
-		return MOSQ_ERR_AUTH;
-
-	memset(&data, 0, sizeof(data));
-	hash = crypt_r(ed->password, sp->sp_pwdp, &data);
-
-	if (hash == NULL)
-		return MOSQ_ERR_AUTH;
-
-	if (strcmp(hash, sp->sp_pwdp) == 0)
-		return MOSQ_ERR_SUCCESS;
-
-	return MOSQ_ERR_AUTH;
-}
-
-int mosquitto_plugin_version(int supported_version_count,
-			     const int *supported_versions)
-{
-	return 5;
-}
-
-int mosquitto_plugin_init(mosquitto_plugin_id_t *identifier,
-			  void **user_data,
-			  struct mosquitto_opt *opts, int opt_count)
-{
-	*user_data = identifier;
-
-	return mosquitto_callback_register(identifier, MOSQ_EVT_BASIC_AUTH,
-					   basic_auth_callback, NULL, NULL);
-}
-
-int mosquitto_plugin_cleanup(void *user_data,
-			     struct mosquitto_opt *opts, int opt_count)
-{
-	mosquitto_plugin_id_t *identifier = user_data;
-
-	return mosquitto_callback_unregister(identifier, MOSQ_EVT_BASIC_AUTH,
-					     basic_auth_callback, NULL);
-}

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.20
+PKG_VERSION:=5.0.0.16.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_SOURCE_VERSION:=c71da7f9b66f4d7fd240e6eb7078044c6b43b72b
+PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -100,7 +100,6 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
@@ -108,7 +107,6 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/TransferComplete.json $(1)/etc/bbfdm/json/TransferComplete.json
-	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -1,17 +1,30 @@
 config obuspa 'global'
 	option enabled '1'
+	option interface 'loopback'
+	#option ifname 'lo'
 	option debug '1'
 	option log_level '1'
-	option prototrace '1'
-	option db_file '/etc/obuspa/usp.db'
+	option prototrace '0'
+	#option db_file '/etc/obuspa/usp.db'
 	#option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
 	#option trust_cert '/etc/obuspa/rootCA.pem'
 	#option client_cert '/etc/obuspa/client.pem'
 	#option log_dest '/var/log/obuspa'
 
+config localagent 'localagent'
+	option Enable '1'
+
+# Adds Device.LocalAgent.Controller.
+config controller 'localcontroller'
+	option EndpointID 'proto::interop-usp-controller'
+	option Protocol 'MQTT'
+	option Topic '/usp/controller'
+	option mqtt 'localmqtt'
+	option assigned_role_name 'full_access'
+
 # Adds Device.LocalAgent.MTP.
-config mtp 'agent_mtp'
+config mtp
 	option Protocol 'MQTT'
 	option ResponseTopicConfigured '/usp/endpoint'
 	option mqtt 'localmqtt'
@@ -22,30 +35,13 @@ config mqtt 'localmqtt'
 	option BrokerPort '1883'
 	option TransportProtocol 'TCP/IP'
 
-# Adds Device.LocalAgent.Controller.
-config controller 'localcontroller'
-	option EndpointID 'proto::interop-usp-controller'
-	option Protocol 'MQTT'
-	option Topic '/usp/controller'
-	option mqtt 'localmqtt'
-	option assigned_role_name 'full_access'
-
 # Add Device.LocalAgent.Subscription.
-#config subscription 'sub_event'
-#    option ID 'uci-sub-events'
-#    option NotifType 'Event'
-#    list ReferenceList 'Device.Boot!'
-#    list ReferenceList 'Device.LocalAgent.TransferComplete!'
-#    option Persistent 'true'
-#    option controller 'localcontroller'
-
-#config subscription 'sub_op_comp'
-#   option ID 'uci-sub-op_complete'
-#   option NotifType 'OperationComplete'
-#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Download()'
-#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Activate()'
-#   option Persistent 'true'
-#   option controller 'localcontroller'
+config subscription
+	option ID 'default-boot-event-ACS'
+	option NotifType 'Event'
+	option ReferenceList 'Device.Boot!'
+	option Persistent 'true'
+	option controller 'localcontroller'
 
 #config challenge 'admin'
 #	option Description 'Request to get Administrative access'

obuspa/files/etc/uci-defaults/01-fix-upgrade-uci

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-fix_stomp_section() {
-	local encryption
-
-	config_get_bool encryption $1 encryption "1"
-	uci_set obuspa $1 encryption ""
-	uci_set obuspa $1 EnableEncryption "$encryption"
-}
-
-# Copy defaults by the factory to the cwmp UCI user section.
-config_load obuspa
-config_foreach fix_stomp_section stomp
-uci_commit
-
-# No need for commit here, it is done by uci_apply_defaults().

ponmngr/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ponmngr
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -17,12 +17,11 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/ponmngr
 	CATEGORY:=Utilities
-	TITLE:=PON Manager
-	DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet)
+	TITLE:=ponmngr packets manager daemon
 endef
 
 define Package/ponmngr/description
-	Configures PON
+	Configures pon
 endef
 
 #define Build/Prepare
@@ -33,12 +32,7 @@ define Build/Compile
 endef
 
 define Package/ponmngr/install
-	$(CP) ./files/common/* $(1)/
-ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
-	$(CP) ./files/broadcom/* $(1)/
-else ifneq ($(CONFIG_TARGET_iopsys_econet),)
-	$(CP) ./files/airoha/* $(1)/
-endif
+	$(CP) ./files/* $(1)/
 endef
 
 $(eval $(call BuildPackage,ponmngr))

ponmngr/files/airoha/lib/xpon/airoha.sh

@@ -1,25 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-set_serial_number() {
-	vendor_id=$1
-	vssn=$2
-
-	/userfs/bin/omcicfgCmd set sn ${vendor_id}${vssn}
-}
-
-init_xpon() {
-	procd_open_instance ponmgr_cfg
-	procd_set_param command /userfs/bin/ponmgr_cfg
-	procd_close_instance
-	procd_open_instance omci
-	procd_set_param command /userfs/bin/omci
-	procd_close_instance
-}
-
-deinit_xpon() {
-	killall -9 omci 2>/dev/null
-	killall -9 ponmgr_cfg 2>/dev/null
-}
-

ponmngr/files/common/etc/init.d/xpon

@@ -1,38 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=19
-STOP=91
-
-USE_PROCD=1
-
-. /lib/functions.sh
-include /lib/xpon
-
-configure_serial_number() {
-	serial_number="$(uci -q get xpon.ani.serial_number)"
-	if [ ${#serial_number} -eq 12 ]; then
-		vendor_id="${serial_number:0:4}"
-		vssn="${serial_number:4:8}"
-	else
-		macaddr="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
-		vendor_id="IOPS"
-		vssn="${macaddr:4:8}"
-	fi
-
-	set_serial_number $vendor_id $vssn
-}
-
-start_service() {
-	if [ "$(uci -q get xpon.ani.enable)" == "1" ]; then
-		configure_serial_number
-		init_xpon
-	fi
-}
-
-stop_service() {
-	deinit_xpon
-}
-
-service_triggers() {
-	procd_add_reload_trigger "xpon"
-}

ponmngr/files/etc/init.d/xpon

@@ -0,0 +1,23 @@
+#!/bin/sh /etc/rc.common
+
+START=19
+STOP=10
+
+USE_PROCD=1
+
+. /lib/functions.sh
+include /lib/xpon
+
+start_service() {
+	if [ "$(uci -q get xpon.ani.enable)" == "1" ]; then
+		init_xpon
+	fi
+}
+
+stop_service() {
+	deinit_xpon
+}
+
+service_triggers() {
+	procd_add_reload_trigger "xpon"
+}

ponmngr/files/lib/xpon/broadcom.sh

@@ -1,26 +1,18 @@
 #!/bin/sh
 
+USE_PROCD=1
+
 . /lib/functions.sh
 
-set_serial_number() {
-	vendor_id=$1
-	vssn=$2
-
-	vendor_id="$(echo $vendor_id | hexdump -e '4/1 "%02X" "\n"')"
-	vendor_id=${vendor_id:0:8}
-
-	bs /b/c gpon onu_sn={vendor_id=$vendor_id,vendor_specific=$vssn}
-}
-
 init_xpon() {
 	procd_open_instance pon_msgd
 	procd_set_param command bcm_msgd -c gpon
 	procd_close_instance
-
 	procd_open_instance pon_daemon
 	procd_set_param command omcid start -n
 	procd_set_param respawn
 	procd_close_instance
+
 }
 
 deinit_xpon() {

qosmngr/Makefile

@@ -27,7 +27,7 @@ define Package/qosmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=QoS Manager
-  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
+  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
 endef
 
 define Package/qosmngr/description

sulu-builder/Config.in

@@ -1,126 +0,0 @@
-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 "ef0489349703c5c02f435e46cf971b5435eb0141"
-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 "0ee8a4dd07d722d06dd7617d2debf138da6df8b7"
-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

sulu-builder/Makefile

@@ -1,155 +0,0 @@
-#
-# Copyright (C) 2021-2022 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sulu-builder
-PKG_VERSION:=1.0.14
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=90cec082b118a9503fd167bd5363731945a0127c
-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
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/${PKG_NAME}
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=Build sulu from source
-	DEPENDS:=+nginx +mosquitto-auth-shadow
-	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/
-	$(INSTALL_DIR) $(1)/etc/mosquitto/conf.d/
-	$(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}))
-

sulu-builder/files/etc/init.d/sulu

@@ -1,27 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=10
-
-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
-}

sulu-builder/files/etc/mosquitto/conf.d/obuspa.conf

@@ -1,3 +0,0 @@
-listener 1883 127.0.0.1
-allow_anonymous true
-

sulu-builder/files/etc/mosquitto/conf.d/sulu.conf

@@ -1,5 +0,0 @@
-listener 9001
-protocol websockets
-plugin /usr/lib/mosquitto_auth_shadow.so
-require_certificate false
-allow_anonymous false

sulu-builder/files/etc/nginx/conf.d/sulu.locations

@@ -1,18 +0,0 @@
-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;
-	}
-}

sulu-builder/files/etc/uci-defaults/90-sulu-set-nginx-conf

@@ -1,10 +0,0 @@
-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'

sulu/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=1.0.14
+PKG_VERSION:=1.0.12
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=90cec082b118a9503fd167bd5363731945a0127c
+PKG_SOURCE_VERSION:=fc82a32ab3cdcb18dc3aa7b907c62d8bed29b4ff
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@@ -28,7 +28,7 @@ define Package/sulu
 	CATEGORY:=Utilities
 	MENU=1
 	TITLE:=SULU-CE ReactJS based Web UI Package
-	DEPENDS:=+nginx +mosquitto-auth-shadow
+	DEPENDS:=+nginx
 endef
 
 define Package/sulu/description
@@ -39,7 +39,6 @@ define Package/sulu/install
 	$(INSTALL_DIR) $(1)/sulu
 	$(INSTALL_DIR) $(1)/sulu/config
 	$(INSTALL_DIR) $(1)/etc/nginx/
-	$(INSTALL_DIR) $(1)/etc/mosquitto/conf.d/
 	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/sulu
 	$(CP) $(PKG_BUILD_DIR)/config/* $(1)/sulu/config
 	$(CP) ./files/* $(1)/

sulu/files/etc/mosquitto/conf.d/obuspa.conf

@@ -1,3 +0,0 @@
-listener 1883 127.0.0.1
-allow_anonymous true
-

sulu/files/etc/mosquitto/conf.d/sulu.conf

@@ -1,5 +0,0 @@
-listener 9001
-protocol websockets
-plugin /usr/lib/mosquitto_auth_shadow.so
-require_certificate false
-allow_anonymous false

swmodd/Config.in

@@ -0,0 +1,9 @@
+if PACKAGE_swmodd
+
+menu "Configuration"
+
+config SWMOD_HOST_IS_EXECENV
+	bool "Enable host system as execution environment"
+	default n
+endmenu
+endif

swmodd/Makefile

@@ -1,16 +1,17 @@
 #
-# Copyright (C) 2022 IOPSYS Software Solutions AB
+# Copyright (C) 2020 IOPSYS
 #
+# 
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.1.7
+PKG_VERSION:=2.1.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f673871b6689b32d726fe633ace5f75de6d5b99f
+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
@@ -30,29 +31,33 @@ define Package/swmodd
   SUBMENU:=TRx69
   TITLE:= Software Modules Daemon
   DEPENDS:=+libuci +libubox +ubus +libuuid +opkg +libcurl \
-	    +PACKAGE_liblxc:liblxc +cgroupfs-mount \
-	    +@BUSYBOX_CONFIG_BUSYBOX +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT \
-	    +@BUSYBOX_CONFIG_SCRIPT
+	    +PACKAGE_liblxc:liblxc +PACKAGE_liblxc:cgroupfs-mount \
+	    +@BUSYBOX_CONFIG_BUSYBOX +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT
 endef
 
 define Package/swmodd/description
 	Software module daemon to manage software/deployment units using TR181 datamodel.
 endef
 
+define Package/swmodd/config
+	source "$(SOURCE)/Config.in"
+endef
+
 TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
-ifeq ($(CONFIG_PACKAGE_crun),y)
-MAKE_FLAGS += \
-	SWMOD_CRUN="yes"
-endif
-
 ifeq ($(CONFIG_PACKAGE_liblxc),y)
 MAKE_FLAGS += \
 	SWMOD_LXC="yes"
 endif
 
+ifeq ($(CONFIG_SWMOD_HOST_IS_EXECENV),y)
+MAKE_FLAGS += \
+	SWMOD_HOST_IS_EXECENV="yes"
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/swmodd/* $(PKG_BUILD_DIR)/
@@ -63,6 +68,7 @@ define Package/swmodd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_DIR) $(1)/etc/swmod
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/etc/init.d/swmodd $(1)/etc/init.d/swmodd
 	$(INSTALL_BIN) ./files/etc/config/swmodd $(1)/etc/config/swmodd
@@ -74,15 +80,6 @@ ifeq ($(CONFIG_PACKAGE_liblxc),y)
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/templates/lxc-iopsys $(1)/usr/share/lxc/templates/lxc-iopsys
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/opkg_offline.sh $(1)/usr/share/swmodd/opkg_offline
 endif
-ifeq ($(CONFIG_PACKAGE_crun),y)
-	$(INSTALL_DIR) $(1)/etc/swmodd
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/etc/swmodd/run.sh $(1)/etc/swmodd/run.sh
-	$(INSTALL_BIN) ./files/etc/init.d/crun $(1)/etc/init.d/crun
-	$(INSTALL_BIN) ./files/etc/config/crun $(1)/etc/config/crun
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/crun_create $(1)/usr/sbin/crun_create
-	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-bundle-path $(1)/etc/uci-defaults/01-fix-bundle-path
-endif
 endef
 
 $(eval $(call BuildPackage,swmodd))

swmodd/files/etc/config/crun

@@ -1,2 +0,0 @@
-config global global
-	option enable '1'

swmodd/files/etc/config/swmodd

@@ -1,5 +1,4 @@
 config globals 'globals'
-        option enabled '1'
-        option debug '1'
-        option log_level '3'
-        option lan_bridge 'br-lan'
+	option enabled '1'
+	option debug '1'
+	option log_level '3'

swmodd/files/etc/init.d/crun

@@ -1,133 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=01
-
-USE_PROCD=1
-
-log() {
-	echo "${@}"|logger -t crun.init -p info
-}
-
-validate_container_section() {
-	uci_validate_section swmodd du_eu_assoc "${1}" \
-		'name:string' \
-		'type:string' \
-		'autostart:bool:1' \
-		'du_status:string' \
-		'requested_state:string'
-}
-
-is_container_running() {
-	crun list |tail -n +2|grep -wq "^${1}"
-	return $?
-}
-
-configure_crun_container() {
-	local name type autostart du_status requested_state
-	local BRIDGE BUNDLE
-	local RUNNER="/etc/swmodd/run.sh"
-
-	validate_container_section "${1}" || {
-		log "Validation of container section failed"
-		return 0;
-	}
-
-	BUNDLE="${2}"
-	BRIDGE="${3}"
-
-	if [ -z "${name}" ] || [ -z "${type}" ] || [ -z "${du_status}" ]; then
-		return 0;
-	fi
-
-	if [ "${type}" != "crun" ]; then
-		return 0;
-	fi
-
-	if [ ! -d "${BUNDLE:?}/${name:?}" ]; then
-		log "Crun container {${BUNDLE:?}/${name:?}} not available"
-		return 0;
-	fi
-
-	if [ "${du_status}" == "Uninstalling" ] || [ "${du_status}" == "Uninstalled" ]; then
-		ubus call service delete "{\"name\":\"crun\",\"instance\":\"${name}\"}"
-		crun kill --all "${name}" 9
-		${RUNNER} -c -n "${name}"
-		if [ -d "${BUNDLE:?}/${name:?}" ]; then
-			rm -rf "${BUNDLE:?}/${name:?}"
-		fi
-		# Delete the uci config section after uninstall
-		uci_remove swmodd "${1}"
-		log "CRUN container ${name} removed"
-		return 0;
-	fi
-
-	if [ "${du_status}" != "Installed" ]; then
-		return 0;
-	fi
-
-	if [ "${autostart}" -eq 0 ]; then
-		ubus call service delete "{\"name\":\"crun\",\"instance\":\"${name}\"}"
-		# stop the container if not enabled
-		crun kill --all "${name}" 9
-		return 0;
-	fi
-
-	if is_container_running "${name}"; then
-		log "Container [$name] req_status [${requested_state}]"
-		if [ "${requested_state}" == "Idle" ]; then
-			crun pause "${name}"
-		elif [ "${requested_state}" == "Active" ]; then
-			${RUNNER} -u -n "${name}" -b "${BRIDGE}"
-			crun resume "${name}"
-		fi
-	fi
-
-        procd_open_instance "${name}"
-        procd_set_param stdout 1
-        procd_set_param stderr 1
-        procd_set_param command "${RUNNER}"
-        procd_append_param command -b "${BUNDLE}" -n "${name}" -i "${BRIDGE}"
-        procd_set_param respawn
-        procd_close_instance "${name}"
-}
-
-start_service() {
-	local bundle bridge
-
-	# Check if crun present
-	if ! command -v crun >/dev/null 2>&1; then
-		log "CRUN binary not found"
-		return 0;
-	fi
-
-	config_load swmodd
-	config_get bundle globals bundle_root ""
-	config_get bridge globals lan_bridge "br-lan"
-
-	if [ -z "${bundle}" ] || [ -z "${bridge}" ]; then
-		log "Empty bundle path or bridge"
-		return 0;
-	fi
-
-	mkdir -p "${bundle}"
-	config_foreach configure_crun_container du_eu_assoc "${bundle}" "${bridge}"
-	uci_commit
-}
-
-stop_service() {
-	local cid
-
-	cid="$(crun list|tail -n +2 |awk '{printf $1 " "}')"
-	for f in $cid; do
-		crun kill --all "${f}" 9
-	done
-}
-
-reload_service() {
-        start
-}
-
-service_triggers() {
-	procd_add_reload_trigger "crun" "network"
-}

swmodd/files/etc/init.d/swmodd

@@ -12,12 +12,11 @@ validate_globals_section()
 		'enabled:bool:1' \
 		'debug:bool:false' \
 		'log_level:uinteger:1' \
-		'bundle_root:string' \
 		'sock:string'
 }
 
 start_service() {
-	local enabled debug log_level sock bundle_root
+	local enabled debug log_level sock
 
 	# creating fallback shared mount-point
 	mkdir -p /tmp/swmodd_dw
@@ -31,20 +30,17 @@ start_service() {
 
 	[ "${enabled}" -eq 0 ] && return 0
 
-	[ -z "${bundle_root}" ] && return 0
-
-	mkdir -p "${bundle_root}"
 	procd_open_instance swmodd
 	procd_set_param command ${PROG}
 
 	if [ "${debug}" -eq 1 ]; then
 		procd_set_param stdout 1
 		procd_set_param stderr 1
-		procd_append_param command -l "${log_level}"
+		procd_append_param command -l ${log_level}
 	fi
 
 	if [ -f "${sock}" ]; then
-		procd_append_param command -s "${sock}"
+		procd_append_param command -s ${sock}
 	fi
 
 	procd_set_param respawn
@@ -56,14 +52,6 @@ stop_service() {
 }
 
 reload_service() {
-	if ubus list swmodules >/dev/null 2>&1; then
-		ubus -t 20 call swmodules reload
-	else
-		stop
-		start
-	fi
-}
-
-service_triggers() {
-       procd_add_reload_trigger "swmodd"
+	stop
+	start
 }

swmodd/files/etc/swmodd/run.sh

@@ -1,118 +0,0 @@
-#!/bin/sh
-
-VETHNAME=""
-
-log() {
-	echo "${@}"|logger -t crun.runner -p info
-}
-
-if ! command -v crun >/dev/null 2>&1;then
-	log "CRUN binary not present"
-	return 1
-fi
-
-if ! command -v script >/dev/null 2>&1;then
-	log "script not present"
-	return 1
-fi
-
-get_veth_name() {
-	local name
-
-	name="cr$1"
-	VETHNAME="${name:0:15}"
-}
-
-clean_container_network() {
-	local name
-
-	name="${1}"
-	# clean up
-	if ip netns list|grep -qw "${name}"; then
-		get_veth_name "${name}"
-		ip netns del "${name}"
-		ip link delete "${VETHNAME}" type veth peer name eth0
-	fi
-}
-
-setup_container_network() {
-	local name bridge_name
-
-	if [ "$#" -lt 2 ]; then
-		return 0
-	fi
-
-	name="${1}"
-	bridge_name="${2}"
-
-	clean_container_network "${name}"
-	get_veth_name "${name}"
-	# Add a namespace
-	ip netns add "${name}"
-	# Add a veth pair
-	ip link add "${VETHNAME}" type veth peer name eth0 netns "$name"
-	# Make veth on network side up
-	ip netns exec "$name" ip link set dev eth0 up
-	# Create loopback interface
-	ip netns exec "$name" ip link set lo up
-	# Make veth on host side up
-	ip link set dev "${VETHNAME}" up
-	# Link with host bridge
-	brctl addif "${bridge_name}" "${VETHNAME}"
-}
-
-run_container() {
-	local bundle name bridge
-
-	bundle="${1}"
-	name="${2}"
-	bridge="${3}"
-
-	if [ ! -d "${bundle:?}/${name:?}" ]; then
-		log "Bundle does not exists"
-		return 1
-	fi
-
-	setup_container_network "${name}" "${bridge}"
-	
-        script -q -c "crun run -b ${bundle}/${name} ${name}" /dev/null
-}
-
-clean=0
-net_update=0
-while getopts b:n:i:cu options
-do
-	case "${options}" in
-		b) BUNDLE=${OPTARG};;
-		n) NAME=${OPTARG};;
-		i) BRIDGE=${OPTARG};;
-		c) clean=1;;
-		u) net_update=1;;
-		*) log "Invalid options";;
-	esac
-done
-
-if [ -z "${NAME}" ]; then
-	log "Emtpy container name"
-	return 0;
-fi
-
-if [ "$clean" -eq 1 ]; then
-	clean_container_network "${NAME}"
-	return 0;
-fi
-
-if [ -z "${BRIDGE}" ]; then
-	log "Empty bridge name"
-	return 0;
-fi
-
-if [ "${net_update}" -eq 1 ]; then
-	get_veth_name "${NAME}"
-	brctl addif "${BRIDGE}" "${VETHNAME}"
-	return 0;
-fi
-
-if [ -n "${BUNDLE}" ] ; then
-	run_container "${BUNDLE}" "${NAME}" "${BRIDGE}"
-fi

swmodd/files/etc/uci-defaults/01-fix-bundle-path

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-# if bundle_root not define in swmodd, update it with lxc path
-lxc=""
-bundle=""
-
-if [ -f "/etc/lxc/lxc.conf" ]; then
-	lxc=$(cat /etc/lxc/lxc.conf |grep "lxc.lxcpath"| cut -d "=" -f 2)
-fi
-
-config_load swmodd
-config_get bundle globals bundle_root ""
-if [ -z "${bundle}" ] && [ -n "${lxc}" ]; then
-	uci_set swmodd globals bundle_root ${lxc}
-	uci_commit
-elif [ -z "${bundle}" ]; then
-	uci_set swmodd globals bundle_root "/tmp/"
-	uci_commit
-fi

urlfilter/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=urlfilter
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.1.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/urlfilter.git
-PKG_SOURCE_VERSION:=e55a2c2c7c992eb5071e82734bdc8850b71b02e0
+PKG_SOURCE_VERSION:=5a64642ac33e629151788b3ff1de920776bcd2ed
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

usp-js/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usp-js
-PKG_VERSION:=1.0.1
+PKG_VERSION:=0.0.1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/usp-js.git
@@ -17,55 +17,26 @@ 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/default
+define Package/usp-js
   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 Package/usp-js-quickjs
-  $(Package/usp-js/default)
-  TITLE += (QuickJS)
-  DEPENDS:=+quickjs +quickjs-websocket
-  VARIANT:=quickjs
-  DEFAULT_VARIANT:=1
-endef
-
-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
+	cd $(PKG_BUILD_DIR) && npm install @types/node --save-dev && yarn qjs
 endef
-else
-define Build/Compile
-	cd $(PKG_BUILD_DIR) && yarn install && yarn qjs
-endef
-endif
 
-define Package/usp-js-quickjs/install
+define Package/usp-js/install
 	$(INSTALL_DIR) $(1)/usr/lib/usp-js
 	$(CP) $(PKG_BUILD_DIR)/qjs/* $(1)/usr/lib/usp-js/
 endef
 
-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))
+$(eval $(call BuildPackage,usp-js))

wfa-capi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfa-capi
-PKG_VERSION:=1.1.3
+PKG_VERSION:=1.1.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=64d9101c8e4930cbd3fe6ce471fb4cfd2b9b80dc
+PKG_SOURCE_VERSION:=ce29c2d69d0ca96b61f2de5d1ba107c8d31cb5ef
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfa-capi.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

wfadatad/Makefile

@@ -60,7 +60,6 @@ MAKE_FLAGS += DEBUG=1
 endif
 
 TARGET_CFLAGS += \
-	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=14.2.0
+PKG_VERSION:=14.0.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d12e9194fad6cf925ec702bb125c2e6d813db2d0
+PKG_SOURCE_VERSION:=981ce51b2f135926d6e9135772dcd43d73c39b64
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz