map-agent: prints to debug invalid backhaul set

Fix the SIP response code handling and optimization
(cherry picked from commit d70c637aa4)

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.6
+PKG_VERSION:=6.8.7
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=a517b0b29ec8c34b8492b88bc887582e7d55a524
+PKG_SOURCE_VERSION:=28ed108048c4d63bd0dc16dbf37ad52ea60c57b6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.5.4
+PKG_VERSION:=6.4.44
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ab15fa17c9b30ac972db62960d4c2b56c73e4b92
+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:=7d43e471f0ffc4a54eb2ac35eced4b72fca4dafb
+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.8
+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:=de96c32a5bd66b9a4dbf40a54a86d31b4c9116c1
+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

@@ -50,10 +50,10 @@ config CapabilitiesCodec 'Codec2'
 
 config CapabilitiesCodec 'Codec3'
 	option Codec 'G.726'
-	
+
 config CapabilitiesCodec 'Codec4'
 	option Codec 'G.722'
-	
+
 config CapabilitiesCodec 'Codec5'
 	option Codec 'G.729'
 

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'

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
-}

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/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.22
+PKG_VERSION:=8.4.25
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=4d59758b7ba2a6d7710a86df3b52c765f2c68de5
+PKG_SOURCE_VERSION:=cbfff1b644efceca0b5c72d062535bc766ca1e54
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

icwmp/files/etc/icwmpd/update.sh

@@ -1,104 +1,27 @@
 #!/bin/sh
+. /lib/functions.sh
 
 log() {
 	echo "$@" |logger -t cwmp.update -p info
 }
 
 handle_icwmp_update() {
-	local defwan vendorspecinf update
-	local bootup_start
+	local cwmp_enable
+	config_load cwmp
 
-	bootup_start="${1:-0}"
-	update="0"
-	defwan="$(uci -q get cwmp.cpe.default_wan_interface)"
-	vendorspecinf="$(ifstatus "${defwan}" | jsonfilter -e "@.data.vendorspecinf")"
-
-	log "Handling dhcp option value [${vendorspecinf}]"
-	[ -n "$vendorspecinf" ] && {
-		local url old_url
-		local prov_code old_prov_code
-		local min_wait_interval old_min_wait_interval
-		local retry_interval_multiplier old_retry_interval_multiplier
-
-		old_url="$(uci -q get cwmp.acs.dhcp_url)"
-		old_prov_code="$(uci -q get cwmp.cpe.dhcp_provisioning_code)"
-		old_min_wait_interval="$(uci -q get cwmp.acs.dhcp_retry_min_wait_interval)"
-		old_retry_interval_multiplier="$(uci -q get cwmp.acs.dhcp_retry_interval_multiplier)"
-
-		case $vendorspecinf in
-			http://*|https://*)
-					url="${vendorspecinf}"
-				;;
-			*)
-				for optval in $vendorspecinf; do
-				        case $optval in
-				                1=*)
-				                        url="$(echo "$optval" | cut -d"=" -f2-)"
-				                ;;
-				                2=*)
-				                        prov_code="$(echo "$optval" | cut -d"=" -f2-)"
-				                ;;
-				                3=*)
-				                        min_wait_interval="$(echo "$optval" | cut -d"=" -f2-)"
-				                ;;
-				                4=*)
-				                        retry_interval_multiplier="$(echo "$optval" | cut -d"=" -f2-)"
-				                ;;
-				        esac
-				done
-			;;
-		esac
-
-		if [ -n "$url" ]; then
-			if [ "${url}" != "${old_url}" ]; then
-				log "## icwmp url[${old_url}] changed to [${url}]"
-				uci -q set cwmp.acs.dhcp_url="$url"
-				update=1
-			fi
-		fi
-		if [ -n "$prov_code" ]; then
-			if [ "${prov_code}" != "${old_prov_code}" ]; then
-				log "## icwmp prov_code[${old_prov_code}] changed to [${prov_code}]"
-				uci -q set cwmp.cpe.dhcp_provisioning_code="$prov_code"
-				update=1
-			fi
-		fi
-		if [ -n "$min_wait_interval" ]; then
-			if [ "${min_wait_interval}" != "${old_min_wait_interval}" ]; then
-				log "## icwmp min_wait_interval[${old_min_wait_interval}] changed to [${min_wait_interval}]"
-				uci -q set cwmp.acs.dhcp_retry_min_wait_interval="$min_wait_interval"
-				update=1
-			fi
-		fi
-		if [ -n "$retry_interval_multiplier" ]; then
-			if [ "${retry_interval_multiplier}" != "${old_retry_interval_multiplier}" ]; then
-				log "## icwmp retry_interval_multiplier[${old_retry_interval_multiplier}] changed to [${retry_interval_multiplier}]"
-				uci -q set cwmp.acs.dhcp_retry_interval_multiplier="$retry_interval_multiplier"
-				update=1
-			fi
-		fi
-	}
-
-	if [ "${bootup_start}" -eq "1" ]; then
-		# if called at boot up then no need to reload the service, since it will start after
-		uci commit cwmp
+	config_get_bool cwmp_enable cpe enable 1
+	if [ "$cwmp_enable" = "0" ]; then
 		return 0
 	fi
 
-	# In case of update restart icwmp
-	if [ "${update}" -eq "1" ]; then
-		log "CWMP uci changes, reload cwmp with uci commit"
-		ubus call uci commit '{"config":"cwmp"}'
-	else
-		status="$(ubus call tr069 status |jsonfilter -qe '@.last_session.status')"
-		if [ "$status" = "failure" ] || [ "$status" = "" ]; then
-			log "Trigger out of bound inform, since last inform status was failure"
-			ubus -t 10 call tr069 inform >/dev/null 2>&1
-			# Handle timeout or tr069 object not found
-			if [ "$?" -eq 7 ] || [ "$?" -eq 4 ]; then
-				log "Restarting icwmp tr069 object"
-				/etc/init.d/icwmpd restart
-			fi
+	status="$(ubus call tr069 status |jsonfilter -qe '@.last_session.status')"
+	if [ "$status" != "running" ]; then
+		log "Trigger out of bound inform, since last inform status was failure"
+		ubus -t 10 call tr069 inform >/dev/null 2>&1
+		# Handle timeout or tr069 object not found
+		if [ "$?" -eq 7 ] || [ "$?" -eq 4 ]; then
+			log "Restarting icwmp tr069 object"
+			/etc/init.d/icwmpd restart
 		fi
 	fi
 }

icwmp/files/etc/init.d/icwmpd

@@ -198,7 +198,6 @@ boot() {
 		# Set dhcp option 43 if not already configured
 		config_get wan_interface cpe default_wan_interface "wan"
 		enable_dhcp_option43 "${wan_interface}"
-		/etc/icwmpd/update.sh 1
 	fi
 	
 	config_get ssl_capath acs ssl_capath
@@ -212,14 +211,11 @@ boot() {
 
 start_service() {
 	local enable_cwmp
-	local wan_interface
 
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
-	config_get wan_interface cpe default_wan_interface "wan"
 
-	if [ "$enable_cwmp" = "0" ] || [ "$enable_cwmp" = "false" ]; then
-		log "CWMP is not enabled"
+	if [ "$enable_cwmp" = "0" ]; then
 		return 0
 	fi
 
@@ -252,9 +248,20 @@ service_stopped()
 }
 
 reload_service() {
-	log "Reloading CWMP client"
-	ubus -t 1 call tr069 command '{"command":"reload"}'
-	if [ "$?" -ne "0" ]; then
+	config_load cwmp
+	config_get_bool enable_cwmp cpe enable 1
+
+	if [ "$enable_cwmp" = "0" ]; then
+		stop
+		return 0
+	fi
+
+	status="$(ubus -t 1 call tr069 status |jsonfilter -qe '@.cwmp.status')"
+	if [ "$status" = "up" ]; then
+		ubus -t 1 call tr069 command '{"command":"reload"}'
+	fi
+
+	if [ "$status" = "init" ] || [ "$?" -ne "0" ]; then
 		log "Restarting CWMP client"
 		stop
 		start

icwmp/files/etc/uci-defaults/85-cwmp-set-userid

@@ -1,7 +1,11 @@
+#!/bin/sh
+
+. /lib/functions.sh
 # Copy defaults by the factory to the cwmp UCI user section.
+config_load cwmp
 
 # Get Manufacturer OUI.
-oui=$(uci -q get cwmp.cpe.manufacturer_oui)
+config_get oui cpe manufacturer_oui ""
 if [ -z "${oui}" ]; then
 	oui=$(db -q get device.deviceinfo.ManufacturerOUI)
 fi
@@ -9,24 +13,29 @@ fi
 oui=$(echo "${oui}" | tr 'a-f' 'A-F')
 
 # Get system serial number.
-serial=$(uci -q get cwmp.cpe.serial_number)
+config_get serial cpe serial_number ""
 if [ -z "${serial}" ]; then
 	serial=$(db -q get device.deviceinfo.SerialNumber)
 fi
 
 # Get userid values
-acs_userid=$(uci -q get cwmp.acs.userid)
-cpe_userid=$(uci -q get cwmp.cpe.userid)
+config_get acs_userid acs userid ""
+config_get cpe_userid cpe userid ""
 
 # Only set if they are empty
-if [ -z "$acs_userid" ]
-then
+if [ -z "${acs_userid}" ]; then
     uci -q set cwmp.acs.userid="${oui}-${serial}"
 fi
 
-if [ -z "$cpe_userid" ]
-then
+if [ -z "${cpe_userid}" ]; then
     uci -q set cwmp.cpe.userid="${oui}-${serial}"
 fi
 
+# Fix the cwmp.cpe.enable parameter
+# set default to 1 if not defined
+config_get enable_cwmp cpe enable ""
+if [ -z "${enable_cwmp}" ]; then
+    uci -q set cwmp.cpe.enable="1"
+fi
+
 # No need for commit here, it is done by uci_apply_defaults().

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.9.8
+PKG_VERSION:=4.10.3
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f546ee76b46d0b3288a8d6da5761f33bcddccfc0
+PKG_SOURCE_VERSION:=3781ec6784f4186a6b7e93c83dcccbbf63ebe465
 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

ieee1905/files/etc/uci-defaults/30-set-ieee1905-al-macaddr

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+
+BMAC=$(db -q get hw.board.basemac)
+BMAC=${BMAC//:/}
+BMAC=${BMAC// /}
+BMAC=$(printf "%12.12X" $((0x$BMAC)))
+
+[ "$BMAC" == "" ] && exit 1
+
+LMAC=$((0x$BMAC & 0xfeffffffffff))
+LMAC=$(($LMAC | 0x020000000000))
+LMAC=$(printf "%12.12X" $LMAC)
+LMAC=$(echo $LMAC | sed -e 's/[0-9A-F]\{2\}/&:/g' -e 's/:$//')
+
+mac=$(uci -q get ieee1905.ieee1905.macaddress)
+
+[ "$mac" != "" ] && exit 0
+
+uci set ieee1905.ieee1905.macaddress="$LMAC"
+uci commit ieee1905
+

iop/config

@@ -50,8 +50,6 @@ CONFIG_PACKAGE_wifimngr=y
 
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-agent=y
-CONFIG_PACKAGE_map-controller=y
 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
@@ -136,10 +133,11 @@ CONFIG_LIBCURL_CRYPTO_AUTH=y
 # CONFIG_LIBCURL_MBEDTLS is not set
 CONFIG_LIBCURL_OPENSSL=y
 CONFIG_PACKAGE_ethtool=y
+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
@@ -164,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
@@ -288,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,11 +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"
+	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
@@ -83,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
 
@@ -328,7 +328,6 @@ function genconfig {
 			subtarget="en7562"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config

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
 
@@ -319,7 +319,6 @@ function genconfig_min {
 			subtarget="en7562"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.9.0.2
+PKG_VERSION:=2.9.0.4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=e2d427d44bf4e418487fa5fe6be4838ca448a92f
+PKG_SOURCE_VERSION:=4f06e11fc17f6c462960cbd8a9835b5a16b53e9c
 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() {
@@ -862,6 +864,8 @@ set_uplink() {
 
 	config_load mapagent
 
+	ubus send map.agent '{"action":"unset", "type":"'$type'", "ifname":"'$ifname'", "macaddr":"'$hwaddr'"}'
+
 	island_prevention="$(uci -q get mapagent.agent.island_prevention)"
 
 	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
@@ -881,11 +885,13 @@ unset_uplink() {
 		ubus call map.agent toggle_fh '{"enable":false, "prevent_island":true, "ifname":"all"}'
 	fi
 
+
 	(
 		flock -x 200
 		json_load "$(cat $MAPFILE)"
 		json_get_var bk_type type
 		json_cleanup
+		ubus send map.agent '{"action":"unset", "type":"'$type'", "bk_type":"'$bk_type'"}'
 
 		[ "$type" = "$bk_type" ] && rm -f "$MAPFILE" > /dev/null 2>&1
 	) 200>/var/lock/map.backhaul.lock

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.10.0.2
+PKG_VERSION:=2.8.0.5
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=4f638fc1663a75385ad3d8ac4efcf5b940ac52ae
+PKG_SOURCE_VERSION:=da283946e96e2d8b982b0b0518fa84102f0ef4df
 
 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/init.d/mapcontroller

@@ -39,7 +39,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.0.6
+PKG_VERSION:=2.5.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=8097afd9091e2da048a935b91d7c3f1069a0e1bf
+PKG_SOURCE_VERSION:=601f5fdc8b4051811593efa714954d4cb3d7b7dd
 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 \

stunc/Makefile

@@ -64,16 +64,19 @@ 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

swmodd/Makefile

@@ -1,6 +1,7 @@
 #
-# Copyright (C) 2022 IOPSYS Software Solutions AB
+# Copyright (C) 2020 IOPSYS
 #
+# 
 
 include $(TOPDIR)/rules.mk
 

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))

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.0.8
+PKG_VERSION:=14.0.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=af1c9ae51544532bc535814de63f9a55d2388792
+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