obuspa: use hotplug instead of procd interface trigger

ated/Makefile

@@ -24,7 +24,6 @@ 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)
 

bbf/Makefile

@@ -1,18 +1,17 @@
 #
-# Copyright (C) 2021 IOPSYS
+# Copyright (C) 2019 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=3.7.9
+PKG_VERSION:=3.2.7
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3b44e4430ad4ca5735647dd69bc30d0e56218850
+PKG_SOURCE_VERSION:=ae196c54590dc343db14a70879f21ef88203c426
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -33,7 +32,7 @@ define Package/libbbfdm
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libmbedtls +libcurl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libmbedtls
 endef
 
 define Package/libbbfdm/config

bulkdata/src/datamodel.c

@@ -454,7 +454,7 @@ static int set_BulkDataProfile_Alias(char *refparam, struct dmctx *ctx, void *da
 
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 64, NULL, NULL))
+			if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -476,7 +476,7 @@ static int set_BulkDataProfile_Name(char *refparam, struct dmctx *ctx, void *dat
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 255, NULL, NULL))
+			if (dm_validate_string(value, -1, 255, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -520,7 +520,7 @@ static int set_BulkDataProfile_Protocol(char *refparam, struct dmctx *ctx, void
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, -1, BulkDataProtocols, NULL))
+			if (dm_validate_string(value, -1, -1, BulkDataProtocols, 3, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -546,7 +546,7 @@ static int set_BulkDataProfile_EncodingType(char *refparam, struct dmctx *ctx, v
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, -1, EncodingTypes, NULL))
+			if (dm_validate_string(value, -1, -1, EncodingTypes, 4, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -646,7 +646,7 @@ static int set_BulkDataProfileParameter_Name(char *refparam, struct dmctx *ctx,
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 64, NULL, NULL))
+			if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -667,7 +667,7 @@ static int set_BulkDataProfileParameter_Reference(char *refparam, struct dmctx *
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 256, NULL, NULL))
+			if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -688,7 +688,7 @@ static int set_BulkDataProfileCSVEncoding_FieldSeparator(char *refparam, struct
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, -1, NULL, NULL))
+			if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -709,7 +709,7 @@ static int set_BulkDataProfileCSVEncoding_RowSeparator(char *refparam, struct dm
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, -1, NULL, NULL))
+			if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -731,7 +731,7 @@ static int set_BulkDataProfileCSVEncoding_EscapeCharacter(char *refparam, struct
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, -1, NULL, NULL))
+			if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -757,7 +757,7 @@ static int set_BulkDataProfileCSVEncoding_ReportFormat(char *refparam, struct dm
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, -1, CSVReportFormat, NULL))
+			if (dm_validate_string(value, -1, -1, CSVReportFormat, 2, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -787,7 +787,7 @@ static int set_BulkDataProfileCSVEncoding_RowTimestamp(char *refparam, struct dm
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, -1, RowTimestamp, NULL))
+			if (dm_validate_string(value, -1, -1, RowTimestamp, 3, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -817,7 +817,7 @@ static int set_BulkDataProfileJSONEncoding_ReportFormat(char *refparam, struct d
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, -1, JSONReportFormat, NULL))
+			if (dm_validate_string(value, -1, -1, JSONReportFormat, 2, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -847,7 +847,7 @@ static int set_BulkDataProfileJSONEncoding_ReportTimestamp(char *refparam, struc
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, -1, RowTimestamp, NULL))
+			if (dm_validate_string(value, -1, -1, RowTimestamp, 3, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -873,7 +873,7 @@ static int set_BulkDataProfileHTTP_URL(char *refparam, struct dmctx *ctx, void *
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 1024, NULL, NULL))
+			if (dm_validate_string(value, -1, 1024, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -894,7 +894,7 @@ static int set_BulkDataProfileHTTP_Username(char *refparam, struct dmctx *ctx, v
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 256, NULL, NULL))
+			if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -915,7 +915,7 @@ static int set_BulkDataProfileHTTP_Password(char *refparam, struct dmctx *ctx, v
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 256, NULL, NULL))
+			if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -948,7 +948,7 @@ static int set_BulkDataProfileHTTP_Compression(char *refparam, struct dmctx *ctx
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, -1, NULL, NULL))
+			if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -984,7 +984,7 @@ static int set_BulkDataProfileHTTP_Method(char *refparam, struct dmctx *ctx, voi
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, -1, NULL, NULL))
+			if (dm_validate_string(value, -1, -1, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -1140,7 +1140,7 @@ static int set_BulkDataProfileHTTPRequestURIParameter_Name(char *refparam, struc
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 64, NULL, NULL))
+			if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -1161,7 +1161,7 @@ static int set_BulkDataProfileHTTPRequestURIParameter_Reference(char *refparam,
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 256, NULL, NULL))
+			if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:

crun/Makefile

@@ -1,50 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=crun
-PKG_VERSION:=0.17
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/containers/crun.git
-PKG_SOURCE_VERSION:=0e9229ae34caaebcb86f1fde18de3acaf18c6d9a
-
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/crun
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+yajl +argp-standalone +libcap +libseccomp
-  TITLE:=A fast and low-memory footprint OCI Container Runtime fully written in C
-endef
-
-define Package/crun/description
-  crun conforms to the OCI Container Runtime specifications
-endef
-
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-TARGET_LDFLAGS += -largp
-
-MAKE_FLAGS := \
-	$(TARGET_CONFIGURE_OPTS) \
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)"
-	
-define Build/Configure
-	cd $(PKG_BUILD_DIR)/ && sh autogen.sh && ./configure
-endef	
-
-define Package/crun/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/crun $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,crun))

crun/patches/01-fix-for-openwrt-and-kernel-4-19.patch

@@ -1,217 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 5e9f2f9..5ed99bd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -52,16 +52,6 @@ AS_IF([test "x$enable_seccomp" != "xno"], [
- 	])
- ])
- 
--dnl libsystemd
--AC_ARG_ENABLE([systemd],
--	AS_HELP_STRING([--disable-systemd], [Ignore systemd and disable support]))
--AS_IF([test "x$enable_systemd" != "xno"], [
--	AC_CHECK_HEADERS([systemd/sd-bus.h], [], [AC_MSG_ERROR([*** Missing libsystemd headers])])
--	AS_IF([test "$ac_cv_header_systemd_sd_bus_h" = "yes"], [
--		AC_SEARCH_LIBS(sd_bus_match_signal_async, [systemd], [AC_DEFINE([HAVE_SYSTEMD], 1, [Define if libsystemd is available])], [AC_MSG_ERROR([*** Failed to find libsystemd])])
--	])
--])
--
- dnl ebpf
- AC_ARG_ENABLE([bpf],
- 	AS_HELP_STRING([--disable-bpf], [Ignore eBPF and disable support]))
-@@ -114,26 +104,6 @@ AS_IF([test "x$enable_criu" != "xno"], [
- FOUND_LIBS=$LIBS
- LIBS=""
- 
--AC_MSG_CHECKING([for new mount API (fsconfig)])
--AC_COMPILE_IFELSE(
--	[AC_LANG_SOURCE([[
--			#include <linux/mount.h>
--			int cmd = FSCONFIG_CMD_CREATE;
--		]])],
--		[AC_MSG_RESULT(yes)
--		 AC_DEFINE([HAVE_FSCONFIG_CMD_CREATE], 1, [Define if FSCONFIG_CMD_CREATE is available])],
--		[AC_MSG_RESULT(no)])
--
--AC_MSG_CHECKING([for seccomp notify API])
--AC_COMPILE_IFELSE(
--	[AC_LANG_SOURCE([[
--			#include <linux/seccomp.h>
--			int cmd = SECCOMP_GET_NOTIF_SIZES;
--		]])],
--		[AC_MSG_RESULT(yes)
--		 AC_DEFINE([HAVE_SECCOMP_GET_NOTIF_SIZES], 1, [Define if SECCOMP_GET_NOTIF_SIZES is available])],
--		[AC_MSG_RESULT(no)])
--
- AC_DEFINE([LIBCRUN_PUBLIC], [__attribute__((visibility("default"))) extern], [LIBCRUN_PUBLIC])
- AC_SUBST([FOUND_LIBS])
- AC_SUBST([CRUN_LDFLAGS])
-diff --git a/src/libcrun/cgroup.c b/src/libcrun/cgroup.c
-index 29c1f7a..77dc441 100644
---- a/src/libcrun/cgroup.c
-+++ b/src/libcrun/cgroup.c
-@@ -575,23 +575,6 @@ get_file_owner (const char *path, uid_t *uid, gid_t *gid)
-   struct stat st;
-   int ret;
- 
--#ifdef HAVE_STATX
--  struct statx stx;
--
--  ret = statx (AT_FDCWD, path, AT_STATX_DONT_SYNC, STATX_UID | STATX_GID, &stx);
--  if (UNLIKELY (ret < 0))
--    {
--      if (errno == ENOSYS || errno == EINVAL)
--        goto fallback;
--
--      return ret;
--    }
--  *uid = stx.stx_uid;
--  *gid = stx.stx_gid;
--  return ret;
--
--fallback:
--#endif
-   ret = stat (path, &st);
-   if (UNLIKELY (ret < 0))
-     return ret;
-diff --git a/src/libcrun/error.h b/src/libcrun/error.h
-index aa3f3aa..477a2fe 100644
---- a/src/libcrun/error.h
-+++ b/src/libcrun/error.h
-@@ -18,9 +18,6 @@
- #ifndef ERROR_H
- #define ERROR_H
- #include <config.h>
--#ifdef HAVE_ERROR_H
--#  include <error.h>
--#else
- #  define error(status, errno, fmt, ...)                      \
-     do                                                        \
-       {                                                       \
-@@ -35,7 +32,6 @@
-           exit (status);                                      \
-       }                                                       \
-     while (0)
--#endif
- #include <stdlib.h>
- #include <stdio.h>
- #include <stdbool.h>
-diff --git a/src/libcrun/utils.c b/src/libcrun/utils.c
-index cbde9b6..5ef7f5f 100644
---- a/src/libcrun/utils.c
-+++ b/src/libcrun/utils.c
-@@ -164,22 +164,6 @@ get_file_type_fd (int fd, mode_t *mode)
-   struct stat st;
-   int ret;
- 
--#ifdef HAVE_STATX
--  struct statx stx;
--
--  ret = statx (fd, "", AT_EMPTY_PATH | AT_STATX_DONT_SYNC, STATX_TYPE, &stx);
--  if (UNLIKELY (ret < 0))
--    {
--      if (errno == ENOSYS || errno == EINVAL)
--        goto fallback;
--
--      return ret;
--    }
--  *mode = stx.stx_mode;
--  return ret;
--
--fallback:
--#endif
-   ret = fstat (fd, &st);
-   *mode = st.st_mode;
-   return ret;
-@@ -191,22 +175,6 @@ get_file_type_at (int dirfd, mode_t *mode, bool nofollow, const char *path)
-   struct stat st;
-   int ret;
- 
--#ifdef HAVE_STATX
--  struct statx stx;
--
--  ret = statx (dirfd, path, (nofollow ? AT_SYMLINK_NOFOLLOW : 0) | AT_STATX_DONT_SYNC, STATX_TYPE, &stx);
--  if (UNLIKELY (ret < 0))
--    {
--      if (errno == ENOSYS || errno == EINVAL)
--        goto fallback;
--
--      return ret;
--    }
--  *mode = stx.stx_mode;
--  return ret;
--
--fallback:
--#endif
-   ret = fstatat (dirfd, path, &st, nofollow ? AT_SYMLINK_NOFOLLOW : 0);
-   *mode = st.st_mode;
-   return ret;
-@@ -550,22 +518,7 @@ get_file_size (int fd, off_t *size)
- {
-   struct stat st;
-   int ret;
--#ifdef HAVE_STATX
--  struct statx stx;
--
--  ret = statx (fd, "", AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW | AT_STATX_DONT_SYNC, STATX_SIZE, &stx);
--  if (UNLIKELY (ret < 0))
--    {
--      if (errno == ENOSYS || errno == EINVAL)
--        goto fallback;
--      return ret;
--    }
--  *size = stx.stx_size;
--
--  return ret;
- 
--fallback:
--#endif
-   ret = fstat (fd, &st);
-   *size = st.st_size;
-   return ret;
-@@ -1060,7 +1013,6 @@ run_process (char **args, libcrun_error_t *err)
-   _exit (EXIT_FAILURE);
- }
- 
--#ifndef HAVE_FGETPWENT_R
- static unsigned
- atou (char **s)
- {
-@@ -1126,7 +1078,6 @@ fgetpwent_r (FILE *f, struct passwd *pw, char *line, size_t size, struct passwd
-     errno = rv;
-   return rv;
- }
--#endif
- 
- int
- set_home_env (uid_t id)
-@@ -1690,29 +1641,6 @@ copy_rec_stat_file_at (int dfd, const char *path, mode_t *mode, off_t *size, dev
-   struct stat st;
-   int ret;
- 
--#ifdef HAVE_STATX
--  struct statx stx;
--
--  ret = statx (dfd, path, AT_SYMLINK_NOFOLLOW | AT_STATX_DONT_SYNC,
--               STATX_TYPE | STATX_MODE | STATX_SIZE | STATX_UID | STATX_GID, &stx);
--  if (UNLIKELY (ret < 0))
--    {
--      if (errno == ENOSYS || errno == EINVAL)
--        goto fallback;
--
--      return ret;
--    }
--
--  *mode = stx.stx_mode;
--  *size = stx.stx_size;
--  *rdev = makedev (stx.stx_rdev_major, stx.stx_rdev_minor);
--  *uid = stx.stx_uid;
--  *gid = stx.stx_gid;
--
--  return ret;
--
--fallback:
--#endif
-   ret = fstatat (dfd, path, &st, AT_SYMLINK_NOFOLLOW);
- 
-   *mode = st.st_mode;

dectmngr/Makefile

@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2021 IOPSYS Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dectmngr
-PKG_RELEASE:=3
-PKG_VERSION:=3.0.9
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b742ea24a85a67e15270f5d66a5af28f25b653f9
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-RSTRIP:=true
-export BUILD_DIR
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-	CATEGORY:=Utilities
- 	TITLE:=DECT Manager
- 	DEPENDS:= +libubox +ubus
-endef
-
-define Package/$(PKG_NAME)/description
-	DECT manager is a daemon that provides UBUS RPC objects and sends UBUS events for communication with the DECT chip.
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -av --exclude=.* ~/git/voip/dectmngr/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-MAKE_FLAGS += \
-	CFLAGS+="-Wall"
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc
-
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/dectmngr $(1)/usr/sbin/
-	$(STRIP) $(1)/usr/sbin/dectmngr
-	$(CP) ./files/etc/* $(1)/etc/
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

dectmngr/files/etc/init.d/dect

@@ -1,63 +0,0 @@
-#!/bin/sh /etc/rc.common
-#
-# Copyright (C) 2021 OpenWrt.org
-#
-
-source /lib/functions/uci-defaults.sh
-
-START=70
-STOP=12
-
-USE_PROCD=1
-NAME=dectmngr
-PROG=/usr/sbin/dectmngr
-
-# Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
-stop_and_wait_dectmngr() {
-	pidof $NAME && killall -q $NAME
-
-	pidof $NAME && sleep 2 # wait for the process to stop gracefully
-	while pidof $NAME; do
-		killall -q -9 $NAME 
-		sleep 1
-	done
-}
-
-start_service() {
-	test $(db get hw.board.hasDect) = "0" && return
-
-	echo 1 > /sys/class/gpio/gpio14/value
-
-	rm -f /tmp/dect-cmbs.log /tmp/dect-cmbs_Host_log.txt /tmp/dectmngr.log
-
-	procd_open_instance
-	procd_set_param command $PROG -comname ttyH0 -log /tmp/dect-cmbs.log
-	procd_set_param respawn 6 2 3
-	procd_set_param term_timeout 20
-	procd_set_param triggers asterisk
-	procd_close_instance
-}
-
-stop_service() {
-	test $(db get hw.board.hasDect) = "0" && return
-
-	echo 0 > /sys/class/gpio/gpio14/value
-	stop_and_wait_dectmngr
-}
-
-reload_service() {
-	stop_and_wait_dectmngr
-	start
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger asterisk
-}
-
-boot() {
-	echo 14 > /sys/class/gpio/export
-	echo out > /sys/class/gpio/gpio14/direction
-	start
-}
-

dectmngr/files/scripts/load_sound_modules.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-SOUND_BASE=/lib/modules/$(uname -r)/kernel/sound
-SOUND_MODULES="$SOUND_BASE/soundcore.ko $SOUND_BASE/core/snd.ko $SOUND_BASE/core/snd-timer.ko"
-SOUND_MODULES="$SOUND_MODULES $SOUND_BASE/core/snd-pcm.ko $SOUND_BASE/core/snd-hwdep.ko"
-SOUND_MODULES="$SOUND_MODULES $SOUND_BASE/core/seq/snd-seq-device.ko"
-SOUND_MODULES="$SOUND_MODULES $SOUND_BASE/core/seq/snd-seq.ko $SOUND_BASE/core/snd-rawmidi.ko "
-SOUND_MODULES="$SOUND_MODULES $SOUND_BASE/usb/snd-usbmidi-lib.ko $SOUND_BASE/usb/snd-usb-audio.ko"
-
-load_sound_modules() {
-	for mod in $SOUND_MODULES; do
-		insmod $mod
-	done
-}
-
-unload_sound_modules() {
-	local modules=
-
-	# reverse the order
-	for mod in $SOUND_MODULES; do
-		modules="$mod $modules"
-	done
-
-	for mod in $modules; do
-		rmmod $mod
-	done
-}

dectmngr2/Makefile

@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2019 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_RELEASE:=1
+PKG_VERSION:=1.3.0
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=2c8990fd5275d469e8ab6c7a99e17fe0a56052ea
+PKG_NAME:=dectmngr2
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
+export BUILD_DIR
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dectmngr2
+  CATEGORY:=Utilities
+  TITLE:=Dectmngr2
+  URL:=
+  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent endptmngr
+endef
+
+define Package/dectmngr2/description
+	Dectmngr2
+endef
+
+
+define Package/dectmngr2/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/dect/
+	$(INSTALL_DIR) $(1)/etc/config/
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_DIR) $(1)/etc/uci-defaults/
+
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dectmngr2 $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/target.bin $(1)/etc/dect/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/nvs_default $(1)/etc/dect/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dect $(1)/etc/init.d/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dectmngr-wrapper.sh $(1)/usr/sbin/
+	$(CP) ./files/dect.config $(1)/etc/config/dect
+	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
+endef
+
+$(eval $(call BuildPackage,dectmngr2))

dectmngr2/files/dect.config

@@ -0,0 +1,4 @@
+
+config dect 'dect'
+	option radio 'auto'
+

dectmngr2/files/etc/uci-defaults/22-dect-defaults

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+
+# Workaround for product DG400 which has an
+# incorrect value in nvram from factory.
+
+if [ -e "/proc/nvram/BoardId" ]; then
+	boardid=$(cat /proc/nvram/BoardId)
+	ulBoardStuffOption=$(cat /proc/nvram/ulBoardStuffOption)
+
+	if [ "$boardid" = "DG400R0" -a "$ulBoardStuffOption" = "0xffffffff" ]; then
+		echo "0xfffffff2" >/proc/nvram/ulBoardStuffOption
+
+		db -q batch <<-EOT
+			set hw.board.has_dect=1
+			commit hw.board
+		EOT
+	fi
+fi
+
+
+exit 0
+

dslmngr/Makefile

@@ -13,10 +13,9 @@ PKG_VERSION:=1.1.0
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d17c699c1fc9588303d6da35ac2250903bf17cd8
+PKG_SOURCE_VERSION:=400cc66081f2b10b481d5a745bc505b78af098bd
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -44,7 +43,7 @@ define Package/dslmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl
 endef
 
 define Package/dslmngr/description

easy-soc-events/Makefile

@@ -11,7 +11,6 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/easy-soc-events.git
 PKG_SOURCE_VERSION:=5c582b0165b574dc94e4865f82e0bb91fa561754
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
 PKG_BUILD_DIR:=$(BUILD_DIR)/easy-soc-events-$(PKG_VERSION)
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 

easy-soc-libs/Config.in

@@ -1,5 +1,23 @@
-# libeasy configuration
+if (PACKAGE_libwifi || PACKAGE_libdsl || PACKAGE_libethernet)
+menu "configurations"
 
-config LIBWIFI_USE_CTRL_IFACE
-	bool "Use UNIX sockets"
+config IOP_LLA_LIBS_DEBUG
+	bool "Enable debugging support"
 	default n
+
+config LIBWIFI_DEBUG
+	depends on PACKAGE_libwifi
+	bool "Enable wifi debugging"
+	default n
+
+config LIBDSL_DEBUG
+	depends on PACKAGE_libdsl
+	bool "Enable xdsl debugging"
+	default n
+
+config LIBDSL_TEST
+	depends on PACKAGE_libdsl
+	bool "Libdsl test program"
+	default n
+endmenu
+endif

easy-soc-libs/Makefile

@@ -7,17 +7,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.1.89
+PKG_VERSION:=6.0.2
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=509c57cdcbabcc819932e673718c1a305bf32009
+PKG_SOURCE_VERSION:=fee575f414324c68d0916fab06d10eccb78541fd
 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
-PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -30,18 +29,39 @@ include $(INCLUDE_DIR)/package.mk
 define Package/easy-soc-libs
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=IOPSYS Easy SoC libraries
-  SUBMENU:=IOPSYS Easy SoC libraries
+  TITLE:=IOPSYS easy SoC libraries
+  SUBMENU:=IOPSYS easy SoC libraries
   DEPENDS:=+libopenssl
   MENU:=1
 endef
 
+define Package/libwifi/config
+  source "$(SOURCE)/Config.in"
+endef
+
+define Package/libeasy
+  $(call Package/easy-soc-libs)
+  TITLE:= Common helper functions library (libeasy)
+  DEPENDS+=+libnl +libnl-route
+endef
+
+define Package/libwifi
+  $(call Package/easy-soc-libs)
+  TITLE:= WiFi library (libwifi)
+  DEPENDS+=+libnl +libnl-route +libeasy
+endef
+
+define Package/libethernet
+  $(call Package/easy-soc-libs)
+  TITLE:= Ethernet library (libethernet)
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig
+endef
+
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=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
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
   TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
@@ -63,23 +83,21 @@ endif
 
 export TARGET_PLATFORM
 
+ifdef CONFIG_IOP_LLA_LIBS_DEBUG
+  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
+endif
+
+define Package/libdsl
+  $(call Package/easy-soc-libs)
+  TITLE:= XDSL library (libdsl)
+  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi +TARGET_intel_mips:kmod-ppa-drv
+endef
+
 subdirs := \
 	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
-	$(if $(CONFIG_PACKAGE_libqos),libqos)
-
-EASY_SOC_LIBS := \
-	libeasy \
-	libwifi \
-	libdsl \
-	libethernet \
-	libqos
-
-ifeq ($(CONFIG_LIBWIFI_USE_CTRL_IFACE),y)
-  TARGET_CFLAGS +=-DLIBWIFI_USE_CTRL_IFACE
-endif
+	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
@@ -99,36 +117,79 @@ define Build/Prepare
 endef
 endif
 
-include easy.mk
-include wifi.mk
-include dsl.mk
-include ethernet.mk
-include qos.mk
-
-ifneq ($(wildcard $(PKG_BUILD_DIR)/.config_*),\
-	$(PKG_BUILD_DIR)/.config_$(patsubst "%",%,$(CONFIG_TARGET_PROFILE)))
-define Build/Compile/rebuild
-	$(FIND) $(PKG_BUILD_DIR) -name \*.o -or -name \*.so\* | $(XARGS) rm -f;
-	$(if $(wildcard $(PKG_BUILD_DIR)/config_*), \
-		rm -f $(PKG_BUILD_DIR)/.config_*)
+define Build/InstallDev/libeasy
+	$(INSTALL_DIR) $(1)/usr/include/easy
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libeasy/easy.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/libeasy/event.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/libeasy/utils.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/libeasy/debug.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
 endef
-endif
 
-STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell echo $(TARGET_CFLAGS) | mkhash md5)
+define Build/InstallDev/libwifi
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
+endef
+
+define Build/InstallDev/libdsl
+	$(INSTALL_DIR) $(1)/usr/include/xdsl
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libdsl/xdsl.h $(1)/usr/include/xdsl
+	$(CP) $(PKG_BUILD_DIR)/libdsl/xtm.h $(1)/usr/include/xdsl
+	$(CP) $(PKG_BUILD_DIR)/libdsl/common.h $(1)/usr/include/xdsl
+	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
+endef
+
+define Build/InstallDev/libethernet
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libethernet/ethernet.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
+endef
 
 define Build/Compile
-	$(Build/Compile/rebuild)
-	touch $(PKG_BUILD_DIR)/.config_$(CONFIG_TARGET_PROFILE)
 	$(call Build/Compile/Default)
-	$(foreach dir,$(subdirs),$(call Build/Compile/$(dir)))
+ifeq ($(CONFIG_LIBDSL_TEST),y)
+	$(MAKE) -C "$(PKG_BUILD_DIR)/libdsl/test" $(MAKE_FLAGS)
+endif
 endef
 
 define Build/InstallDev
 	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
 endef
 
+define Package/libeasy/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
+endef
+
+define Package/libwifi/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
+endef
+
+define Package/libethernet/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so* $(1)/usr/lib/
+endef
+
+define Package/libdsl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
+ifeq ($(CONFIG_LIBDSL_TEST),y)
+	$(CP) $(PKG_BUILD_DIR)/libdsl/test/libdsl_test $(1)/usr/bin/
+endif
+endef
+
 define Package/easy-soc-libs/install
 	:
 endef
 
-$(eval $(foreach e,$(EASY_SOC_LIBS),$(call BuildPackage,$(e))))
+$(eval $(call BuildPackage,libeasy))
+$(eval $(call BuildPackage,libwifi))
+$(eval $(call BuildPackage,libdsl))
+$(eval $(call BuildPackage,libethernet))

easy-soc-libs/dsl.mk

@@ -1,47 +0,0 @@
-
-define Package/libdsl
-  $(call Package/easy-soc-libs)
-  TITLE:= XDSL library (libdsl)
-  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx \
-	   +TARGET_intel_mips:dsl-cpe-fapi \
-	   +TARGET_intel_mips:kmod-ppa-drv
-endef
-
-define Package/libdsl/config
-  if PACKAGE_libdsl
-	  config LIBDSL_DEBUG
-		depends on PACKAGE_libdsl
-		bool "Enable dsl debugging"
-		default n
-
-	  config LIBDSL_TEST
-		depends on PACKAGE_libdsl
-		bool "Enable dsl test program"
-		default n
-
-  endif
-endef
-
-define Build/InstallDev/libdsl
-	$(INSTALL_DIR) $(1)/usr/include/xdsl
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libdsl/xdsl.h $(1)/usr/include/xdsl
-	$(CP) $(PKG_BUILD_DIR)/libdsl/xtm.h $(1)/usr/include/xdsl
-	$(CP) $(PKG_BUILD_DIR)/libdsl/common.h $(1)/usr/include/xdsl
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-endef
-
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-define Build/Compile/libdsl
-	$(MAKE) -C "$(PKG_BUILD_DIR)/libdsl/test" $(MAKE_FLAGS)
-endef
-endif
-
-define Package/libdsl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(CP) $(PKG_BUILD_DIR)/libdsl/test/libdsl_test $(1)/usr/bin/
-endif
-endef

easy-soc-libs/easy.mk

@@ -1,28 +0,0 @@
-
-
-define Package/libeasy
-  $(call Package/easy-soc-libs)
-  TITLE:= Common helper functions library (libeasy)
-  DEPENDS+=+libnl +libnl-route
-endef
-
-define Package/libeasy/config
-    source "$(SOURCE)/Config.in"
-endef
-
-define Build/InstallDev/libeasy
-	$(INSTALL_DIR) $(1)/usr/include/easy
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libeasy/easy.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/event.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/utils.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/if_utils.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/debug.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
-endef
-
-define Package/libeasy/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
-endef
-

easy-soc-libs/ethernet.mk

@@ -1,27 +0,0 @@
-
-define Package/libethernet
-  $(call Package/easy-soc-libs)
-  TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig
-endef
-
-define Package/libethernet/config
-  config LIBETHERNET_DEBUG
-	depends on PACKAGE_libethernet
-	bool "Enable ethernet debugging"
-	default n
-
-endef
-
-define Build/InstallDev/libethernet
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libethernet/ethernet.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
-endef
-
-define Package/libethernet/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so* $(1)/usr/lib/
-endef
-

easy-soc-libs/qos.mk

@@ -1,27 +0,0 @@
-
-define Package/libqos
-  $(call Package/easy-soc-libs)
-  TITLE:= QoS library (libqos)
-  DEPENDS+=+libnl +libnl-route +libeasy
-endef
-
-define Package/libqos/config
-  config LIBQOS_DEBUG
-	depends on PACKAGE_libqos
-	bool "Enable qos debugging"
-	default n
-
-endef
-
-define Build/InstallDev/libqos
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libqos/qos.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libqos/libqos.so $(1)/usr/lib/
-endef
-
-define Package/libqos/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libqos/libqos*.so* $(1)/usr/lib/
-endef
-

easy-soc-libs/wifi.mk

@@ -1,29 +0,0 @@
-
-define Package/libwifi
-  $(call Package/easy-soc-libs)
-  TITLE:= WiFi library (libwifi)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_brcm63xx_arm:bcmkernel
-endef
-
-define Package/libwifi/config
-  if PACKAGE_libdsl
-	  config LIBWIFI_DEBUG
-		depends on PACKAGE_libwifi
-		bool "Enable wifi debugging"
-		default n
-
-  endif
-endef
-
-define Build/InstallDev/libwifi
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
-endef
-
-define Package/libwifi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
-endef
-

endptmngr/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
 PKG_VERSION:=0.4
-PKG_SOURCE_VERSION:=510b885c049b8ba06772dae59e64b370d0fded3e
+PKG_SOURCE_VERSION:=d87c1def50d9672dbeb9d5972f36a364b29334b9
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
@@ -24,7 +24,6 @@ PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
 PKG_SOURCE_PROTO:=git
 PKG_NAME:=endptmngr
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 endif
 
 export BUILD_DIR
@@ -54,7 +53,7 @@ define Package/endptmngr
   CATEGORY:=Utilities
   TITLE:=Brcmslic
   URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent +uci +bcmkernel @TARGET_HAS_VOICE @BCM_VOICE
+  DEPENDS:= +libubox +ubus +libpicoevent +bcmkernel @TARGET_HAS_VOICE @BCM_VOICE
 endef
 
 define Package/endptmngr/description

ethmngr/Makefile

@@ -5,14 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=2.0.1
+PKG_VERSION:=1.0.4
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5a0ff3bc7c49dcb05129f423ef8e0c4929f6aa03
+PKG_SOURCE_VERSION:=b7135381aedf1bde6f7ab10b41be372a9bd7d155
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ethmngr.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE

gryphon-led-module/src/main.c

@@ -46,10 +46,9 @@ static ssize_t get_led_color(struct device *dev,
 	/* [ln] todo: dummy implementation */
 	int len;
 
-	len = scnprintf(buf, PAGE_SIZE, "%d\n", 123);
+	len = sprintf(buf, "%d\n", 123);
 	if (len <= 0) {
 		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
-		return -EIO;
 	}
 
 	return len;
@@ -100,69 +99,8 @@ static ssize_t set_led_color(struct device *dev,
 }
 static DEVICE_ATTR(led_color, S_IRUGO | S_IWUSR, get_led_color, set_led_color);
 
-static ssize_t get_led_brightness(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	int len;
-	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
-
-	if (IS_ERR(sk9822)) {
-		printk(KERN_ERR "Platform get drvdata returned NULL\n");
-		return -EIO;
-	}
-
-	len = scnprintf(buf, PAGE_SIZE, "%x\n", sk9822->led_brightness);
-	if (len <= 0) {
-		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
-		return -EIO;
-	}
-
-	return len;
-}
-
-/**
- * @brief Set LED brightness
- * @retval count number of bytes written
- * @retval -EINVAL if the message is not a valid hexadecimal number
- * @retval -EIO for all other errors (e.g. leds cannot be configured)
- */
-static ssize_t set_led_brightness(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t count)
-{
-	int ret = 0;
-	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
-	unsigned long val = SK9822_DEFAULT_BRIGHTNESS;
-
-	if (IS_ERR(sk9822)) {
-		printk(KERN_ERR "Platform get drvdata returned NULL\n");
-		return -EIO;
-	}
-
-	if (kstrtoul(buf, 16, &val)) {
-		return -EINVAL;
-	}
-
-	if(val > SK9822_DEFAULT_BRIGHTNESS) {
-		val = SK9822_DEFAULT_BRIGHTNESS;
-	}
-
-	sk9822->led_brightness = (uint8_t)val;
-
-	// Now push to the HW
-	ret = sk9822_update(sk9822);
-	if (ret != 0) {
-		printk(KERN_ERR "Failed to update led\n");
-		return -EIO;
-	}
-
-	return count;
-}
-static DEVICE_ATTR(led_brightness, S_IRUGO | S_IWUSR, get_led_brightness, set_led_brightness);
-
-
 static struct attribute *sk9822_dev_attrs[] = {
 	 &dev_attr_led_color.attr,
-	 &dev_attr_led_brightness.attr,
 	 NULL
 };
 

icwmp/Makefile

@@ -8,14 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=6.5.4-2021-03-23
+PKG_VERSION:=6.3.2-2020-12-21
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5a4e7a0cfb2cdc2576f1c93388760691cec8ee85
+PKG_SOURCE_VERSION:=495e905c30ac7423035a8c0c2c67effc0c607475
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPLv2
@@ -38,7 +37,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libcurl
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libcurl +libbbfdm  +libbbf_api
 endef
 
 define Package/$(PKG_NAME)/description

icwmp/files/etc/config/cwmp

@@ -4,7 +4,7 @@ config acs 'acs'
 	option passwd 'iopsys'
 	option periodic_inform_enable 'true'
 	option periodic_inform_interval '1800'
-	option periodic_inform_time '0001-01-01T00:00:00Z'
+	option periodic_inform_time '0'
 	option ParameterKey ''
 	option dhcp_discovery 'enable'
 	# compression possible configs: GZIP, Deflate, Disabled
@@ -37,6 +37,7 @@ config cpe 'cpe'
 	option instance_mode 'InstanceNumber'
 	option session_timeout '60'
 	option notification '1'
+	option datamodel 'tr181'
 	option exec_download '0'
 	option periodic_notify_enable '1'
 	option periodic_notify_interval '10'

icwmp/files/etc/init.d/icwmpd

@@ -11,6 +11,7 @@ STOP=10
 USE_PROCD=1
 PROG="/usr/sbin/icwmpd"
 
+EXTRA_COMMANDS="notify"
 EXTRA_HELP="	start	[GetRPCMethods] Start icwmpd service and send GetRPCMethods"
 
 validate_url() {
@@ -175,6 +176,9 @@ start_service() {
 		fi
 		procd_set_param respawn "3" "7" "0"
 		procd_close_instance
+		#procd_open_instance
+		#[ "$(uci -q get cwmp.cpe.notification)" == "1" ] && procd_append_param command "/usr/sbin/icwmp_notifd"
+		#procd_close_instance
 	fi
 }
 
@@ -183,6 +187,10 @@ reload_service() {
 	start
 }
 
+notify() {
+       ubus -t 1 call tr069 notify >/dev/null 2>&1 & 
+}
+
 service_triggers() {
 	procd_add_config_trigger "config.change" "cwmp"  /etc/init.d/icwmpd reload
 }

ieee1905/Makefile

@@ -5,15 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=2.1.42
+PKG_VERSION:=2.1.32
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6d07dbd36a195f916d2008179a819355ce79bb57
+PKG_SOURCE_VERSION:=2bb1c564d31a99d80a3f977c1f817777722a601d
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

imonitor/Makefile

@@ -14,7 +14,6 @@ PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
 PKG_SOURCE_VERSION:=532f4900862bcb45d8cd4bf37555fabda81750b6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1

inbd/Makefile

@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=inbd
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.0.1
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=10f765f3d0fcc226b6ecf0c481598c9e7f76315e
+PKG_SOURCE_VERSION:=3135944f3357a7a2c1c206be7b65bbb7ac6d1e58
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
+
 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)
 

iop/config

@@ -7,7 +7,6 @@ CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
 CONFIG_PACKAGE_alsa-lib=y
-CONFIG_PACKAGE_at=y
 CONFIG_PACKAGE_atftp=m
 CONFIG_PACKAGE_atftpd=m
 CONFIG_PACKAGE_bulkdata=y
@@ -38,7 +37,6 @@ CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
 # CONFIG_PACKAGE_iwatchdog is not set
-CONFIG_PACKAGE_jq=y
 CONFIG_PACKAGE_juci=y
 CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
 CONFIG_PACKAGE_juci-firewall-fw3=y
@@ -50,6 +48,9 @@ CONFIG_PACKAGE_juci-network-netifd=y
 CONFIG_PACKAGE_juci-sysupgrade=y
 CONFIG_PACKAGE_juci-wireless=y
 CONFIG_PACKAGE_juci-theme-iopsys=y
+CONFIG_PACKAGE_libdaemon=y
+CONFIG_PACKAGE_libgmp=y
+CONFIG_PACKAGE_libreadline=y
 CONFIG_PACKAGE_libreswan=m
 CONFIG_PACKAGE_libwifi=y
 CONFIG_PACKAGE_lscpu=y
@@ -85,6 +86,7 @@ CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
 CONFIG_PACKAGE_rpcd-mod-rpcsys=y
+CONFIG_PACKAGE_rsync=y
 CONFIG_PACKAGE_rulengd=y
 CONFIG_PACKAGE_strace=y
 CONFIG_PACKAGE_swmodd=m
@@ -99,6 +101,7 @@ CONFIG_PACKAGE_usb-modeswitch=y
 CONFIG_PACKAGE_usbreset=y
 CONFIG_PACKAGE_uspd=y
 CONFIG_PACKAGE_vsftpd-tls=m
+CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
 CONFIG_PACKAGE_wifimngr=y
 CONFIG_PACKAGE_xl2tpd=y
@@ -217,9 +220,6 @@ CONFIG_TARGET_PREINIT_IP=""
 CONFIG_TARGET_PREINIT_NETMASK=""
 CONFIG_TARGET_PREINIT_BROADCAST=""
 
-# Generate rootfs tar file
-CONFIG_TARGET_ROOTFS_TARGZ=y
-
 # The urandom-seed package is very strange. It seeds urandom with urandom...
 # Disable it. Most SoCs nowadays has HW random generators anyway.
 # CONFIG_PACKAGE_urandom-seed is not set

iop/scripts/genconfig.sh

@@ -187,8 +187,12 @@ function genconfig {
 
 		bcmAllowed=0
 		endptAllowed=0
+		natalieAllowed=0
+		#mediatekAllowed=0
 
 		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
+		#git ls-remote git@dev.iopsys.eu:mediatek/linux.git -q 2>/dev/null && mediatekAllowed=1
+		git ls-remote git@dev.iopsys.eu:dialog/natalie-dect-12.26.git -q 2>/dev/null && natalieAllowed=1
 		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
 	}
 
@@ -417,10 +421,14 @@ function genconfig {
 			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
 			[ $bcmAllowed -eq 0 ] && echo "CONFIG_BCM_OPEN=y" >> .config
 			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
+			[ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
+			#[ $mediatekAllowed -eq 0 ] && echo "CONFIG_MEDIATEK_OPEN=y" >> .config
 		else
 			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
 			echo "CONFIG_BCM_OPEN=y" >> .config
 			echo "CONFIG_ENDPT_OPEN=y" >> .config
+			echo "CONFIG_NATALIE_OPEN=y" >> .config
+			#echo "CONFIG_MEDIATEK_OPEN=y" >> .config
 		fi
 
 		if [ -n "$BRCM_MAX_JOBS" ]

iop/scripts/genconfig_min.sh

@@ -186,8 +186,12 @@ function genconfig_min {
 
 		bcmAllowed=0
 		endptAllowed=0
+		natalieAllowed=0
+		mediatekAllowed=0
 
 		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
+		git ls-remote git@dev.iopsys.eu:mediatek/linux.git -q 2>/dev/null && mediatekAllowed=1
+		git ls-remote git@dev.iopsys.eu:dialog/natalie-dect-12.26.git -q 2>/dev/null && natalieAllowed=1
 		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
 	}
 

iop/scripts/generate_tarballs.sh

@@ -30,6 +30,25 @@ build_bcmkernel_consumer() {
 	cd "$curdir"
 }
 
+build_natalie_consumer() {
+	# create natalie-dect open version tar file
+	local natalieversion nataliecommith
+	grep -q "CONFIG_TARGET_NO_DECT=y" .config && return
+	natalieversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
+	nataliecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
+	[ -n "$profile" ] && [ -n "$natalieversion" ] && [ -n "$nataliecommith" ] || return
+	ssh $SERVER "test -f $FPATH/natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz" && return
+	cd ./build_dir/target-*/natalie-dect-$natalieversion/
+	mkdir natalie-dect-open-$natalieversion
+	cp -f ipkg-*/natalie-dect/lib/modules/*/extra/dect.ko natalie-dect-open-$natalieversion/dect.ko
+	tar -czv  natalie-dect-open-$natalieversion/ -f natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz
+	scp -pv natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $SERVER:$FPATH/
+	cp natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $curdir/
+	rm -rf natalie-dect-open-$natalieversion
+	rm -f natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz
+	cd "$curdir"
+}
+
 build_endptmngr_consumer() {
 	# create endptmngr open version tar file
 	local endptversion endptcommith
@@ -51,6 +70,46 @@ build_endptmngr_consumer() {
 	cd "$curdir"
 }
 
+build_mediatek_kernel() {
+	local mediatek_commit kernel
+
+	mediatek_commit=$(grep CONFIG_KERNEL_GIT_COMMIT .config | cut -d '=' -f2 | tr -d '"')
+	kernel=linux-git*
+	[ -n "$mediatek_commit" ] || return
+	ssh $SERVER "test -f $FPATH/mediatek-kernel-open-$mediatek_commit.tar.gz" && return
+	echo "Building mediatek kernel tarball from kernel commit:"	
+	echo $mediatek_commit
+	cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips*/linux-git*
+
+	# remove git repo
+	rm -rf .git
+	cd ..
+
+	tar -czv $kernel -f mediatek-kernel-open-$mediatek_commit.tar.gz
+	scp -pv mediatek-kernel-open-$mediatek_commit.tar.gz $SERVER:$FPATH/
+	cd "$curdir"
+}
+
+build_mediatek_wifi_consumer() {
+	local ver commit
+	local chip=$1
+
+	ver=$(grep -w "PKG_VERSION:" ./feeds/mediatek/mt${chip}/Makefile | cut -d'=' -f2)
+	commit=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/mediatek/mt${chip}/Makefile | cut -d'=' -f2)
+	[ -n "$ver" ] && [ -n "$commit" ] || return
+	ssh $SERVER "test -f $FPATH/mtk${chip}e-${ver}_${commit}.tar.xz" && return
+	cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips*/mtk${chip}e-$ver/ipkg-*
+	mkdir -p mtk${chip}e-$ver/src
+	cp -rf kmod-mtk${chip}e/etc mtk${chip}e-$ver/src/
+	cp -rf kmod-mtk${chip}e/lib mtk${chip}e-$ver/src/
+	tar Jcf mtk${chip}e-${ver}_${commit}.tar.xz mtk${chip}e-$ver
+	scp -pv mtk${chip}e-${ver}_${commit}.tar.xz $SERVER:$FPATH/
+	cp mtk${chip}e-${ver}_${commit}.tar.xz $curdir/
+	rm -rf mtk${chip}e-$ver
+	rm -f mtk${chip}e-${ver}_${commit}.tar.xz
+	cd "$curdir"
+}
+
 function print_usage {
 	echo "Usage: $0 generate_tarballs"
 	echo "  -t <target>"
@@ -95,7 +154,12 @@ function generate_tarballs {
 
 	if [ "$stk_target" == "broadcom" ]; then
 		build_bcmkernel_consumer
+		build_natalie_consumer
 		build_endptmngr_consumer
+	elif [ "$stk_target" == "mediatek" ]; then
+		build_mediatek_kernel
+		build_mediatek_wifi_consumer 7603
+		build_mediatek_wifi_consumer 7615
 	else
 		echo "Invalid target: $stk_target"
 		print_usage

iopupgrade/Makefile

@@ -17,7 +17,6 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopupgrade
 
 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)
 

json-editor/Makefile

@@ -10,7 +10,6 @@ PKG_RELEASE:=1.0.0
 PKG_SOURCE_VERSION:=44b32937a062ec4ffc9f7355841dc94ab6efa50f
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/json-editor.git
-PKG_MIRROR_HASH:=skip
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk

libmicroxml/Makefile

@@ -16,7 +16,6 @@ PKG_SOURCE_URL:=https://dev.iopsys.eu/mirror/microxml.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=72965423184f24cc0b963d91c2d1863cdb01b6aa
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_LICENSE:=LGPL-2.0
 PKG_LICENSE_FILES:=COPYING
 

libpicoevent/Makefile

@@ -18,7 +18,6 @@ PKG_LICENSE:=LGPL-2.1-only
 PKG_LICENSE_FILES:=LICENSE
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 
 include $(INCLUDE_DIR)/package.mk
 

loop-detector/Makefile

@@ -14,7 +14,6 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/loop-detector
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

map-1905/Makefile

@@ -5,15 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-1905
-PKG_VERSION:=0.0.19
+PKG_VERSION:=0.0.15
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=46afa4c0aa56d8762d9402cfdaddf4adaa8a058a
+PKG_SOURCE_VERSION:=405e44f14d623db7a5f03e76945315774d2b6deb
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=3.5.12
+PKG_VERSION:=3.1.3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=1a81fde8ecc62021bb7aeadfc2b8ce3760643a3a
+PKG_SOURCE_VERSION:=1f9e4c5beafa216ff16110f3715dc901a25eb897
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
@@ -16,7 +16,6 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/map-agent.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -24,7 +23,7 @@ define Package/map-agent
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libmaputils +libwsc +libeasy
+  DEPENDS:=+libwifi +libuci +libubox +ubus +libmaputils +libwsc
 endef
 
 define Package/map-agent/description

map-agent/files/etc/config/mapagent

@@ -1,32 +1,62 @@
-config agent 'agent'
+config wifiagent
 	option enabled '1'
 	option debug '6'
 	option profile '2'
-	option al_bridge 'br-lan'
 
-#config fh-iface
-#	option ifname 'wl0'
-#	option steer 'rssi bssload'
-#	list exclude '00:11:22:33:44:55'
-#	list exclude_btm '00:aa:bb:cc:dd:ee'
-#	list assoc_ctrl '00:10:20:30:40:50'
-#	option btm_retry '3'
-#	option btm_retry_secs '180'
-#	option fallback_legacy '1'
-#	option steer_legacy_reassoc_secs '30'
-#	option steer_legacy_retry_secs '3600'
-#	option assoc_ctrl_secs '30'
-#	option band '2'
+config fh-iface
+	option ifname 'wl0'
+	option steer 'rssi bssload'
+	list exclude '00:11:22:33:44:55'
+	list exclude_btm '00:aa:bb:cc:dd:ee'
+	list assoc_ctrl '00:10:20:30:40:50'
+	option btm_retry '3'
+	option btm_retry_secs '180'
+	option fallback_legacy '1'
+	option steer_legacy_reassoc_secs '30'
+	option steer_legacy_retry_secs '3600'
+	option assoc_ctrl_secs '30'
+	option band '2'
 
-#config fh-iface
-#	option ifname 'wl1'
-#	option steer 'rssi bssload'
-#	list exclude '00:11:22:33:44:55'
-#	list exclude_btm '00:aa:bb:cc:dd:ee'
-#	option band '5'
+config fh-iface
+	option ifname 'wl1'
+	option steer 'rssi bssload'
+	list exclude '00:11:22:33:44:55'
+	list exclude_btm '00:aa:bb:cc:dd:ee'
+	option band '5'
 
 #config bk-iface
 #	option ifname 'apclii0'
 #	option enabled '1'
 #	option onboarded '0'
 #	option disallow_bsta '1		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)
+
+config steer-param 'rssi'
+	option priority '0'
+	option rssi_threshold '-68'
+	option hysteresis '5'
+	option margin '3'
+	option diffsnr '8'
+
+config steer-param 'bssload'
+	option priority '0'
+	option bssload_threshold '80'
+
+### custom rules follows ###
+config rule-custom
+	option action steer
+	option sta 'd8:32:e3:4d:35:d2'
+	option bss '00:22:07:11:22:33'
+
+config rule-custom
+	option action restrict
+	option sta 'd8:32:e3:4d:35:d2'
+	option bss '00:22:07:11:22:33'
+
+#config bk-iface
+#	option ifname 'wlan1_1'
+#
+#config fh-iface
+#	option ifname 'wlan0'
+#
+#config fh-iface
+#	option ifname 'wlan1'

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

@@ -6,12 +6,6 @@ STOP=20
 USE_PROCD=1
 
 start_service() {
-	config_load "mapagent"
-
-	local enabled
-	config_get_bool enabled agent enabled 1
-	[ "$enabled" -eq 0 ] && return 1
-
 	procd_open_instance
         procd_set_param command "/usr/sbin/mapagent" "-d"
 	procd_set_param respawn

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.4.6
+PKG_VERSION:=2.0.3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=dca01ce896ae870088da7f9bccc7fc7cbdfa13f2
+PKG_SOURCE_VERSION:=ae4d7c0279cf2f40b8f3ae0afa3e0f004e27e1f5
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
@@ -15,7 +15,6 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/map-controller.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,7 +22,7 @@ define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libmaputils +libwsc +libeasy
+  DEPENDS:=+libuci +libubox +ubus +libmaputils +libwsc
 endef
 
 define Package/map-controller/description

map-controller/files/etc/config/mapcontroller

@@ -1,28 +1,21 @@
-config controller 'controller'
+config wificntlr
 	option enabled '1'
 	option registrar '5 2'	    #bands on which wps registrar supported
 	option debug '6'
-	option al_bridge 'br-lan'
-
-config vlan 'lan'
-	option network 'lan'
-	option id '1'
 
 config fh-credentials
 	option band '5'
 	option encryption 'psk2'
 	option key '1234567890'
 	option ssid 'map-net5'
-	option vlan '1'
+	option vlan '101'
 
 config fh-credentials
 	option band '2'
 	option encryption 'psk2'
 	option key '1234567890'
 	option ssid 'map-net2'
-#	option bk_ssid 'multiap_ssid123'
-#	option bk_key 'multiap_key123'
-	option vlan '1'
+	option vlan '0'               # 0 - 2 rsvd, 3 - 4094 => vlan id
 
 config bk-credentials
 	option band '5'
@@ -30,9 +23,10 @@ config bk-credentials
 	option key '5555555555'
 	option ssid 'map-bkhaul-5'
 	option multi_ap '2'
+#	option multi_ap_backhaul_sta '1'                        # possible future TODO
+#	option multi_ap_backhaul_key 'multiap_key123'           # possible future TODO
+#	option multi_ap_backhaul_ssid 'MultiAP-0022077E9CD6'    # possible future TODO
 	option disallow_bsta '1'		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)
-	option vlan '1'
-
 
 config bk-credentials
 	option band '2'
@@ -40,5 +34,78 @@ config bk-credentials
 	option key '2222222222'
 	option ssid 'map-bkhaul-2'
 	option multi_ap '2'
+#	option multi_ap_backhaul_sta '1'                        # possible future TODO
+#	option multi_ap_backhaul_key 'multiap_key123'           # possible future TODO
+#	option multi_ap_backhaul_ssid 'MultiAP-0022077E9CD6'    # possible future TODO
 	option disallow_bsta '0'                # 0 or 1 profile-1 bSTA
-	option vlan '1'
+
+config agent-policy
+	option agent_id '00:22:07:7E:9C:D6'        # 1905al macaddress of agent
+	list steer_exclude '00:11:22:33:44:55'
+	list steer_exclude_btm '00:aa:bb:cc:dd:ee'
+	option steer_policy '2'                    # 0, 1, 2 - see MultiAP spec
+	option util_threshold '200'                # channel-util as in BSS load
+	option rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent sc include_sta_metric '0'              # sta metric in AP metric resp
+	option pvid '100'                          # primary vlan id
+	option pcp_default '5'                     # default vlan pcp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile20 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '0'           # 0, or 1 - 220
+	option report_util_threshold '0'           # 0, or  channel-util value
+	option include_sta_stats '0'               # sta stats in AP metric resp
+	option include_sta_metric '0'              # sta metric in AP metric resp
+	option pvid '100'                          # primary vlan id
+	option pcp_default '5'                     # default vlan pcp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile-1 bSTA
+	option disallow_bsta_p2 '0'                # 0 or 1 profile-2 bSTA
+
+config agent-policy
+	option agent_id '00:00:00:00:00:00'
+	list steer_exclude '00:11:22:33:44:55'
+	list steer_exclude_btm '00:aa:bb:cc:dd:ee'
+	option steer_policy '2'                    # 0, 1, 2 - see MultiAP spec
+	option util_threshold '200'                # channel-util as in BSS load
+	option rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent sc include_sta_metric '0'              # sta metric in AP metric resp
+	option pvid '100'                          # primary vlan id
+	option pcp_default '5'                     # default vlan pcp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile20 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '0'           # 0, or 1 - 220
+	option report_util_threshold '0'           # 0, or  channel-util value
+	option include_sta_stats '0'               # sta stats in AP metric resp
+	option include_sta_metric '0'              # sta metric in AP metric resp
+	option pvid '100'                          # primary vlan id
+	option pcp_default '5'                     # default vlan pcp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile-1 bSTA
+	option disallow_bsta_p2 '0'                # 0 or 1 profile-2 bSTA
+
+config agent-policy
+	option agent_id '00:22:07:A3:6C:DA'    # 1905al macaddress of agent
+	list steer_exclude '00:11:22:33:44:55'
+	list steer_exclude_btm '00:aa:bb:cc:dd:ee'
+	option steer_policy '2'                    # 0, 1, 2 - see MultiAP spec
+	option util_threshold '200'                # channel-util as in BSS load
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '0'           # 0, or 1 - 220
+	option report_util_threshold '0'           # 0, or  channel-util value
+	option include_sta_stats '0'               # sta stats in 3:4d:35:d2'
+	option bss '00:22:07:11:22:33'
+
+config rule-custom
+	option action restrict
+	option sta 'd8:32:e3:4d:35:d2'
+	option bss '00:22:07:11:22:33'

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

@@ -6,14 +6,8 @@ STOP=20
 USE_PROCD=1
 
 start_service() {
-	local enabled
-
-	config_load "mapcontroller"
-	config_get_bool enabled controller enabled 1
-	[ "$enabled" -eq 0 ] && return
-
 	procd_open_instance
-	procd_set_param command "/usr/sbin/mapcontroller" "-d"
+        procd_set_param command "/usr/sbin/mapcontroller" "-d"
 	procd_set_param respawn
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1
@@ -22,18 +16,10 @@ start_service() {
 
 service_triggers()
 {
-	procd_add_reload_trigger "mapcontroller"
+	procd_add_reload_trigger "ieee1905"
 }
 
 reload_service() {
-	local enabled
-
-	config_load "mapcontroller"
-	config_get_bool enabled controller enabled 1
-	if [ "$enabled" -eq 0 ]; then
-		stop
-		return
-	fi
-
-	procd_send_signal "mapcontroller"
+	stop
+	start
 }

map-topology/Makefile

@@ -14,7 +14,6 @@ PKG_SOURCE_VERSION:=8d008ef712227986263e9a2a1b188ce3a27e17f8
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

mqtt-ciotc/Makefile

@@ -13,7 +13,6 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifilife-testbed.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

natalie-dect-h/Makefile

@@ -0,0 +1,42 @@
+#
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=natalie-dect-h
+PKG_VERSION:=12.26
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL:=https://dev.iopsys.eu/dialog/natalie-dect-h.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=f3889dc3f80bed10374f46430009aca24448bdcc
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_LICENSE:=PROPRIETARY RTX
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/image.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+define Package/natalie-dect-h
+  SECTION:=net
+  CATEGORY:=Base system
+  TITLE:=Dect stack headers
+  URL:=
+endef
+
+define Package/natalie-dect-h/description
+	Kernel dect driver headers
+endef
+
+
+define Package/natalie-dect-h/install
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/natalie-dect
+	$(CP) -r $(PKG_BUILD_DIR)/SrcHeaders/* $(STAGING_DIR)/usr/include/natalie-dect/
+endef
+
+$(eval $(call BuildPackage,natalie-dect-h))

natalie-dect/Config.in

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

natalie-dect/Makefile

@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2019 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=natalie-dect
+PKG_VERSION:=12.26
+
+PKG_SOURCE_VERSION:=378c404fba3efc8f1bcde54370a5370670fa1853
+ifeq ($(CONFIG_NATALIE_OPEN),y)
+BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
+PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL:=https://download.iopsys.eu/iopsys/opensdk/
+PKG_NAME:=natalie-dect-open
+else
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL:=https://dev.iopsys.eu/dialog/natalie-dect-12.26.git
+PKG_SOURCE_PROTO:=git
+endif
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+
+PKG_LICENSE:=PROPRIETARY
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/image.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+
+BCM_KERNEL_VERSION=`cat $(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-*/include/config/kernel.release`
+
+export BUILD_DIR
+export BCM_KERNEL_VERSION
+export CONFIG_BCM_CHIP_ID := $(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+export CONFIG_BCM_KERNEL_PROFILE := $(patsubst "%",%,$(CONFIG_BCM_KERNEL_PROFILE))
+export CONFIG_ARCH := $(patsubst "%",%,$(CONFIG_ARCH))
+export TOOLS := $(CONFIG_BCM_TOOLCHAIN)/usr/bin/
+export TOOLPREFIX := $(CONFIG_BCM_TOOLTUPLE)
+export BRCM_MAX_JOBS := $(patsubst "%",%,$(CONFIG_BRCM_MAX_JOBS))
+export MAKE_J
+export BRCM_VERBOSE := $(if $(findstring c,$(OPENWRT_VERBOSE)),1,)
+export PKG_BUILD_DIR
+export BCM_SDK_PATH := $(BUILD_DIR)/bcmkernel/bcm963xx
+
+define Package/natalie-dect
+  SECTION:=net
+  CATEGORY:=Base system
+  TITLE:=Dect stack
+  URL:=
+  DEPENDS:=bcmkernel
+endef
+
+define Package/natalie-dect/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Package/natalie-dect/description
+	Kernel dect driver
+endef
+
+ifeq ($(CONFIG_NATALIE_OPEN),y)
+define Build/Compile
+endef
+endif
+
+define Package/natalie-dect/install
+	$(INSTALL_DIR) $(1)/lib/modules/$(BCM_KERNEL_VERSION)/extra
+	$(CP) $(PKG_BUILD_DIR)/dect.ko $(1)/lib/modules/$(BCM_KERNEL_VERSION)/extra/dect.ko
+endef
+
+$(eval $(call BuildPackage,natalie-dect))

netmode/Makefile

@@ -13,8 +13,8 @@ PKG_VERSION:=0.2.0
 PKG_SOURCE_VERSION:=5c8abbdf86e4651c7c6f14f784cfb52e69979f96
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/netmoded
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

netmode/files/etc/ruleng/internet.json

@@ -1,42 +0,0 @@
-{
-	"internet_success": {
-		"if" : [
-			{
-				"event": "internet",
-				"match": {
-					"status":"online"
-				}
-			}
-		],
-		"then" : [
-			{
-				"object": "led.internet",
-				"method":"set",
-				"args" : {
-					"state": "ok"
-				},
-				"timeout": 1
-			}
-		]
-	},
-	"internet_fail": {
-		"if" : [
-			{
-				"event": "internet",
-				"match": {
-					"status":"offline"
-				}
-			}
-		],
-		"then" : [
-			{
-				"object": "led.internet",
-				"method":"set",
-				"args" : {
-					"state": "error"
-				},
-				"timeout": 1
-			}
-		]
-	}
-}

netmode/files/etc/uci-defaults/ruleng.internet

@@ -1,2 +0,0 @@
-uci -q set ruleng.internet=rule
-uci -q set ruleng.internet.recipe='/etc/ruleng/internet.json'

netmode/files/sbin/testnet

@@ -4,6 +4,7 @@
 . /lib/network/utils.sh
 
 NETCON=0
+WANIP=0
 LASTSTATUS=""
 CURSTATUS=""
 
@@ -28,6 +29,15 @@ test_connection() {
 	return 1
 }
 
+uplink_test() {
+	uplink_phy_connected
+	if [ $? -eq 0 ]; then
+		ubus call led.wan set '{"state" : "ok"}' || ubus call led.broadband set '{"state" : "ok"}'
+	else
+		ubus call led.wan set '{"state" : "off"}' || ubus call led.broadband set '{"state" : "off"}'
+	fi
+}
+
 internet_test() {
 	local link dest
 
@@ -37,14 +47,18 @@ internet_test() {
 
 	if [ "$?" -eq 0 ]; then
 		NETCON=1
+		ubus call led.internet  set '{"state" : "ok"}'
 		echo "{ \"online\" : true }" > /tmp/internet_connection_status
 	else
 		NETCON=0
+		ubus call led.internet  set '{"state" : "error"}'
 		echo "{ \"online\" : false }" > /tmp/internet_connection_status
 	fi
 }
 
 connectivity_test() {
+	uplink_test
+
 	internet_test
 
 	if [ $NETCON -eq 1 ]; then

obuspa/Makefile

@@ -5,15 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=3.0.0.23
+PKG_VERSION:=3.0.0.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fc070b2b86f2123708f885619e64d5a18b8f27ae
+PKG_SOURCE_VERSION:=09c1959e36f7084486a4d39548cef422a1ece483
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -51,11 +50,9 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(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/
-	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-obuspa $(1)/etc/hotplug.d/iface/
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -2,7 +2,7 @@ config obuspa 'global'
 	option enabled 'true'
 	option interface 'wan'
 	#option ifname 'eth0.1'
-	option debug '0'
+	option debug 'false'
 	option log_level '1'
 	#option db_file '/tmp/usp.db'
 	#option trust_cert '/etc/obuspa/rootCA.pem'

obuspa/files/etc/hotplug.d/iface/85-obuspa

@@ -1,9 +1,31 @@
 #!/bin/sh
 
-[ "$(uci -q get obuspa.global.interface)" == "$INTERFACE" ] || exit 0
+. /lib/functions/network.sh
 
-[ "$ACTION" = ifup -o "$ACTION" = ifupdate ] || exit 0
-[ "$ACTION" = ifupdate -a -z "$IFUPDATE_ADDRESSES" ] && exit 0
+[ "$ACTION" == "ifup" ] || exit 0
 
-/etc/init.d/obuspa reload
+[ -f /etc/config/obuspa ] || exit 0
 
+handle_obuspa_restart() {
+	[ "$INTERFACE" == "loopback" ] && exit 0
+
+	local interface=$(uci -q get obuspa.global.interface)
+	[ "$interface" == "$INTERFACE" ] || exit 0
+
+	mkdir -p /tmp/ipv4
+
+	network_flush_cache
+
+	local previpaddr=""
+	local curipaddr=""
+	local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
+	previpaddr=$(cat $ipaddrfile 2>/dev/null)
+	network_get_ipaddr curipaddr $INTERFACE
+	[ -n "$curipaddr" ] && echo $curipaddr > $ipaddrfile || rm -f $ipaddrfile
+
+	[ "$previpaddr" == "$curipaddr" ] && exit 0
+
+	/etc/init.d/obuspa reload &
+}
+
+handle_obuspa_restart

obuspa/files/etc/init.d/obuspa

@@ -504,42 +504,7 @@ remove_db() {
 	start
 }
 
-service_running() {
-	local AgentEndpointID serial oui user pass
-	local opt=""
-
-	ubus -t 10 wait_for usp.raw
-	config_load obuspa
-	config_get AgentEndpointID localagent EndpointID ""
-	if [ -z "${AgentEndpointID}" ]; then
-		serial=$(ubus -t 1 call usp.raw get '{"path":"Device.DeviceInfo.SerialNumber"}'|jsonfilter -e '@["parameters"][0].value')
-		oui=$(ubus -t 1 call usp.raw get '{"path":"Device.DeviceInfo.ManufacturerOUI"}'|jsonfilter -e '@["parameters"][0].value')
-		AgentEndpointID="os::${oui}-${serial}"
-	fi
-
-	config_get user localmqtt Username
-	if [ -n "${user}" ]; then
-		opt="-u ${user}"
-	fi
-	config_get pass localmqtt Password
-	if [ -n "${pass}" ]; then
-		opt="${opt} -P ${pass}"
-	fi
-	# publish Agent's EndpointID in mosquito broker for discovery
-	# This is a work around till obuspa does not support advertising
-	log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker"
-	mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" ${opt}
-
-	procd_running ${CONFIGURATION}
-}
-
 start_service() {
-	ubus wait_for usp.raw
-	if [ "$?" -ne 0 ]; then
-		log "OBUSPA failed to start usp.raw not available"
-		exit 0
-	fi
-
 	procd_open_instance ${CONFIGURATION}
 	procd_set_param command ${PROG}
 	db_init
@@ -562,31 +527,9 @@ reload_service() {
 }
 
 service_triggers() {
-	procd_add_reload_trigger "uspd" "mosquitto"
+	procd_add_reload_trigger "uspd"
 	procd_add_config_trigger "config.change" "${CONFIGURATION}" /etc/init.d/obuspa remove_db
 
-	# Create a reload trigger if schema update avaialble
-	procd_open_trigger
-		json_add_array
-			json_add_string "" "usp.raw"
-			json_add_array
-				json_add_string "" "if"
-				json_add_array
-					json_add_string "" "eq"
-					json_add_string "" "action"
-					json_add_string "" "schema_update_available"
-				json_close_array
-				json_add_array
-					json_add_string "" "run_script"
-					json_add_string "" "/etc/init.d/obuspa"
-					json_add_string "" "reload"
-				json_close_array
-			json_close_array
-			json_add_int "" "1000"
-		json_close_array
-	procd_close_trigger
-
-
 #	local interface
 #	config_load obuspa
 #	config_get interface global interface

owsd/Makefile

@@ -12,7 +12,6 @@ PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
 PKG_SOURCE_VERSION:=fd696e9d1be8278db3eb1d9be97e1a66afd6e1f6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1

owsd/files/owsd.hotplug

@@ -2,19 +2,6 @@
 
 [ "$ACTION" = ifup ] || exit 0
 
-handle_interface() {
-	ifname=$(uci get network.$1.ifname)
-
-	case "$ifname" in
-		@*)
-			alias_interface="$1 $alias_interface"
-			;;
-	esac
-}
-
-config_load network
-config_foreach handle_interface "interface"
-
 compare_owsd_iface() {
 	local interface
 
@@ -24,13 +11,6 @@ compare_owsd_iface() {
 		/etc/init.d/owsd reload
 		exit
 	fi
-
-	for i in $alias_interface; do
-	if [ "$INTERFACE" == "$i" ]; then
-			/etc/init.d/owsd reload
-			exit
-		fi
-	done
 }
 
 config_load owsd

peripheral_manager/Makefile

@@ -12,12 +12,11 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.5
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=d9c22221f6cb414126978c92295fdcc0885e3285
+PKG_SOURCE_VERSION:=dd4a72aca663bf3c9a57f20e889e43a55d3da1b3
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager
 
 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)
 

peripheral_manager/files/etc/init.d/peripheral_manager

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=12
-STOP=89
+STOP=91
 
 USE_PROCD=1
 NAME=peripheral_manager
@@ -17,7 +17,7 @@ start_service() {
 service_running() {
 	ubus -t 2 wait_for led.status
 	ubus call led.status set '{"state":"notice"}'
-	ubus -t 2 wait_for buttons
+	ubus -t 2 wait_for button
 }
 
 stop_service() {

port-management/files/etc/uci-defaults/15-ports-config-generate

@@ -33,6 +33,8 @@ populate_config(){
 	done
 
 	uci commit ports
+
+	[ $DEBUG ] && cat /etc/config/ports
 }
 
 [ -f /sbin/db -a -f /etc/board-db/config/hw ] && populate_config

prj-unish/Makefile

@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2020 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=prj-unish
-PKG_VERSION:=0.1.0
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3180908081492a6cfc11adbcf80845dbba12633a
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/prj-unish.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/prj-unish
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Project unish
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl
-endef
-
-define Package/prj-unish/description
- This package provides unish-paanch.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-MAKE_PATH:=src
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-  rsync -r --exclude=.* ~/git/prj-unish/ $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/prj-unish/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/i1905d $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,prj-unish))

prj-unish/files/etc/config/ieee1905

@@ -1,23 +0,0 @@
-
-config ieee1905 'ieee1905'
-        option enabled '1'
-        option extension 0
-	#option macaddress 'ba:c9:a6:90:6c:b0'
-	option registrar '2 5'
-
-config ap
-	option band '2'
-	option ssid 'TestSSID'
-	option encryption 'psk2'
-	option key '1234567890'
-
-config ap
-	option band '5'
-	option ssid 'TestSSID'
-	option encryption 'psk2'
-	option key '1234567890'
-
-config al-iface
-        option enabled 1
-        option ifname 'br-lan'
-	option type 'bridge'

qosmngr/Makefile

@@ -8,16 +8,8 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=qosmngr
 PKG_VERSION:=1.0.0
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=03df56c6eb7c6737ce95576e89c915df77396953
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/qosmngr.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
@@ -27,24 +19,22 @@ define Package/qosmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=QoS Manager
-  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
+  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm)
 endef
 
 define Package/qosmngr/description
 	Configures L2 QoS and collects queue statistics
 endef
 
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        $(CP) -rf ./qosmngr/* $(PKG_BUILD_DIR)/
+#define Build/Prepare
+#        $(CP) -rf ./qosmngr/* $(PKG_BUILD_DIR)/
+#endef
+
+define Build/Compile
 endef
-endif
 
 define Package/qosmngr/install
 	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/qosmngr $(1)/usr/sbin
 endef
 
 $(eval $(call BuildPackage,qosmngr))

qosmngr/files/etc/init.d/qos

@@ -4,23 +4,18 @@
 # include /lib/qos
 
 START=21
-STOP=10
 
 USE_PROCD=1
 NAME=qosmngr
-PROG=/usr/sbin/qosmngr
 
 . /lib/functions.sh
 include /lib/qos
 
 start_service() {
 	if [ -f "/etc/config/qos" ]; then
-		reload_qos
-		procd_open_instance qosmngr
-		procd_set_param command ${PROG}
-		procd_set_param respawn
-		procd_close_instance
+		ubus -S call qos reload
 	fi
+
 }
 
 stop() {

qosmngr/files/lib/qos/broadcom.sh

@@ -646,16 +646,17 @@ assign_policer_to_port() {
 	local portorder="$(db -q get hw.board.ethernetPortOrder)"
 	local wanport="$(db -q get hw.board.ethernetWanPort)"
 
+	local i=0
 	for port in $portorder; do
 		if [ "$ifname" == "$port" ]; then
 			if [ "$wanport" == "$port" ]; then
-				bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/index=wan0 ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
+				bs /b/configure port/index=wan0 ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
 			else
-				local i="${port: -1}"
-				bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/index=lan$i ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
+				bs /b/configure port/index=lan$i ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
 			fi
 			break
 		fi
+		i=$((i + 1))
 	done
 }
 
@@ -885,3 +886,228 @@ reload_qos() {
 		configure_policer
 	fi
 }
+
+get_queue_stats() {
+	local ifname
+	local f_name
+	local tmp_val
+	local q_index=0
+	local max_q_index=0
+
+	json_init
+	json_add_array "queues"
+
+	if [ -n "$1" ]; then
+		ifname=$1
+		max_q_index=$(cat /tmp/qos/queue_stats/${ifname}/q_idx)
+		while :
+		do
+			if [ $q_index -eq $max_q_index ]; then
+				break
+			fi
+			stats="$(tmctl getqstats --devtype 0 --if $ifname --qid $q_index)"
+			ret="$(echo $stats | awk '{print substr($0,0,5)}')"
+			#check tmctl ERROR condition
+			if [ $ret == 'ERROR' ]; then
+				q_index=$((q_index + 1))
+				continue
+			fi
+			json_add_object ""
+			json_add_int "qid" "$q_index"
+			json_add_string "iface" "$ifname"
+
+			IFS=$'\n'
+			for stat in $stats; do
+				pname="$(echo $stat | awk '{print$1}')"
+				if [ $pname == 'ret' ]; then
+					continue
+				fi
+
+				val="$(echo $stat | awk '{print$2}')"
+
+				# remove trailing : from the name
+				pname="${pname::-1}"
+				local f_name="/tmp/qos/queue_stats/${ifname}/q_${q_index}/${pname}"
+				# In non BCM968* chips, read operation on queues is actually a read and reset,
+				# so values need to be maintained to present cumulative value
+				if [ $POLICER_SKIP -eq 0 ]; then
+					tmp_val=$(cat $f_name)
+					val=$((val + tmp_val))
+				fi
+				echo $val > $f_name
+
+				# convert to iopsyswrt names
+				case "$pname" in
+					txPackets)
+						json_add_int "tx_packets" "$val"
+						;;
+					txBytes)
+						json_add_int "tx_bytes" "$val"
+						;;
+					droppedPackets)
+						json_add_int "tx_dropped_packets" "$val"
+						;;
+					droppedBytes)
+						json_add_int "tx_dropped_bytes" "$val"
+						;;
+				esac
+			done
+			json_close_object
+
+			q_index=$((q_index + 1))
+		done
+	else
+		for intf in $(db get hw.board.ethernetPortOrder); do
+			ifname=$intf
+			q_index=0
+			max_q_index=$(cat /tmp/qos/queue_stats/${ifname}/q_idx)
+			while :
+			do
+				if [ $q_index -eq $max_q_index ]; then
+					break
+				fi
+				stats="$(tmctl getqstats --devtype 0 --if $ifname --qid $q_index)"
+				ret="$(echo $stats | awk '{print substr($0,0,5)}')"
+				#check tmctl ERROR condition
+				if [ $ret == 'ERROR' ]; then
+					q_index=$((q_index + 1))
+					continue
+				fi
+				json_add_object ""
+				json_add_int "qid" "$q_index"
+				json_add_string "iface" "$ifname"
+
+				IFS=$'\n'
+				for stat in $stats; do
+					pname="$(echo $stat | awk '{print$1}')"
+					if [ $pname == 'ret' ]; then
+						continue
+					fi
+
+					val="$(echo $stat | awk '{print$2}')"
+
+					# remove trailing : from the name
+					pname="${pname::-1}"
+					local f_name="/tmp/qos/queue_stats/${ifname}/q_${q_index}/${pname}"
+					# In non BCM968* chips, read operation on queues is actually a read and reset,
+					# so values need to be maintained to present cumulative value
+					if [ $POLICER_SKIP -eq 0 ]; then
+						tmp_val=$(cat $f_name)
+						val=$((val + tmp_val))
+					fi
+					echo $val > $f_name
+
+					# convert to iopsyswrt names
+					case "$pname" in
+						txPackets)
+							json_add_int "tx_packets" "$val"
+							;;
+						txBytes)
+							json_add_int "tx_bytes" "$val"
+							;;
+						droppedPackets)
+							json_add_int "tx_dropped_packets" "$val"
+							;;
+						droppedBytes)
+							json_add_int "tx_dropped_bytes" "$val"
+							;;
+					esac
+				done
+				json_close_object
+
+				q_index=$((q_index + 1))
+			done
+		done
+	fi
+
+	json_close_array
+	json_dump
+}
+
+get_eth_q_stats() {
+	json_init
+	json_add_array "queues"
+
+	ifname="$1"
+	local tmp_val=0
+
+	# if ifname is empty that is good enough to break
+	if [ -z "$ifname" ];then
+		return
+	fi
+
+	qid="$2"
+	if [ -z "$qid" ];then
+		return
+	fi
+
+	stats="$(tmctl getqstats --devtype 0 --if $ifname --qid $qid)"
+	ret="$(echo $stats | awk '{print substr($0,0,5)}')"
+
+	#check tmctl ERROR condition
+	if [ $ret == 'ERROR' ]; then
+		return
+	fi
+
+	json_add_object ""
+	json_add_int "qid" "$qid"
+	json_add_string "iface" "$ifname"
+
+	IFS=$'\n'
+	for stat in $stats; do
+		pname="$(echo $stat | awk '{print$1}')"
+		if [ $pname == 'ret' ]; then
+			continue
+		fi
+
+		val="$(echo $stat | awk '{print$2}')"
+
+		# remove trailing : from the name
+		pname="${pname::-1}"
+		local f_name="/tmp/qos/queue_stats/${ifname}/q_${qid}/${pname}"
+		# In non BCM968* chips, read operation on queues is actually a read and reset,
+		# so values need to be maintained to present cumulative value
+		if [ $POLICER_SKIP -eq 0 ]; then
+			tmp_val=$(cat $f_name)
+			val=$((val + tmp_val))
+		fi
+		echo $val > $f_name
+
+		# convert to iopsyswrt names
+		case "$pname" in
+			txPackets)
+				json_add_int "tx_packets" "$val"
+			;;
+			txBytes)
+				json_add_int "tx_bytes" "$val"
+			;;
+			droppedPackets)
+				json_add_int "tx_dropped_packets" "$val"
+			;;
+			droppedBytes)
+				json_add_int "tx_dropped_bytes" "$val"
+			;;
+		esac
+	done
+
+	json_close_object
+
+	json_close_array
+	json_dump
+}
+
+read_queue_stats() {
+	itf="$1"
+	q_idx="$2"
+	local cpu_model="$(brcm_fw_tool -k info)"
+
+	case $cpu_model in
+		68*|6755) POLICER_SKIP=1 ;;
+	esac
+
+	if [ -n "$itf" -a -n "$q_idx" ]; then
+		get_eth_q_stats $itf $q_idx
+	else
+		get_queue_stats $itf
+	fi
+}

qosmngr/files/usr/libexec/rpcd/qos

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+include /lib/qos
+
+case "$1" in
+	list)
+		echo '{ "queue_stats": { "ifname":"String", "qid":"Integer" }, "reload": { "section":"String" } }'
+		;;
+	call)
+		case "$2" in
+			queue_stats)
+				read input;
+				json_load "$input"
+				json_get_var iface ifname
+				json_get_var qid qid
+
+				read_queue_stats $iface $qid
+				;;
+			reload)
+				read input;
+				json_load "$input"
+				json_get_var service section
+				reload_qos $service
+				;;
+		esac
+		;;
+esac
+

questd/Makefile

@@ -8,12 +8,11 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=5.2.1
 
-PKG_SOURCE_VERSION:=d554541ac6fb8ef14431fcec9a31dbcb52181279
+PKG_SOURCE_VERSION:=d4ac29b535bf1ec0f58c4c9eea08ec7db08775d1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

questd/files/etc/init.d/quest

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=14
-STOP=89
+STOP=96
 
 USE_PROCD=1
 NAME=questd
@@ -13,6 +13,11 @@ start_service() {
 	procd_close_instance
 }
 
+stop() {
+	#stop_service() is called after procd killed the service
+	echo ;
+}
+
 service_triggers()
 {
 	procd_add_reload_trigger network wireless

rulengd/Makefile

@@ -5,16 +5,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rulengd
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.1.0
 PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
-PKG_SOURCE_VERSION:=360b64ff1a2fe1ad578e298f63a7d6a350f99d93
+PKG_SOURCE_VERSION:=ad94ccdd82b22527ab32937ca1a2682030319ed3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
@@ -27,7 +26,7 @@ include $(INCLUDE_DIR)/cmake.mk
 define Package/rulengd
 	CATEGORY:=Utilities
 	TITLE:=RuleEngine daemon
-	DEPENDS:=+ubox +uci +ubus +libjson-c +libeasy
+	DEPENDS:=+ubox +uci +ubus +libjson-c
 	MENU:=1
 endef
 

shflags/Makefile

@@ -16,7 +16,6 @@ PKG_SOURCE_URL:=https://github.com/kward/shflags.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=c12b30cebb92b49c5edb6df255c0952c65b4ddc6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=daf2a3295872237a9375ba3508105053d889a6df935f670d7d64817a833065ed
 PKG_LICENSE:=LGPL-2.1
 
 include $(INCLUDE_DIR)/package.mk

swmodd/Makefile

@@ -12,7 +12,6 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=c8cc4a3b332ea931dbf2fe7e6b94bebf5c4bcc33
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

topologyd/Makefile

@@ -0,0 +1,41 @@
+#
+# Copyright (C) 2018 iopsys
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=topologyd
+PKG_VERSION:=0.1
+
+PKG_SOURCE_VERSION:=23b812bb512189487484182ab736e957d54da9f3
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/topologyd.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+include $(INCLUDE_DIR)/package.mk
+
+define Package/topologyd
+	CATEGORY:=Utilities
+	DEPENDS:=+libubox +ubus +libpthread +libopenssl +libnl-genl +libnl +libuci +libwifi
+	TITLE:=topology daemon
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include
+
+define Package/topologyd/description
+	gathers topology information and presents it as json structure
+endef
+
+define Package/topologyd/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/topologyd $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,topologyd))

topologyd/files/etc/config/topologyd

@@ -0,0 +1,2 @@
+config topologyd topologyd
+	option debug 1

topologyd/files/etc/init.d/topologyd

@@ -0,0 +1,33 @@
+#!/bin/sh /etc/rc.common
+
+START=14
+STOP=96
+
+USE_PROCD=1
+
+start_service() {
+	procd_open_instance
+	config_load owsd
+	config_get enable ubusproxy enable
+        procd_set_param command "/sbin/topologyd"
+
+	if [ "$enable" == "1" ]
+	then
+		procd_append_param command --root
+	fi
+
+	procd_set_param respawn
+#	procd_set_param stdout 1
+	procd_set_param stderr 1
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger topologyd
+}
+
+reload_service() {
+	stop
+	start
+}

tr098/Config.in

@@ -0,0 +1,11 @@
+if PACKAGE_libtr098
+
+config LIBTR098_VENDOR_PREFIX
+    string "TR-098 Vendor Prefix"
+    default "X_IOPSYS_EU_"
+
+config UPNP_TR064
+	bool "Compile with tr064 features"
+	default n
+	
+endif

tr098/Makefile

@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2019 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libtr098
+PKG_VERSION:=1.0-2020-05-31
+PKG_FIXUP:=autoreconf
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/tr-098
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=dca7ba5ef0c5829ab0f450893cdd7aa077ccc2a8
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libtr098
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library for broadband-forum data model
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace
+endef
+
+define Package/libtr098/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Package/libtr098/description
+ Test description will update later.
+endef
+
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
+define Build/Prepare
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBTR098_VENDOR_PREFIX)\\\"
+
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE -D_AADJ
+
+ifeq ($(CONFIG_UPNP_TR064),y)
+CONFIGURE_ARGS += \
+	--enable-tr064
+endif
+
+define Package/libtr098/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libtr098.so* $(1)/lib/
+	$(INSTALL_DIR) $(1)/etc/tr098
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/tr098
+	$(INSTALL_DIR) $(1)/usr/share/tr098
+	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/tr098
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include/libtr098
+	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libtr098/
+	$(CP) $(PKG_BUILD_DIR)/tr098/*.h $(1)/usr/include/libtr098/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libtr098.{a,so*} $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libtr098))

twamp/src/datamodel.c

@@ -47,11 +47,17 @@ static char *get_last_id(char *package, char *section)
 	return id;
 }
 
+struct ip_args
+{
+	struct uci_section *ip_sec;
+	char *ip_4address;
+};
+
 static int addObjIPInterfaceTWAMPReflector(char *refparam, struct dmctx *ctx, void *data, char **instance)
 {
 	struct uci_section *connection = NULL;
 
-	char *last_inst = get_last_instance_with_option("twamp", "twamp_reflector", "interface", section_name((struct uci_section *)data), "twamp_inst");
+	char *last_inst = get_last_instance_with_option("twamp", "twamp_reflector", "interface", section_name(((struct ip_args *)data)->ip_sec), "twamp_inst");
 	char *id = get_last_id("twamp", "twamp_reflector");
 
 	dmuci_add_section("twamp", "twamp_reflector", &connection);
@@ -59,7 +65,7 @@ static int addObjIPInterfaceTWAMPReflector(char *refparam, struct dmctx *ctx, vo
 	dmuci_set_value_by_section(connection, "twamp_inst", *instance);
 	dmuci_set_value_by_section(connection, "id", id);
 	dmuci_set_value_by_section(connection, "enable", "0");
-	dmuci_set_value_by_section(connection, "interface", section_name((struct uci_section *)data));
+	dmuci_set_value_by_section(connection, "interface", section_name(((struct ip_args *)data)->ip_sec));
 	dmuci_set_value_by_section(connection, "port", "862");
 	dmuci_set_value_by_section(connection, "max_ttl", "1");
 	return 0;
@@ -70,15 +76,16 @@ static int delObjIPInterfaceTWAMPReflector(char *refparam, struct dmctx *ctx, vo
 	int found = 0;
 	struct uci_section *s, *ss = NULL;
 	char *interface;
+	struct uci_section *section = (struct uci_section *)data;
 
 	switch (del_action) {
 		case DEL_INST:
-			dmuci_delete_by_section((struct uci_section *)data, NULL, NULL);
+			dmuci_delete_by_section(section, NULL, NULL);
 			return 0;
 		case DEL_ALL:
 			uci_foreach_sections("twamp", "twamp_reflector", s) {
 				dmuci_get_value_by_section_string(s, "interface", &interface);
-				if (strcmp(interface, section_name((struct uci_section *)data)) != 0)
+				if(strcmp(interface, section_name(((struct ip_args *)data)->ip_sec)) != 0)
 					continue;
 				if (found != 0) {
 					dmuci_delete_by_section(ss, NULL, NULL);
@@ -175,7 +182,7 @@ static int set_IPInterfaceTWAMPReflector_Alias(char *refparam, struct dmctx *ctx
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 64, NULL, NULL))
+			if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -235,7 +242,7 @@ static int set_IPInterfaceTWAMPReflector_IPAllowedList(char *refparam, struct dm
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string_list(value, -1, -1, 255, -1, -1, NULL, NULL))
+			if (dm_validate_string_list(value, -1, -1, 255, -1, -1, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -255,7 +262,7 @@ static int set_IPInterfaceTWAMPReflector_PortAllowedList(char *refparam, struct
 {
 	switch (action)	{
 		case VALUECHECK:
-			if (dm_validate_string_list(value, -1, -1, 255, -1, -1, NULL, NULL))
+			if (dm_validate_string_list(value, -1, -1, 255, -1, -1, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			break;
 		case VALUESET:
@@ -270,7 +277,7 @@ static int browseIPInterfaceTWAMPReflectorInst(struct dmctx *dmctx, DMNODE *pare
 	struct uci_section *s = NULL;
 	char *inst = NULL, *max_inst = NULL;
 
-	uci_foreach_option_eq("twamp", "twamp_reflector", "interface", section_name((struct uci_section *)prev_data), s) {
+	uci_foreach_option_eq("twamp", "twamp_reflector", "interface", section_name(((struct ip_args *)prev_data)->ip_sec), s) {
 
 		inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 3,
 			   s, "twamp_inst", "twamp_alias");

uboot/Makefile

@@ -26,7 +26,6 @@ endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPL-2.0-or-later
 

ubus-mqtt/Makefile

@@ -15,7 +15,6 @@ PKG_SOURCE_URL:=https://dev.iopsys.eu/3rdparty/ubus-mqtt.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=NONE
 

udpechoserver/src/datamodel.c

@@ -62,7 +62,7 @@ static int set_IPDiagnosticsUDPEchoConfig_Interface(char *refparam, struct dmctx
 {
 	switch (action) {
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 256, NULL, NULL))
+			if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			return 0;
 		case VALUESET:
@@ -82,7 +82,7 @@ static int set_IPDiagnosticsUDPEchoConfig_SourceIPAddress(char *refparam, struct
 {
 	switch (action) {
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 45, NULL, IPAddress))
+			if (dm_validate_string(value, -1, 45, NULL, 0, IPAddress, 2))
 				return FAULT_9007;
 			return 0;
 		case VALUESET:

uspd/Makefile

@@ -5,15 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.1.12
+PKG_VERSION:=2.1.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1f7de68f127cb084820deafb6f0c5ced106bbd92
+PKG_SOURCE_VERSION:=1dec7e4bcc8004d142fca195d82a013c1e6dbcb2
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

uspd/files/uspd.init

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=98
+START=94
 STOP=10
 
 USE_PROCD=1

voicesec/Makefile

@@ -16,7 +16,6 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=661c0091e579e284712aeed892e921cc84a6f0bb
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=PROPRIETARY

wfadatad/Makefile

@@ -1,17 +1,16 @@
 #
-# Copyright (C) 2021 IOPSYS Software Solutions AB
+# Copyright (C) 2020 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=3.2.3
+PKG_VERSION:=3.0.1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2bb6f13c4d78115ab4b9485b55f55d72ca5d1040
+PKG_SOURCE_VERSION:=d9f4042963118f6786743554f2fc077f0128bd07
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=PROPRIETARY IOPSYS
@@ -60,7 +59,7 @@ define Package/wfadatad/install
 ifeq ($(CONFIG_WFA_DELM_STANDALONE),y)
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/wfadatad.init $(1)/etc/init.d/wfadatad
+	$(INSTALL_BIN) ./files/wfa_delm.init $(1)/etc/init.d/wfadatad
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wfadatad $(1)/usr/sbin/
 else
 	$(INSTALL_DIR) $(1)/usr/lib/map-plugins

wfadatad/files/wfa_delm.init

@@ -0,0 +1,28 @@
+#!/bin/sh /etc/rc.common
+
+START=98
+STOP=11
+
+USE_PROCD=1
+PROG=/usr/sbin/wfadatad
+
+service_running() {
+	ubus -t 2 wait_for ieee1905
+}
+
+start_service() {
+	procd_open_instance
+	procd_set_param command ${PROG}
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger wireless
+}

wfadatad/files/wfadatad.init

@@ -1,41 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=98
-STOP=11
-
-USE_PROCD=1
-PROG=/usr/sbin/wfadatad
-
-service_running() {
-	ubus -t 2 wait_for ieee1905 map.1905
-}
-
-start_service() {
-	procd_open_instance
-	procd_set_param command "$PROG" "-d"
-	#procd_set_param respawn
-	procd_close_instance
-
-	[ -e "/etc/config/mapcontroller" ] && {
-		local en
-
-		config_load mapcontroller
-		config_get en controller enabled "0"
-
-		[ $en -gt 0 ] && {
-			procd_open_instance
-			procd_set_param command "$PROG" "-d -C"
-			procd_close_instance
-		}
-	}
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger wireless
-}

wifimngr/Makefile

@@ -5,16 +5,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=9.1.1
+PKG_VERSION:=8.3.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=27fa5bd2e4a7cad84bbc6299143695efe3fb9fd0
+PKG_SOURCE_VERSION:=7e1f7b600d93bc3f29fdc624040f4710e0d4623e
 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
-PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -49,9 +48,14 @@ endef
 endif
 
 define Package/wifimngr/install
-	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/wifimngr.init $(1)/etc/init.d/wifimngr
+#	$(INSTALL_DIR) $(1)/lib/upgrade/post-rootfs-fixup.d
+#	$(INSTALL_BIN) ./files/*-uci-wireless $(1)/lib/upgrade/post-rootfs-fixup.d
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wifimngr $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/button
+	$(INSTALL_BIN) ./files/wifi.button.hotplug $(1)/etc/hotplug.d/button/05-wifi
 endef
 
 $(eval $(call BuildPackage,wifimngr))

wifimngr/files/214-uci-wireless

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# As part of sysupgrade we migrate the users custom changes to the
+# new fs. (Those which differ from the first boot defaults.)
+
+
+# Abort on any error.
+set -e
+
+
+# Do nothing if user want to discard old settings.
+if [ -n "$SAVE_CONFIG" ] && [ $SAVE_CONFIG -eq 0 ]; then
+	exit 0
+fi
+
+# Source functions.
+for f in /lib/upgrade/iopsys*.sh; do
+	[ -r "$f" -a -s "$f" ] || continue
+	source $f
+done
+
+
+# Does this system has WiFi?
+hasWifi=$(chroot "${2}" db -q get hw.board.hasWifi)
+[ "$hasWifi" = "1" ] || exit 0
+
+
+uci_possibly_migrate_package "wireless" "$2" || exit
+
+# Report success.
+log "post-hooks" "UCI wireless migrated."
+
+exit 0
+

wifimngr/files/etc/ruleng/wps.json

@@ -1,112 +0,0 @@
-{
-	"wps_active": {
-		"if_operator" : "OR",
-		"if" : [
-			{
-				"event": "wifi.ap",
-				"match": {
-					"event":"wps-pbc-active"
-				}
-			},
-			{
-				"event": "wifi.bsta",
-				"match": {
-					"event":"wps-pbc-active"
-				}
-			}
-		],
-		"then" : [
-			{
-				"object": "led.wps",
-				"method":"set",
-				"args" : {
-					"state": "notice"
-				},
-				"timeout": 1
-			}
-		]
-	},
-	"wps_success": {
-		"if_operator" : "OR",
-		"if" : [
-			{
-				"event": "wifi.ap",
-				"match": {
-					"event":"wps-reg-success"
-				}
-			},
-			{
-				"event": "wifi.bsta",
-				"match": {
-					"event":"wps-success"
-				}
-			}
-		],
-		"then" : [
-			{
-				"object": "led.wps",
-				"method":"set",
-				"args" : {
-					"state": "ok",
-					"timeout": 120
-				},
-				"timeout": 1
-			}
-		]
-	},
-	"wps_timeout": {
-		"if_operator" : "OR",
-		"if" : [
-			{
-				"event": "wifi.ap",
-				"match": {
-					"event":"wps-timeout"
-				}
-			},
-			{
-				"event": "wifi.bsta",
-				"match": {
-					"event":"wps-timeout"
-				}
-			}
-		],
-		"then" : [
-			{
-				"object": "led.wps",
-				"method":"set",
-				"args" : {
-					"state": "off"
-				},
-				"timeout": 1
-			}
-		]
-	},
-	"wps_overlap": {
-		"if_operator" : "OR",
-		"if" : [
-			{
-				"event": "wifi.ap",
-				"match": {
-					"event":"wps-overlap"
-				}
-			},
-			{
-				"event": "wifi.bsta",
-				"match": {
-					"event":"wps-overlap"
-				}
-			}
-		],
-		"then" : [
-			{
-				"object": "led.wps",
-				"method":"set",
-				"args" : {
-					"state": "error",
-					"timeout": 120
-				},
-				"timeout": 1
-			}
-		]
-	}
-}

wifimngr/files/etc/uci-defaults/ruleng.wps

@@ -1,2 +0,0 @@
-uci -q set ruleng.wps=rule
-uci -q set ruleng.wps.recipe='/etc/ruleng/wps.json'

wifimngr/files/wifi.button.hotplug

@@ -20,13 +20,6 @@ wifi_onoff() {
 	/sbin/wifi reload &
 }
 
-start_ap_wps() {
-	for ap in $(ubus list |grep hostapd.)
-	do
-		ubus call $ap wps_start
-	done
-}
-
 case "$ACTION" in
         add|register)
 		[ "wifibutton" == "$INTERFACE" ] && {
@@ -37,14 +30,7 @@ case "$ACTION" in
 		[ "wpsbutton" == "$INTERFACE" ] && {
 			[ -e "/tmp/wps_active" ] && return
 			echo "WPS button is pressed" > /dev/console
-			# TODO: Proper implementation
-			#ubus call wifi.wps start
-			wpasupp="$(ubus list wpa_supplicant.* | head -1)"
-			if [ -n "$wpasupp" ]; then
-				ubus -t 1 call $wpasupp wps_start
-			else
-				start_ap_wps
-			fi
+			ubus call wifi.wps start
 		}
         ;;
 esac

xmpp/src/datamodel.c

@@ -171,7 +171,7 @@ static int set_xmpp_connection_alias(char *refparam, struct dmctx *ctx, void *da
 
 	switch (action) {
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 64, NULL, NULL))
+			if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			return 0;
 		case VALUESET:
@@ -193,7 +193,7 @@ static int set_xmpp_connection_username(char *refparam, struct dmctx *ctx, void
 {
 	switch (action) {
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 256, NULL, NULL))
+			if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			return 0;
 		case VALUESET:
@@ -214,7 +214,7 @@ static int set_xmpp_connection_password(char *refparam, struct dmctx *ctx, void
 {
 	switch (action) {
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 256, NULL, NULL))
+			if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			return 0;
 		case VALUESET:
@@ -235,7 +235,7 @@ static int set_xmpp_connection_domain(char *refparam, struct dmctx *ctx, void *d
 {
 	switch (action) {
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 64, NULL, NULL))
+			if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			return 0;
 		case VALUESET:
@@ -256,7 +256,7 @@ static int set_xmpp_connection_resource(char *refparam, struct dmctx *ctx, void
 {
 	switch (action) {
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 64, NULL, NULL))
+			if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			return 0;
 		case VALUESET:
@@ -277,7 +277,7 @@ static int set_xmpp_connection_server_connect_algorithm(char *refparam, struct d
 {
 	switch (action) {
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, -1, ServerConnectAlgorithm, NULL))
+			if (dm_validate_string(value, -1, -1, ServerConnectAlgorithm, 4, NULL, 0))
 				return FAULT_9007;
 			return 0;
 		case VALUESET:
@@ -488,7 +488,7 @@ static int set_xmpp_connection_server_alias(char *refparam, struct dmctx *ctx, v
 
 	switch (action) {
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 64, NULL, NULL))
+			if (dm_validate_string(value, -1, 64, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			return 0;
 		case VALUESET:
@@ -510,7 +510,7 @@ static int set_xmpp_connection_server_server_address(char *refparam, struct dmct
 {
 	switch (action) {
 		case VALUECHECK:
-			if (dm_validate_string(value, -1, 256, NULL, NULL))
+			if (dm_validate_string(value, -1, 256, NULL, 0, NULL, 0))
 				return FAULT_9007;
 			return 0;
 		case VALUESET: