Redmine#27829 - easy-soc-libs: Use correct chipset defintions

The struct for passing ioctl() data does differ in size
(and offsets) on different platforms, hence we need to pass
the correct defines to the compiler.

Change-Id: If81a4bd79b21c5e93443e5ef48fb3f1b07058f60

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/Config_bbfdm.in

@@ -1,27 +1,27 @@
 if PACKAGE_libbbfdm
 
-config BBF_VENDOR_EXTENSION
-	bool "Enable Vendor Extension"
-	default y
-
-config BBF_VENDOR_LIST
-	string "Vendor List"
-	default "iopsys"
-
-config BBF_VENDOR_PREFIX
-	string "Vendor Prefix"
-	default "X_IOPSYS_EU_"
+config LIBBBFDM_VENDOR_PREFIX
+    string "Vendor Prefix"
+    default "X_IOPSYS_EU_"
 
 config BBF_TR181
-	bool "Enable TR-181 Data Model Support"
+	bool "Compile with tr181 device features"
 	default y
 
 config BBF_TR104
-	bool "Enable TR-104 Data Model Support"
+	bool "Compile with tr104 voice features"
 	default y
 
 config BBF_TR143
-	bool "Enable TR-143 Data Model Support"
+	bool "Compile with tr143 diagnostics features"
 	default y
 
+config BBF_TR157
+	bool "Compile with tr157 bulkdata collector features"
+	default y
+	
+config BBF_TR064
+	bool "Compile with tr064 features"
+	default n
+
 endif

bbf/Makefile

@@ -1,18 +1,17 @@
 #
-# Copyright (C) 2021 IOPSYS
+# Copyright (C) 2019 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=4.1.2
+PKG_VERSION:=1.6-2020-08-25
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3034c1b324937fdccafa92e706e5986dc7a78df7
+PKG_SOURCE_VERSION:=bfe14a431d408614ed30e2d831ebd927eab719e2
 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)
@@ -25,7 +24,6 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libbbf_api
   SECTION:=libs
   CATEGORY:=Libraries
-  SUBMENU:=BBF
   TITLE:=Library for libbbfdm API
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef
@@ -33,9 +31,8 @@ endef
 define Package/libbbfdm
   SECTION:=libs
   CATEGORY:=Libraries
-  SUBMENU:=BBF
   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
@@ -47,7 +44,7 @@ define Package/libbbf_api/description
 endef
 
 define Package/libbbfdm/description
- Library contains the data model tree. It includes TR181, TR104 and TR143 data models
+ Library contains the data model tree. It includes TR181, TR104, TR143, TR157 and TR064 data models
 endef
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
@@ -57,8 +54,7 @@ define Build/Prepare
 endef
 endif
 
-TARGET_CFLAGS += -DBBF_VENDOR_LIST=\\\"$(CONFIG_BBF_VENDOR_LIST)\\\"
-TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBBBFDM_VENDOR_PREFIX)\\\"
 
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
@@ -78,6 +74,16 @@ CONFIGURE_ARGS += \
 	--enable-tr143
 endif
 
+ifeq ($(CONFIG_BBF_TR157),y)
+CONFIGURE_ARGS += \
+	--enable-tr157
+endif
+
+ifeq ($(CONFIG_BBF_TR064),y)
+CONFIGURE_ARGS += \
+	--enable-tr064
+endif
+
 ifeq ($(CONFIG_PACKAGE_libopenssl),y)
 CONFIGURE_ARGS += \
 	--enable-libopenssl
@@ -88,15 +94,6 @@ CONFIGURE_ARGS += \
 	--enable-libmbedtls
 endif
 
-ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
-CONFIGURE_ARGS += \
-	--enable-vendor-extension
-
-CONFIGURE_ARGS += \
-	BBF_VENDOR_LIST="$(CONFIG_BBF_VENDOR_LIST)"
-
-endif ##CONFIG_BBF_VENDOR_EXTENSION
-
 define Package/libbbf_api/install
 	$(INSTALL_DIR) $(1)/lib
 	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
@@ -105,24 +102,20 @@ endef
 define Package/libbbfdm/install
 	$(INSTALL_DIR) $(1)/lib
 	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm
-	$(CP) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm
-	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/bbfdm
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm
+	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 endef
 
-define Package/libbbfdm/prerm
-	#!/bin/sh
-	rm -rf /etc/bbfdm/*
-	exit 0
-endef
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
 	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
 	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
+	$(CP) $(PKG_BUILD_DIR)/dmtree/tr181/*.h $(1)/usr/include/libbbfdm/
+	$(CP) $(PKG_BUILD_DIR)/dmtree/tr157/*.h $(1)/usr/include/libbbfdm/
 	$(CP) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/

bulkdata/Makefile

@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2020 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bulkdata
-PKG_VERSION:=1.0.1
-
-PKG_SOURCE_VERSION:=e4f39d1bf4678fc05b9d02e81b194c70719909e4
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.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)
-
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=BBF BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm +libbbf_api
-endef
-
-define Package/$(PKG_NAME)/description
-	BBF BulkData Collection
-endef
-
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib/bbfdm
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

bulkdata/files/etc/config/bulkdata

@@ -1,43 +0,0 @@
-
-config bulkdata 'bulkdata'
-	option enable '0'
-	#Log levels: Critical=0, Warning=1, Notice=2, Info=3, Debug=4
-	option log_level '3'
-
-config profile
-	option profile_id '1'
-	option enable '0'
-	option name ''
-	option nbre_of_retained_failed_reports '0'
-	option protocol 'http'
-	option encoding_type ''
-	option reporting_interval '86400'
-	option time_reference '0'
-	option csv_encoding_field_separator ','
-	option csv_encoding_row_separator '
'
-	option csv_encoding_escape_character '"'
-	option csv_encoding_report_format 'column'
-	option csv_encoding_row_time_stamp 'unix'
-	option json_encoding_report_format 'objecthierarchy'
-	option json_encoding_report_time_stamp 'unix'
-	option http_url ''
-	option http_username ''
-	option http_password ''
-	option http_compression 'none'
-	option http_method 'post'
-	option http_use_date_header '1'
-	option http_retry_enable '0'
-	option http_retry_minimum_wait_interval '5'
-	option http_retry_interval_multiplier '2000'
-	option http_persist_across_reboot '0'
-
-config profile_parameter
-	option profile_id '1'
-	option name ''
-	option reference ''
-
-config profile_http_request_uri_parameter
-	option profile_id '1'
-	option name ''
-	option reference ''
-

bulkdata/files/etc/init.d/bulkdatad

@@ -1,34 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Bulkdata Software
-# Copyright (C) 2020 iopsys Software Solutions AB
-# Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-
-START=99
-STOP=10
-
-USE_PROCD=1
-PROG="/usr/sbin/bulkdatad"
-
-start_service() {
-	local bulkdata_enable=`uci -q get bulkdata.bulkdata.enable`
-	if [ "$bulkdata_enable" = "1" ]; then
-		procd_open_instance
-		procd_set_param command "$PROG"
-		procd_set_param respawn "3" "7" "0"
-		procd_close_instance
-	fi
-}
-
-boot() {
-	start
-}
-
-reload_service() {
-	stop
-	start 
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger bulkdata
-}

bulut/Makefile

@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2019 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bulut
-PKG_VERSION:=0.2
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bulut/bulut-gw-client.git
-PKG_SOURCE_VERSION:=227700c44817afa2c392fa08bf4cf70fa6177f01
-
-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)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bulut
-	CATEGORY:=Utilities
-	DEPENDS:=
-	TITLE:=bulut
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include
-
-define Package/bulut/description
-	obuspa keys
-endef
-
-define Package/bulut/install
-	$(CP)  $(PKG_BUILD_DIR)/files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,bulut))

catv/files/etc/init.d/catv

@@ -1,4 +1,7 @@
 #!/bin/sh /etc/rc.common
+#
+# Copyright (C) 2015 inteno.org
+#
 
 START=71
 USE_PROCD=1

cifsd-tools/Makefile

@@ -0,0 +1,53 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=cifsd-tools
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/namjaejeon/cifsd-tools.git
+PKG_SOURCE_DATE:=2019-02-14
+PKG_SOURCE_VERSION:=a7d7dfc40524b88dbcb2052034a75f446b3cefdd
+PKG_MIRROR_HASH:=a74f95a79c3cdcc78e66c080729141abee0d821e21a326d88b11d849738314fb
+
+PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
+PKG_REMOVE_FILES:=autogen.sh aclocal.m4
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/cifsd-tools
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Filesystem
+  TITLE:=Kernel CIFS/SMB server support and userspace tools
+  DEPENDS:=+kmod-fs-cifsd +glib2 +libnl-core +libnl-genl $(ICONV_DEPENDS)
+endef
+
+define Package/cifsd-tools/description
+  Userspace tools (cifsd, cifsadmin) for the CIFS/SMB kernel fileserver.
+  The config file location is /etc/cifs/smb.conf
+endef
+
+define Package/cifsd-tools/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcifsdtools.so* $(1)/usr/lib/
+
+	$(INSTALL_DIR) $(1)/etc/cifs
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/smb.conf.example $(1)/etc/cifs
+
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/cifsd.config $(1)/etc/config/cifsd
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/cifsd.init $(1)/etc/init.d/cifsd
+
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{cifsadmin,cifsd} $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,cifsd-tools))

cifsd-tools/files/cifsd.config

@@ -0,0 +1,9 @@
+config global 'global'
+	option server_string	'CIFSD on OpenWRT'
+	option ipc_timeout	'8' # IPC timeout is used as a workaround for uninterruptible sleep until this is fixed upstream.
+
+config share
+	option name	'share'
+	option comment	'Default guest share'
+	option path	'/mnt'
+	option guest_ok	'yes'

cifsd-tools/files/cifsd.init

@@ -0,0 +1,161 @@
+#!/bin/sh /etc/rc.common
+
+START=90
+USE_PROCD=1
+PROG=/usr/sbin/cifsd
+USER_DB=/etc/cifs/cifsdpwd.db
+CIFS_ADMIN=cifsadmin
+
+EXTRA_COMMANDS="users"
+EXTRA_HELP="	users	Show list of users created by cifsadmin"
+
+users() {
+	[ -f "$USER_DB" ] && cut -d ':' $USER_DB -f1 || \
+		printf "No users available.\n"
+}
+
+validate_cifsd_global() {
+	uci_validate_section cifsd global global \
+		'server_string:string' \
+		'workgroup:string' \
+		'netbios_name:string' \
+		'interface:string' \
+		'ipc_timeout:uinteger'
+}
+
+validate_cifsd_share() {
+	uci_validate_section cifsd share "${1}" \
+		'name:string' \
+		'comment:string' \
+		'path:string' \
+		'guest_ok:bool' \
+		'read_only:bool' \
+		'allow_hosts:list' \
+		'deny_hosts:list' \
+		'users:string' \
+		'invalid_users:string' \
+		'create_mask:string' \
+		'dir_mask:string' \
+		'max_connections:uinteger' \
+		'veto_files:list'
+}
+
+validate_cifsd_users() {
+	uci_validate_section cifsd users "${1}" \
+		'user:string' \
+		'password:string' \
+		'desc:string'
+}
+
+load_cifsd_global() {
+	local server_string
+	local workgroup
+	local netbios_name
+	local ipc_timeout
+
+	validate_cifsd_global
+
+	echo -e "[global]" >> /var/etc/cifsd.conf
+	[ -n "$server_string" ] && echo -e "\tserver string = $server_string" >> /var/etc/cifsd.conf
+	[ -n "$workgroup" ] && echo -e "\tworkgroup = $workgroup" >> /var/etc/cifsd.conf
+	[ -n "$netbios_name" ] && echo -e "\tnetbios name = $netbios_name" >> /var/etc/cifsd.conf
+	[ -n "$ipc_timeout" ] && echo -e "\tipc timeout name = $ipc_timeout" >> /var/etc/cifsd.conf || \
+		echo -e "\tipc timeout name = 8" >> /var/etc/cifsd.conf
+}
+
+load_cifsd_share() {
+	local name
+	local comment
+	local path
+	local guest_ok
+	local allow_hosts
+	local deny_hosts
+	local users
+	local invalid_users
+	local max_connections
+	local veto_files
+	local dir_mask
+	local create_mask
+	local read_only
+
+	validate_cifsd_share ${1}
+
+	if [ -z "$name" -o -z "$path" ]; then
+		logread -t ${0} "Missing name or path."
+		return
+	fi
+
+	echo -e "\n[$name]\n\tpath = $path" >> /var/etc/cifsd.conf
+	[ -n "$comment" ] && echo -e "\tcomment = $comment" >> /var/etc/cifsd.conf
+	[ -n "$guest_ok" ] && echo -e "\tguest ok = $guest_ok" >> /var/etc/cifsd.conf
+	[ -n "$allow_hosts" ] && echo -e "\tallow hosts = $allow_hosts" >> /var/etc/cifsd.conf
+	[ -n "$deny_hosts" ] && echo -e "\tdeny hosts = $deny_hosts" >> /var/etc/cifsd.conf
+	[ -n "$users" ] && echo -e "\tvalid users = $users" >> /var/etc/cifsd.conf
+	[ -n "$invalid_users" ] && echo -e "\tinvalid users = $invalid_users" >> /var/etc/cifsd.conf
+	[ -n "$max_connections" ] && echo -e "\tmax connections = $max_connections" >> /var/etc/cifsd.conf
+	[ -n "$create_mask" ] && echo -e "\tcreate mask = $create_mask" >> /var/etc/cifsd.conf
+	[ -n "$dir_mask" ] && echo -e "\tdirectory mask = $dir_mask" >> /var/etc/cifsd.conf
+
+	if [ -n "$read_only" ]; then
+		echo -e "\tread only = $read_only" >> /var/etc/cifsd.conf
+		if [ "${read_only}" -eq "0" ]; then
+			echo -e "\twrite ok = 1" >> /var/etc/cifsd.conf
+		fi
+	else
+		echo -e "\twrite ok = 1" >> /var/etc/cifsd.conf
+	fi
+
+	[ -n "$veto_files" ] && echo -e "\tveto files = $veto_files" >> /var/etc/cifsd.conf
+}
+
+load_cifsd_users() {
+	local user
+	local password
+	local desc
+
+	validate_cifsd_users ${1}
+	[ $(which ${CIFS_ADMIN}) ] || {
+		logread -t ${0} "${CIFS_ADMIN} tools is not available"
+		return;
+	}
+
+	cifsadmin -a "${user}" -p "${password}"
+	if [ "$?" -ne 0 ]; then
+		logread -t ${0} "Failed to create/update ${user}"
+	fi
+}
+
+service_triggers()
+{
+	procd_add_config_trigger "config.change" "cifsd" /etc/init.d/cifsd restart
+}
+
+init_config() {
+	[ -f "/var/etc/cifsd.conf" ] && rm /var/etc/cifsd.conf
+
+	config_load cifsd
+	load_cifsd_global
+
+	# Delete existing users
+	[ -f "${USER_DB}" ] && {
+		rm -f "${USER_DB}"
+	}
+	config_foreach load_cifsd_users users
+	config_foreach load_cifsd_share share
+}
+
+start_service() {
+	. /lib/functions.sh
+	init_config
+
+	[ ! "$(grep cifsd /proc/modules)" ] && modprobe cifsd
+	procd_open_instance
+	procd_set_param command /usr/bin/env LANG=en_US.UTF-8 $PROG -c /var/etc/cifsd.conf
+	procd_set_param respawn
+	procd_close_instance
+}
+
+stop_service() {
+	killall cifsd
+	# IPC timeout will kill the remaining processes.
+}

cifsd/001-fix_implicit_declarations.patch

@@ -0,0 +1,73 @@
+For some reason, fs.h on Inteno kernel is missing inode->i_mutex nesting subclasses for the lock validator
+which is triggering implicit declaration error. To workaround this hardcore use of mutex_lock by removing
+kernel version check.
+---
+--- a/vfs.c
++++ b/vfs.c
+@@ -544,15 +544,9 @@ int cifsd_vfs_setattr(struct cifsd_work
+ 
+ 	attrs->ia_valid |= ATTR_CTIME;
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_lock(inode);
+-	err = notify_change(dentry, attrs, NULL);
+-	inode_unlock(inode);
+-#else
+ 	mutex_lock(&inode->i_mutex);
+ 	err = notify_change(dentry, attrs, NULL);
+ 	mutex_unlock(&inode->i_mutex);
+-#endif
+ 
+ 	if (update_size)
+ 		put_write_access(inode);
+@@ -753,11 +747,8 @@ int cifsd_vfs_remove_file(char *name)
+ 	if (!dir->d_inode)
+ 		goto out;
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_lock_nested(dir->d_inode, I_MUTEX_PARENT);
+-#else
+ 	mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
+-#endif
++
+ 	dentry = lookup_one_len(last, dir, strlen(last));
+ 	if (IS_ERR(dentry)) {
+ 		err = PTR_ERR(dentry);
+@@ -783,11 +774,7 @@ int cifsd_vfs_remove_file(char *name)
+ 
+ 	dput(dentry);
+ out_err:
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_unlock(dir->d_inode);
+-#else
+ 	mutex_unlock(&dir->d_inode->i_mutex);
+-#endif
+ out:
+ 	path_put(&parent);
+ 	return err;
+@@ -1302,11 +1289,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
+ 	int err = 0;
+ 
+ 	dget(dentry);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_lock(dir->d_inode);
+-#else
+ 	mutex_lock(&dir->d_inode->i_mutex);
+-#endif
++
+ 	if (!dentry->d_inode || !dentry->d_inode->i_nlink) {
+ 		err = -ENOENT;
+ 		goto out;
+@@ -1318,11 +1302,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
+ 		err = vfs_unlink(dir->d_inode, dentry, NULL);
+ 
+ out:
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_unlock(dir->d_inode);
+-#else
+ 	mutex_unlock(&dir->d_inode->i_mutex);
+-#endif
++
+ 	dput(dentry);
+ 	if (err)
+ 		cifsd_debug("failed to delete, err %d\n", err);

cifsd/Makefile

@@ -0,0 +1,60 @@
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=cifsd
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/namjaejeon/cifsd.git
+PKG_SOURCE_DATE:=2019-03-05
+PKG_SOURCE_VERSION:=e1715ce125d55b125b1b58a6f1819ef8e54cc3ba
+PKG_MIRROR_HASH:=521585ebfda0ecc02372b1a38ebf762fbbcead6d0b754a47599a5bf6bfdb3fb6
+
+PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/fs-cifsd
+	SUBMENU:=Filesystems
+	TITLE:=CIFS/SMB kernel server support
+	FILES:=$(PKG_BUILD_DIR)/cifsd.$(LINUX_KMOD_SUFFIX)
+	DEPENDS+= \
+		+kmod-nls-base \
+		+kmod-nls-utf8 \
+		+kmod-crypto-md4 \
+		+kmod-crypto-md5 \
+		+kmod-crypto-hmac \
+		+kmod-crypto-ecb \
+		+kmod-crypto-des \
+		+kmod-crypto-sha256 \
+		+kmod-crypto-cmac \
+		+kmod-crypto-sha512 \
+		+kmod-crypto-aead \
+		+kmod-crypto-ccm
+	KCONFIG:= \
+		CONFIG_KEYS=y \
+		CONFIG_CRYPTO_ARC4=y
+endef
+
+define KernelPackage/fs-cifsd/description
+	Kernel module for a CIFS/SMBv2,3 fileserver.
+endef
+
+TARGET_CFLAGS+= -DCONFIG_CIFSD_ACL
+
+MAKE_OPTS:=\
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	M="$(PKG_BUILD_DIR)"
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CONFIG_CIFS_SERVER=m \
+		modules
+endef
+
+$(eval $(call KernelPackage,fs-cifsd))

cifsd/patches/001-fix_implicit_declarations.patch

@@ -0,0 +1,69 @@
+--- a/vfs.c
++++ b/vfs.c
+@@ -544,15 +544,9 @@ int cifsd_vfs_setattr(struct cifsd_work
+ 
+ 	attrs->ia_valid |= ATTR_CTIME;
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_lock(inode);
+-	err = notify_change(dentry, attrs, NULL);
+-	inode_unlock(inode);
+-#else
+ 	mutex_lock(&inode->i_mutex);
+ 	err = notify_change(dentry, attrs, NULL);
+ 	mutex_unlock(&inode->i_mutex);
+-#endif
+ 
+ 	if (update_size)
+ 		put_write_access(inode);
+@@ -753,11 +747,8 @@ int cifsd_vfs_remove_file(char *name)
+ 	if (!dir->d_inode)
+ 		goto out;
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_lock_nested(dir->d_inode, I_MUTEX_PARENT);
+-#else
+ 	mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
+-#endif
++
+ 	dentry = lookup_one_len(last, dir, strlen(last));
+ 	if (IS_ERR(dentry)) {
+ 		err = PTR_ERR(dentry);
+@@ -783,11 +774,7 @@ int cifsd_vfs_remove_file(char *name)
+ 
+ 	dput(dentry);
+ out_err:
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_unlock(dir->d_inode);
+-#else
+ 	mutex_unlock(&dir->d_inode->i_mutex);
+-#endif
+ out:
+ 	path_put(&parent);
+ 	return err;
+@@ -1302,11 +1289,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
+ 	int err = 0;
+ 
+ 	dget(dentry);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_lock(dir->d_inode);
+-#else
+ 	mutex_lock(&dir->d_inode->i_mutex);
+-#endif
++
+ 	if (!dentry->d_inode || !dentry->d_inode->i_nlink) {
+ 		err = -ENOENT;
+ 		goto out;
+@@ -1318,11 +1302,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
+ 		err = vfs_unlink(dir->d_inode, dentry, NULL);
+ 
+ out:
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
+-	inode_unlock(dir->d_inode);
+-#else
+ 	mutex_unlock(&dir->d_inode->i_mutex);
+-#endif
++
+ 	dput(dentry);
+ 	if (err)
+ 		cifsd_debug("failed to delete, err %d\n", err);

crashlog/readme

@@ -24,7 +24,7 @@ What we need is the public key for the clients.
 For dropbear "dropbearkey -y -f files/etc/dropbear/logid" will generate the public key.
 
 ----------
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwn9RaDAzxW1dTmIhXgFBnpi1lhj8xhYpCVQiPxxdk9IEmH8zjo4y9j3sPkqKOlRnkwjpZIpLEKBnpQTwVIMCU/AG7nDJX3OH9RfS9mLJQLfFL8HyGCyqDezFWldbyovhJZvdUeK4tAXJWv2W3OVHiz2L8IlncBgP/E9DJElsyhhQHsM96UE6tBkXsvXkoDbMSYXFcLbgiUwBKfmM2BF/aPDL45iznGur7/2j9v95PwJ0gtMu9jjNRq+pXCXhTh3bsnczm0MpZC1aiRc9nJAeGIMmhrf15E4jBKgTnrstzJxGVAdajKeR954KcNsS33cS2Wmui2YjmPbBXjqf1frzJ log@iopsys
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwn9RaDAzxW1dTmIhXgFBnpi1lhj8xhYpCVQiPxxdk9IEmH8zjo4y9j3sPkqKOlRnkwjpZIpLEKBnpQTwVIMCU/AG7nDJX3OH9RfS9mLJQLfFL8HyGCyqDezFWldbyovhJZvdUeK4tAXJWv2W3OVHiz2L8IlncBgP/E9DJElsyhhQHsM96UE6tBkXsvXkoDbMSYXFcLbgiUwBKfmM2BF/aPDL45iznGur7/2j9v95PwJ0gtMu9jjNRq+pXCXhTh3bsnczm0MpZC1aiRc9nJAeGIMmhrf15E4jBKgTnrstzJxGVAdajKeR954KcNsS33cS2Wmui2YjmPbBXjqf1frzJ log@inteno
 ----------
 
 The public key should be just one line. Add that line to the 

crun/Makefile

@@ -1,82 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=crun
-PKG_VERSION:=0.18
-PKG_RELEASE:=$(AUTORELEASE)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/containers/crun.git
-PKG_SOURCE_DATE:=2021-03-18
-PKG_SOURCE_VERSION:=496e81bdd69f117f10e4477e4204e4611a94b68f
-PKG_MIRROR_HASH:=26941b0d84bbeabeb5e982af48d131f55d0aa16f4a2f2ca3279a5c812cdeea8b
-
-PKG_BUILD_DEPENDS:=argp-standalone
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
-PKG_LICENSE:=GPL-2.0-or-later
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/crun
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=crun
-  URL:=https://github.com/containers/crun
-  DEPENDS:=@!arc +libseccomp +libcap
-endef
-
-define Package/crun/description
-  A fast and low-memory footprint OCI Container Runtime fully written in C.
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-systemd \
-	--enable-embedded-yajl \
-	--enable-caps \
-	--enable-dl \
-	--enable-seccomp \
-	--enable-bpf
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(SED) '/#include <git-version.h>/d' $(PKG_BUILD_DIR)/src/crun.c
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default)
-
-	$(SED) '/#define PACKAGE \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define VERSION \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define GIT_VERSION \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define PACKAGE_BUGREPORT \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define PACKAGE_NAME \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define PACKAGE_STRING \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define PACKAGE_TARNAME \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define PACKAGE_VERSION \"/d' $(PKG_BUILD_DIR)/config.h
-
-	echo "#define PACKAGE \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define VERSION \"$(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define PACKAGE_NAME \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define PACKAGE_VERSION \"$(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define PACKAGE_STRING \"$(PKG_NAME) $(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define PACKAGE_TARNAME \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define PACKAGE_BUGREPORT \"bugs@openwrt.org\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define GIT_VERSION \"$(PKG_SOURCE_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
-endef
-
-define Package/crun/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/crun $(1)/usr/bin/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/crun $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcrun.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,crun))

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.12
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=db155c063a9875026e573bbd292dec484fc3f103
-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/dectmngr

@@ -1,66 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-source /lib/functions/uci-defaults.sh
-
-START=70
-STOP=12
-
-USE_PROCD=1
-NAME=dectmngr
-PROG=/usr/sbin/dectmngr
-LOG_PATH=/var/log/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() {
-	local rfpi=
-	local opt_rfpi=
-	test $(db get hw.board.hasDect) = "0" && return
-
-	echo 1 > /sys/class/gpio/gpio14/value
-
-	rfpi=$(db -q get hw.board.dect_rfpi)
-	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_rfpi="-rfpi $rfpi"
-
-	procd_open_instance
-	procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_rfpi
-	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
-
-	[ ! -d $LOG_PATH ] && mkdir -p $LOG_PATH
-	start
-}
-

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

@@ -8,15 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.0.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d17c699c1fc9588303d6da35ac2250903bf17cd8
+PKG_SOURCE_VERSION:=63525fe43aa57a710bb097e4c0ed496c4032db6d
 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)
@@ -26,7 +25,9 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+  TARGET_PLATFORM=BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
@@ -44,7 +45,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-qos/Makefile

@@ -19,7 +19,7 @@ define Package/easy-qos
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_intel_mips||TARGET_iopsys_brcm63xx_arm)
+  DEPENDS:=@(TARGET_intel_mips||TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_brcm63xx_mips)
 endef
 
 define Package/easy-qos/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.2.12
+PKG_VERSION:=3.3.12
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=48b9abce9acace69a9b270ed4438b80434fc3446
+PKG_SOURCE_VERSION:=f508577fae01c4820fad884a5a0847d26104721c
 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,21 +29,61 @@ 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
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+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_mips),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
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
+  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+  TARGET_PLATFORM=BROADCOM
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
+  ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_panther),y)
+    TARGET_CFLAGS +=-DCONFIG_BCM96846
+  else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_tiger),y)
+    TARGET_CFLAGS +=-DCONFIG_BCM96858
+  else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_eagle),y)
+    TARGET_CFLAGS +=-DCONFIG_BCM963178
+  else
+    TARGET_CFLAGS +=-DCONFIG_BCM963138
+  endif
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
   TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
+else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
+  TARGET_PLATFORM=MARVELL
+  TARGET_CFLAGS +=-DIOPSYS_MARVELL
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+  TARGET_PLATFORM=INTEL
+  TARGET_CFLAGS +=-DIOPSYS_INTEL
 else ifeq ($(CONFIG_TARGET_iopsys_x86),y)
   TARGET_PLATFORM=TEST
   TARGET_CFLAGS +=-DIOPSYS_TEST
@@ -52,30 +91,26 @@ else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
   TARGET_PLATFORM=TEST
   TARGET_CFLAGS +=-DIOPSYS_TEST
 else
-  $(info Unexpected CONFIG_TARGET, use default MAC80211)
-  TARGET_PLATFORM=MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_MAC80211
+  $(info Unexpected CONFIG_TARGET)
 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 \
@@ -95,36 +130,78 @@ 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/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,44 +0,0 @@
-
-define Package/libdsl
-  $(call Package/easy-soc-libs)
-  TITLE:= xDSL library (libdsl)
-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

@@ -6,28 +6,30 @@
 #
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=endptmngr
-PKG_VERSION:=0.4
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=b94de01a4ff24bb4d31bb16b3be9e1b1859359dd
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-
+PKG_RELEASE:=1
+PKG_VERSION:=0.3
+PKG_SOURCE_VERSION:=34ae1996beda98691d779e49f231bd662fc87cda
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
+ifeq ($(CONFIG_ENDPT_OPEN),y)
+BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
+PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
+PKG_NAME:=endptmngr-open
+PATCH_DIR:=
+else
+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
+endif
+
 export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 
-# All config variable that are passed to the make invocation, directly or
-# indirectly. This ensures that the package is rebuilt on config-changes.
-PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
-
-export CONFIG_BRCM_SDK_VER_504002
 
 
 include $(INCLUDE_DIR)/package.mk
@@ -38,18 +40,27 @@ endef
 
 define Package/endptmngr
   CATEGORY:=Utilities
-  TITLE:=Broadcom Voice Endpoint Manager
+  TITLE:=Brcmslic
   URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent +uci +bcmkernel @TARGET_HAS_VOICE @BCM_VOICE
+  DEPENDS:= +libubox +ubus +libpicoevent +bcmkernel @TARGET_HAS_VOICE
 endef
 
 define Package/endptmngr/description
 	endptmngr
 endef
 
+ifeq ($(CONFIG_ENDPT_OPEN),y)
+
+define Build/Compile
+endef
+
+endif
+
+
 define Package/endptmngr/install
-	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	cp $(PKG_BUILD_DIR)/files/etc/init.d/* $(1)/etc/init.d/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/endptmngr $(1)/usr/sbin/
 endef
 

endptmngr/files/etc/init.d/endptmngr

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

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

fdtextract/Makefile

@@ -1,51 +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:=fdtextract
-PKG_RELEASE:=1
-PKG_VERSION:=1.0
-
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/fdtextract.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=485a38bc4eaf2a54d080b8529d5130b2955626d1
-PKG_MIRROR_HASH:=skip
-
-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:=fdtextract
-	DEPENDS:= +libfdt
-endef
-
-define Package/$(PKG_NAME)/description
-	Command to extract sub images from FIT images.
-endef
-
-MAKE_FLAGS += \
-	CFLAGS+="-Wall"
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fdtextract $(1)/usr/sbin/
-	$(STRIP) $(1)/usr/sbin/fdtextract
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

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
 };
 
@@ -191,8 +129,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (ret < 0) {
 		dev_warn(&pdev->dev, "Could not read led-count property\n");
 		leds->led_count = SK9822_DEFAULT_NUM_LEDS;
-	} else {
-		printk(KERN_INFO "Got led count: %u\n", leds->led_count);
 	}
 
 	leds->led_colors = devm_kzalloc(&pdev->dev,
@@ -204,7 +140,7 @@ static int canyon_led_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, leds);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 16, 0)
 	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
 	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0, GPIOD_OUT_HIGH);
@@ -212,12 +148,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	dev_warn(&pdev->dev, "Kernel version Not supported\n");
 	exit(1);
 #endif
-	if (IS_ERR(leds->clock_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
-				PTR_ERR(leds->clock_gpio));
-		leds->clock_gpio = NULL;
-		return PTR_ERR(leds->clock_gpio);
-	}
 
 	gpiod_direction_output(leds->clock_gpio, 1);
 	if (IS_ERR(leds->clock_gpio)) {
@@ -230,7 +160,7 @@ static int canyon_led_probe(struct platform_device *pdev)
 		gpiod_set_value(leds->clock_gpio, 0);
 	}
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 16, 0)
 	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
 	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1, GPIOD_OUT_HIGH);
@@ -238,12 +168,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	dev_warn(&pdev->dev, "Kernel version Not supported\n");
 	exit(1);
 #endif
-	if (IS_ERR(leds->data_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
-				PTR_ERR(leds->data_gpio));
-		leds->data_gpio = NULL;
-		return PTR_ERR(leds->data_gpio);
-	}
 
 	gpiod_direction_output(leds->data_gpio, 1);
 	if (IS_ERR(leds->data_gpio)) {

icwmp/Config_cwmp.in

@@ -1,4 +1,8 @@
-if PACKAGE_icwmp
+if PACKAGE_icwmp-curl || PACKAGE_icwmp-zstream
+
+config CWMP_SCRIPTS_FULL
+	bool "Install all icwmp scripts"
+	default y
 
 choice
 	prompt "Select ACS sever"
@@ -18,6 +22,6 @@ config CWMP_DEBUG
 config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
-
+    
 endif
 

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 iopsys Software Solutions AB
+# Copyright (C) 2019 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=7.0.1-2021-04-15
+PKG_VERSION:=4.0-2020-06-25
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f70cc81e5688e32aa82084faae5bc6ff710bb81b
+PKG_SOURCE_VERSION:=7a6da73ae20abc27baf3aa4c1b2c1c0c0ecac82e
 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
@@ -27,25 +26,80 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_DEBUG \
 	CONFIG_CWMP_DEVEL_DEBUG
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/$(PKG_NAME)
+define Package/icwmp_stun
   SECTION:=utils
   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
+  TITLE:=TR-069 stun Client
+  DEPENDS:=+PACKAGE_icwmp_stun:libubus +PACKAGE_icwmp_stun:libuci +PACKAGE_icwmp_stun:libubox +PACKAGE_icwmp_stun:libjson-c +PACKAGE_icwmp_stun:libopenssl +PACKAGE_icwmp_stun:libblobmsg-json
 endef
 
-define Package/$(PKG_NAME)/description
+define Package/icwmp_xmpp
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 xmpp feature
+  DEPENDS:=+PACKAGE_icwmp_xmpp:libuci +PACKAGE_icwmp_xmpp:libubox +PACKAGE_icwmp_xmpp:libexpat +PACKAGE_icwmp_xmpp:libstrophe
+endef
+
+define Package/icwmp_twamp
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 twamp feature
+  DEPENDS:=+PACKAGE_icwmp_twamp:libuci
+endef
+
+define Package/icwmp_udpechoserver
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 udpechoserver feature
+  DEPENDS:=+PACKAGE_icwmp_udpechoserver:libuci
+endef
+
+define Package/icwmp_bulkdata
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=TR-069 BulkData Collection
+  DEPENDS:=+PACKAGE_icwmp_bulkdata:libubus +PACKAGE_icwmp_bulkdata:libuci +PACKAGE_icwmp_bulkdata:libubox +PACKAGE_icwmp_bulkdata:libjson-c +PACKAGE_icwmp_bulkdata:libcurl +PACKAGE_icwmp_bulkdata:curl +PACKAGE_icwmp_bulkdata:libblobmsg-json +PACKAGE_icwmp_bulkdata:libbbfdm
+endef
+
+define Package/icwmp-tr098
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=CWMP client for TR-098 Data Model
+  DEPENDS:=+PACKAGE_icwmp-tr098:libuci +PACKAGE_icwmp-tr098:libmicroxml +PACKAGE_icwmp-tr098:libubox +PACKAGE_icwmp-tr098:jshn +PACKAGE_icwmp-tr098:libubus +PACKAGE_icwmp-tr098:libblobmsg-json +PACKAGE_icwmp-tr098:libpthread +PACKAGE_icwmp-tr098:ubusd +PACKAGE_icwmp-tr098:shflags +PACKAGE_icwmp-tr098:getopt +PACKAGE_icwmp-tr098:zlib +PACKAGE_icwmp-tr098:libjson-c +PACKAGE_icwmp-tr098:libopenssl +PACKAGE_icwmp-tr098:curl +PACKAGE_icwmp-tr098:libcurl +PACKAGE_icwmp-tr098:libtr098
+endef
+
+define Package/icwmp/Default
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=CWMP client
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libbbfdm  +libbbf_api
+endef
+
+define Package/icwmp/description
  A free client implementation of CWMP (TR-069) protocol
 endef
 
-define Package/$(PKG_NAME)/config
+define Package/icwmp-curl
+  $(call Package/icwmp/Default)
+  TITLE+= (using libcurl)
+  DEPENDS+= +PACKAGE_icwmp-curl:libcurl
+  VARIANT:=curl
+endef
+
+define Package/icwmp-zstream
+  $(call Package/icwmp/Default)
+  TITLE+= (using libzstream)
+  DEPENDS+= +PACKAGE_icwmp-zstream:libzstream
+  VARIANT:=zstream
+endef
+
+define Package/icwmp-curl/config
 	source "$(SOURCE)/Config_cwmp.in"
 endef
 
@@ -59,6 +113,36 @@ endif
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 
+ifeq ($(CONFIG_PACKAGE_icwmp-tr098),y)
+CONFIGURE_ARGS += \
+	--enable-icwmp_tr098
+endif
+
+ifeq ($(CONFIG_PACKAGE_icwmp_xmpp),y)
+CONFIGURE_ARGS += \
+	--enable-icwmp_xmpp
+endif
+
+ifeq ($(CONFIG_PACKAGE_icwmp_stun),y)
+CONFIGURE_ARGS += \
+	--enable-icwmp_stun
+endif
+
+ifeq ($(CONFIG_PACKAGE_icwmp_udpechoserver),y)
+CONFIGURE_ARGS += \
+	--enable-icwmp_udpechoserver
+endif
+
+ifeq ($(CONFIG_PACKAGE_icwmp_twamp),y)
+CONFIGURE_ARGS += \
+	--enable-icwmp_twamp
+endif
+
+ifeq ($(CONFIG_PACKAGE_icwmp_bulkdata),y)
+CONFIGURE_ARGS += \
+	--enable-icwmp_bulkdata
+endif
+
 ifneq ($(CWMP_REVISION)_,_)
 ifneq ($(CWMP_REVISION),exported)
 ifneq ($(CWMP_REVISION),Unversioned directory)
@@ -75,6 +159,17 @@ CONFIGURE_ARGS += \
 	--with-uci-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubus-include-path=$(STAGING_DIR)/usr/include
+	
+ifeq ($(BUILD_VARIANT),zstream)
+CONFIGURE_ARGS += \
+	--enable-http=zstream \
+	--with-zstream-include-path=$(STAGING_DIR)/usr/include
+endif
+
+ifeq ($(BUILD_VARIANT),curl)
+CONFIGURE_ARGS += \
+	--enable-http=curl
+endif
 
 ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
 CONFIGURE_ARGS += \
@@ -96,15 +191,81 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-define Package/$(PKG_NAME)/install
+define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin/
+	$(CP) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmpd.init $(1)/etc/init.d/icwmpd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci-defaults/* $(1)/etc/uci-defaults/
+ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)
+	$(INSTALL_DIR) $(1)/usr/share/icwmp
+	$(CP) $(PKG_BUILD_DIR)/scripts/defaults $(1)/usr/share/icwmp
+	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/icwmp
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/icwmp.sh $(1)/usr/sbin/icwmp
+endif
 	$(CP) ./files/* $(1)/
 endef
 
-define Package/$(PKG_NAME)/postinst
+define Package/icwmp-tr098/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/bin/icwmp_tr098d $(1)/usr/sbin
+endef
+
+define Package/icwmp_stun/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_stund $(1)/usr/sbin/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_stund $(1)/etc/init.d/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_stun $(1)/etc/config
+endef
+
+define Package/icwmp_xmpp/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_xmppd $(1)/usr/sbin/icwmp_xmppd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_xmppd $(1)/etc/init.d/icwmp_xmppd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_xmpp $(1)/etc/config
+	$(CP) ./xmpp-files/* $(1)/
+endef
+
+define Package/icwmp_udpechoserver/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_udpechoserverd $(1)/usr/sbin/icwmp_udpechoserverd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_udpechoserverd $(1)/etc/init.d/icwmp_udpechoserverd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_udpechoserver $(1)/etc/config
+endef
+
+define Package/icwmp_twamp/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_twampd $(1)/usr/sbin/icwmp_twampd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_twampd $(1)/etc/init.d/icwmp_twampd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_twamp $(1)/etc/config
+endef
+
+define Package/icwmp_bulkdata/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_bulkdatad $(1)/usr/sbin/icwmp_bulkdatad
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_bulkdatad $(1)/etc/init.d/icwmp_bulkdatad
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_bulkdata $(1)/etc/config
+endef
+
+define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
+	echo "$(CWMP_BKP_FILE)" >> $${IPKG_INSTROOT}/etc/sysupgrade.conf
 	if [ -z "$${IPKG_INSTROOT}" ]; then
 		echo "Enabling rc.d symlink for icwmpd"
 		/etc/init.d/icwmpd enable
@@ -112,7 +273,7 @@ define Package/$(PKG_NAME)/postinst
 	exit 0
 endef
 
-define Package/$(PKG_NAME)/prerm
+define Package/icwmp-$(BUILD_VARIANT)/prerm
 	#!/bin/sh
 	if [ -z "$${IPKG_INSTROOT}" ]; then
 		echo "Disabling rc.d symlink for icwmpd"
@@ -121,4 +282,11 @@ define Package/$(PKG_NAME)/prerm
 	exit 0
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+$(eval $(call BuildPackage,icwmp-curl))
+$(eval $(call BuildPackage,icwmp_stun))
+$(eval $(call BuildPackage,icwmp_xmpp))
+$(eval $(call BuildPackage,icwmp_udpechoserver))
+$(eval $(call BuildPackage,icwmp_twamp))
+$(eval $(call BuildPackage,icwmp_bulkdata))
+$(eval $(call BuildPackage,icwmp-tr098))
+#$(eval $(call BuildPackage,icwmp-zstream))

icwmp/files/etc/config/cwmp

@@ -1,47 +0,0 @@
-config acs 'acs'
-	option url ''
-	option userid '' #$OUI-$SER
-	option passwd 'iopsys'
-	option periodic_inform_enable 'true'
-	option periodic_inform_interval '1800'
-	option periodic_inform_time '0001-01-01T00:00:00Z'
-	option ParameterKey ''
-	option dhcp_discovery 'enable'
-	# compression possible configs: GZIP, Deflate, Disabled
-	option compression 'Disabled'
-	#­ possible configs interval :[1:65535]
-	option retry_min_wait_interval '5'
-	#­ possible configs interval :[1000:65535]
-	option retry_interval_multiplier '2000'
-	option https_ssl_capath ''
-	option ipv6_enable '0'
-	option ip_version '4'
-
-config cpe 'cpe'
-	option interface 'eth0.1'
-	option default_wan_interface 'wan'
-	option log_to_console 'disable'
-	option log_to_file 'enable'
-	# log_severity: INFO (Default)	
-	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
-	option log_severity 'INFO'
-	option log_file_name '/var/log/icwmpd.log'
-	option log_max_size '102400'
-	option userid '' #$OUI-$SER
-	option passwd 'iopsys'
-	option port '7547'
-	option ubus_socket '/var/run/ubus.sock'
-	option provisioning_code ''
-	option amd_version '5'
-	# compression possible configs: InstanceNumber, InstanceAlias
-	option instance_mode 'InstanceNumber'
-	option session_timeout '60'
-	option notification '1'
-	option exec_download '0'
-	option periodic_notify_enable '1'
-	option periodic_notify_interval '10'
-	
-config lwn 'lwn'
-	option enable '1'
-	option hostname ''
-	option port '0'

icwmp/files/etc/firewall.cwmp

@@ -1,21 +0,0 @@
-#created by the icwmp package 
-zone_name=""
-port=""
-if [ "$zone_name" = "" ]; then
-	exit 0
-elif [ "$zone_name" = "icwmp" ]; then
-	iptables -nL zone_icwmp_input 2> /dev/null
-	if [ $? != 0 ]; then
-		iptables -N zone_icwmp_input
-		iptables -t filter -A INPUT -j zone_icwmp_input
-		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
-	else			
-		iptables -F zone_icwmp_input
-		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
-	fi			
-else
-	iptables -F zone_icwmp_input 2> /dev/null
-	iptables -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
-	iptables -X zone_icwmp_input 2> /dev/null
-fi
-#iptables -I FW_ZONE -p tcp -s ACS_ADDRESS --dport PORT -j ACCEPT --comment "Open ACS port"

icwmp/files/etc/init.d/icwmpd

@@ -1,189 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2015-2019 iopsys Software Solutions AB
-
-. /lib/functions.sh
-include /lib/network
-. /usr/share/libubox/jshn.sh
-
-START=99
-STOP=10
-
-USE_PROCD=1
-PROG="/usr/sbin/icwmpd"
-
-EXTRA_HELP="	start	[GetRPCMethods] Start icwmpd service and send GetRPCMethods"
-
-validate_url() {
-	# SCHEMA_LIST: contain list of possible schemas that could be present in the acs url
-	# Example: SCHEMA_LIST="http https"
-	SCHEMA_LIST="http"
-
-	for schema in $SCHEMA_LIST;	do
-		dest=`echo $1 | sed 's/$schema:\/\///g' | cut -f1 -d \/ | cut -f1 -d:`
-		if [ "_$dest" != "_" ]; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-get_acs_url() {
-	local default_acs="http://10.10.1.6:8000/openacs/acs"
-	local acs_dhcp_discovery="$(uci -q get cwmp.acs.dhcp_discovery)"
-	local url="$(uci -q get cwmp.acs.url)"
-	local dhcp_url="$(uci -P /var/state -q get cwmp.acs.dhcp_url)"
-
-	if [ "$acs_dhcp_discovery" == "enable" -a -n "$dhcp_url" -o -z "$url" ]; then
-		url="$dhcp_url"
-		echo "ACS URL from DHCP server: $url"
-		[ -n "$url" ] && uci -P /var/state -q set cwmp.acs.url="$url" || url="$default_acs"
-	elif [ -n "$url" ];then
-		url="$(uci -q get cwmp.acs.url)"
-		echo "ACS URL from configuration: $url"
-	else
-		url="$default_acs"
-		echo "Using default ACS URL: $url"
-		[ -n "$url" ] && uci -P /var/state -q set cwmp.acs.url="$url"
-	fi
-
-	validate_url "$url"
-	if [ "$?" != "0" ];then
-		echo "Invalid ACS URL: $url"
-		exit 1
-	fi
-}
-
-enable_dhcp_option43() {
-	local wan=$1
-	local discovery=0
-	case $2 in
-		enable|1) discovery=1 ;;
-	esac
-
-	### Ask for DHCP Option 43 only if CWMP is enabled ###
-	local enabled
-	local newreqopts=
-	local baseopts=
-	local reqopts="$(uci -q get network.$wan.reqopts)"
-	local proto="$(uci -q get network.$wan.proto)"
-	local tropts="43"
-	local oldreqopts="$reqopts"
-	local ropt iopt
-	for ropt in $reqopts; do
-		case $ropt in
-			43) ;;
-			*) baseopts="$baseopts $ropt" ;;
-		esac
-	done
-	ropt=""
-	reqopts="$baseopts $tropts"
-	for ropt in $reqopts; do
-		case $ropt in
-			43) [ $discovery -eq 1 ] && newreqopts="$newreqopts $ropt" ;;
-			*) newreqopts="$newreqopts $ropt" ;;
-		esac
-	done
-	if [ $proto == "dhcp" ]; then
-		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		oldreqopts="$(echo $oldreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		[ "$newreqopts" == "$oldreqopts" ] && return
-		uci -q set network.$wan.reqopts="$newreqopts"
-		uci commit network
-		ubus call network reload
-	fi
-	########################################################
-}
-
-wait_for_option43() {
-	local time=$1
-	local default_wan_interface dhcp_discovery url
-
-	config_get default_wan_interface cpe default_wan_interface "wan"
-	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get url acs url
-
-	enable_dhcp_option43 $default_wan_interface $dhcp_discovery
-
-	local tm=0
-
-	if [ "$dhcp_discovery" == "enable" -o "$dhcp_discovery" == "1" ]
-	then
-		echo "Waiting for discovery of ACS URL from dhcp server ..."
-		while [ $tm -le $time ]
-		do
-			acs_url=`uci -P /var/state -q get cwmp.acs.dhcp_url`
-			if [ "$acs_url" != "" ]
-			then
-				break
-			else
-				sleep 1
-			fi
-			tm=$((tm+1))
-		done
-	fi
-}
-
-wait_for_resolvfile() {
-	local time=$1
-	local tm=1
-
-	local resolvfile="$(uci -q get dhcp.@dnsmasq[0].resolvfile)"
-	[ -n "$resolvfile" ] || return
-
-	while [ ! -f $resolvfile ]; do
-		sleep 1
-		[ $tm -ge $time ] && break
-		tm=$((tm+1))
-	done
-}
-
-set_wan_interface() {
-	local l3_device=""
-	local default_wan_interface=""
-
-	config_get default_wan_interface cpe default_wan_interface "wan"
-	json_load "$(ifstatus $default_wan_interface)"
-	json_get_var l3_device l3_device
-	if [ "$l3_device" != "" ];then
-		uci -q set cwmp.cpe.interface="$l3_device"
-		uci -q commit cwmp
-	fi
-}
-
-start_service() {
-	if [ ! -f /tmp/.icwmpd_boot ]; then
-		touch /etc/icwmpd/.icwmpd_boot
-		touch /tmp/.icwmpd_boot
-	else
-		[ -f /sbin/netifd ] && echo "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
-		[ -f /etc/config/wireless ] && echo "Waiting for WiFi to be started ..." && ubus -t 5 wait_for network.wireless
-		[ -f /usr/sbin/dnsmasq ] && echo "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
-		[ -f /etc/config/dhcp ] && echo "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
-		[ -f /usr/sbin/asterisk ] && echo "Waiting for Voice to be started ..." && ubus -t 5 wait_for asterisk
-
-		config_load cwmp
-		set_wan_interface
-		wait_for_option43 20
-		get_acs_url
-
-		procd_open_instance
-		procd_set_param command "$PROG"
-		if [ "$1" = "GetRPCMethods" ];then
-			procd_append_param command -g
-		elif [ -f /etc/icwmpd/.icwmpd_boot ]; then
-			procd_append_param command -b
-		fi
-		procd_set_param respawn "3" "7" "0"
-		procd_close_instance
-	fi
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers() {
-	procd_add_config_trigger "config.change" "cwmp"  /etc/init.d/icwmpd reload
-}
-

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

@@ -1,3 +1,4 @@
+
 # Copy defaults by the factory to the cwmp UCI user section.
 
 
@@ -14,19 +15,10 @@ mac=$(printf "%12.12X" $((0x$baseMac)))
 # Get system serial number.
 serial=$(db -q get hw.board.serial_number)
 
-# Get userid values
-acs_userid=$(uci -q get cwmp.acs.userid)
-cpe_userid=$(uci -q get cwmp.cpe.userid)
+uci -q batch <<-EOF
+	set cwmp.acs.userid="${mac:0:6}-${serial}"
+	set cwmp.cpe.userid="${mac:0:6}-${serial}"
+EOF
 
-# Only set if they are empty
-if [ -z "$acs_userid" ]
-then
-    uci -q set cwmp.acs.userid="${mac:0:6}-${serial}"
-fi
-
-if [ -z "$cpe_userid" ]
-then
-    uci -q set cwmp.cpe.userid="${mac:0:6}-${serial}"
-fi
 
 # No need for commit here, it is done by uci_apply_defaults().

icwmp/files/etc/uci-defaults/90-cwmpfirewall

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-uci -q batch <<-EOT
-        delete firewall.cwmp
-        set firewall.cwmp=include
-        set firewall.cwmp.path=/etc/firewall.cwmp
-        set firewall.cwmp.reload=1
-        commit firewall
-EOT
-
-exit 0
-

icwmp/files/lib/upgrade/keep.d/icwmp

@@ -1 +0,0 @@
-/etc/icwmpd/.icwmpd_backup_session.xml

icwmp/files/lib/upgrade/post-rootfs-fixup.d/215-icwmp

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# As part of sysupgrade we copy CWMP Backup Session XML file.
-
-
-# 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
-
-
-if [ -s "${2}/etc/icwmpd/.icwmpd_backup_session.xml" ]; then
-	cat "${2}/etc/icwmpd/.icwmpd_backup_session.xml" > "/etc/icwmpd/.icwmpd_backup_session.xml"
-fi
-
-# Report success.
-log "post-hooks" "CWMP Backup Session XML file migrated"
-
-exit 0

icwmp/xmpp-files/etc/hotplug.d/iface/91-icwmp_xmpp

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -f /etc/config/xmpp ] || exit 0
+[ -f /etc/config/cwmp_xmpp ] || exit 0
 
 [ "$ACTION" == "ifup" ] || exit 0
 [ "$INTERFACE" == "loopback" ] && exit 0
@@ -17,5 +17,5 @@ local proto="$(uci -q get network.$INTERFACE.proto)"
 local ifname="$(uci -q get network.$INTERFACE.ifname)"
 [ "${ifname:0:1}" == "@" ] && exit 0
 
-/etc/init.d/xmppd reload &
+/etc/init.d/icwmp_xmppd reload &
 

ieee1905/Config.in

@@ -21,8 +21,8 @@ menu "developer/debug options"
 		config IEEE1905_ALME_OVER_UBUS
 			bool "ALME methods supported over ubus"
 
-		#config IEEE1905_ALME_OVER_TCP
-		#	bool "ALME server over TCP port"
+		config IEEE1905_ALME_OVER_TCP
+			bool "ALME server over TCP port"
 
 	endchoice
 endmenu

ieee1905/Makefile

@@ -5,15 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=2.1.44
+PKG_VERSION:=2.0.18
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=33d05c2223023ce5b57001008555bd0f82e88541
+PKG_SOURCE_VERSION:=44035a3bb0dd7e9fc1feb037c72c2c0d33692a98
 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)
@@ -24,7 +23,7 @@ define Package/ieee1905
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=IEEE1905 daemon
-  DEPENDS:= +libuci +libjson-c +libieee1905 +ubox +libpcap +libopenssl +libwifi +libeasy
+  DEPENDS:= +libuci +libjson-c +lib1905 +ubox +libpcap +libopenssl +libwifi +libeasy
 endef
 
 define Package/ieee1905/config
@@ -35,28 +34,18 @@ define Package/ieee1905/description
  IEEE1905 stack with extended functionalities.
 endef
 
-define Package/libieee1905
+define Package/lib1905
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=IEEE1905 cmdu tlv utility library
 endef
 
-define Package/libwsc
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Wifi Simple Configuration building and processing library
-  DEPENDS= +libopenssl +libuci +libubus
-endef
-
 define Package/lib1905hle
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=IEEE1905 hle stack library
 endef
 
-LIBS := \
-	$(if $(CONFIG_PACKAGE_libwsc),libwsc.so)
-
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE \
@@ -64,9 +53,6 @@ TARGET_CFLAGS += \
 	-Wall \
 	-Wextra
 
-MAKE_FLAGS += \
-	LIBS="$(LIBS)"
-
 ifeq ($(CONFIG_IEEE1905_SPEED_UP_DISCOVERY),y)
 TARGET_CFLAGS += -DSPEED_UP_DISCOVERY
 endif
@@ -93,7 +79,6 @@ define Package/ieee1905/install
 	$(INSTALL_DIR) $(1)/etc
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/ieee1905
 	$(INSTALL_DIR) $(1)/usr/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/etc/init.d/ieee1905 $(1)/etc/init.d/ieee1905
@@ -106,37 +91,23 @@ define Package/lib1905hle/install
 	$(CP) $(PKG_BUILD_DIR)/lib/lib1905hle.so $(1)/usr/lib/lib1905hle.so
 endef
 
-define Package/libieee1905/install
+define Package/lib1905/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libieee1905.so $(1)/usr/lib/libieee1905.so
-endef
-
-define Package/libwsc/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libwsc.so $(1)/usr/lib/libwsc.so
-endef
-
-define Build/InstallDev/libwsc.so
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwsc/include/wsc.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/lib/libwsc.so $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/lib/lib1905.so $(1)/usr/lib/lib1905.so
 endef
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/ieee1905
+	$(INSTALL_DIR) $(1)/usr/include/lib1905
 	$(INSTALL_DIR) $(1)/usr/include/ieee1905
 	$(INSTALL_DIR) $(1)/usr/include/lib1905hle
 	$(CP) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/ieee1905/
-	$(CP) $(PKG_BUILD_DIR)/libieee1905/include/*.h $(1)/usr/include/ieee1905/
+	$(CP) $(PKG_BUILD_DIR)/lib1905/include/*.h $(1)/usr/include/lib1905/
 	$(CP) $(PKG_BUILD_DIR)/lib1905hle/include/*.h $(1)/usr/include/lib1905hle/
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libieee1905.so $(1)/usr/lib
-	$(foreach lib,$(LIBS),$(call Build/InstallDev/$(lib),$(1),$(2));)
+	$(CP) $(PKG_BUILD_DIR)/lib/lib1905.so $(1)/usr/lib
 endef
 
-$(eval $(call BuildPackage,libieee1905))
+$(eval $(call BuildPackage,lib1905))
 $(eval $(call BuildPackage,lib1905hle))
-$(eval $(call BuildPackage,libwsc))
 $(eval $(call BuildPackage,ieee1905))

ieee1905/files/etc/config/ieee1905

@@ -5,10 +5,13 @@ config ieee1905 'ieee1905'
         option macaddress 'auto'
         option registrar 0
         option cmdu_event 1
-        option map_plugin 1
+        option map_plugin 0
 
 config security 'security'
         list method 'PBC'
+	option ssid ''
+	option encryption ''
+        option key 'TESTPASSWORD'
 
 config al-iface
         option enabled 1

ieee1905/files/etc/init.d/ieee1905

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
-START=96
-STOP=22
+START=99
+STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/ieee1905d
@@ -24,7 +24,7 @@ configure_ieee1905()
 
 	if [ ${debug} -eq 1 ]; then
 		# Forward stdout of the command to logd
-		#procd_set_param stdout 1
+		procd_set_param stdout 1
 		# Same for stderr
 		procd_set_param stderr 1
 	fi
@@ -43,14 +43,7 @@ configure_network()
 	fi
 }
 
-service_running() {
-        ubus -t 2 wait_for wifi
-}
-
 start_service() {
-
-	[ -d /usr/lib/ieee1905 ] || mkdir -p /usr/lib/ieee1905
-
 	procd_open_instance ieee1905
 	procd_set_param command ${PROG}
 	configure_ieee1905 "ieee1905"
@@ -68,5 +61,4 @@ service_triggers() {
 	procd_add_reload_trigger "network"
 	procd_add_reload_trigger "wireless"
 	procd_add_reload_trigger "netmode"
-	procd_add_reload_trigger "ieee1905"
 }

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

@@ -6,10 +6,7 @@ CONFIG_DEVEL=y
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
-CONFIG_PACKAGE_at=y
-CONFIG_PACKAGE_atftp=m
-CONFIG_PACKAGE_atftpd=m
-CONFIG_PACKAGE_bulkdata=y
+CONFIG_PACKAGE_alsa-lib=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
 CONFIG_PACKAGE_comgt-directip=y
@@ -17,19 +14,13 @@ CONFIG_PACKAGE_comgt-ncm=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
 CONFIG_PACKAGE_ethtool=y
+CONFIG_PACKAGE_gdb=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
-CONFIG_PACKAGE_gre=y
-CONFIG_PACKAGE_icwmp=y
-CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-1905=y
-CONFIG_PACKAGE_map-topology=y
-CONFIG_PACKAGE_mosquitto-client-ssl=y
-CONFIG_PACKAGE_mosquitto-ssl=y
-CONFIG_PACKAGE_wfadatad=y
+CONFIG_PACKAGE_icwmp-curl=y
 CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_iopupgrade=y
+CONFIG_PACKAGE_iopupgrade=m
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
@@ -38,7 +29,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,8 +40,11 @@ CONFIG_PACKAGE_juci-network-netifd=y
 CONFIG_PACKAGE_juci-sysupgrade=y
 CONFIG_PACKAGE_juci-wireless=y
 CONFIG_PACKAGE_juci-theme-iopsys=y
-CONFIG_PACKAGE_libreswan=m
+CONFIG_PACKAGE_libdaemon=y
+CONFIG_PACKAGE_libgmp=y
+CONFIG_PACKAGE_libreadline=y
 CONFIG_PACKAGE_libwifi=y
+CONFIG_PACKAGE_loop-detector=m
 CONFIG_PACKAGE_lscpu=y
 CONFIG_PACKAGE_map=y
 CONFIG_PACKAGE_miniupnpd=y
@@ -68,7 +61,6 @@ CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_PACKAGE_owsd=y
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_ppp-mod-pppoa=y
@@ -85,22 +77,22 @@ 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
+CONFIG_PACKAGE_tc=y
 CONFIG_PACKAGE_tcpdump=y
 CONFIG_PACKAGE_terminfo=y
 CONFIG_PACKAGE_traceroute6=y
-CONFIG_PACKAGE_uledd=y
 CONFIG_PACKAGE_umbim=y
 CONFIG_PACKAGE_uqmi=y
-CONFIG_PACKAGE_urlfilter=y
 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_uuidgen=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
@@ -110,14 +102,13 @@ CONFIG_USE_STRIP=y
 CONFIG_BUILD_LOG=y
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
 CONFIG_BUSYBOX_CONFIG_ARPING=y
-CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
 CONFIG_BUSYBOX_CONFIG_DELUSER=y
 # CONFIG_BUSYBOX_CONFIG_DEVMEM is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q=y
 CONFIG_BUSYBOX_CONFIG_FIRST_SYSTEM_ID=100
-# CONFIG_BUSYBOX_CONFIG_HTTPD is not set
+CONFIG_BUSYBOX_CONFIG_HTTPD=y
 # CONFIG_BUSYBOX_CONFIG_INSMOD is not set
 # CONFIG_BUSYBOX_CONFIG_MODINFO is not set
 # CONFIG_BUSYBOX_CONFIG_MODPROBE is not set
@@ -173,23 +164,6 @@ CONFIG_BUSYBOX_CONFIG_FLOAT_DURATION=y
 CONFIG_BUSYBOX_CONFIG_USLEEP=y
 CONFIG_BUSYBOX_CONFIG_REALPATH=y
 CONFIG_BUSYBOX_CONFIG_TTY=y
-CONFIG_BUSYBOX_CONFIG_BLOCKDEV=y
-CONFIG_BUSYBOX_CONFIG_PARTPROBE=y
-CONFIG_BUSYBOX_CONFIG_LFS=y
-CONFIG_BUSYBOX_CONFIG_FDISK=y
-CONFIG_BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_GPT_LABEL=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED=y
-CONFIG_BUSYBOX_CONFIG_IONICE=y
-CONFIG_BUSYBOX_CONFIG_RENICE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_BTRFS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_F2FS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
-CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
-CONFIG_BUSYBOX_CONFIG_NOHUP=y
 CONFIG_LIBCURL_CRYPTO_AUTH=y
 # CONFIG_LIBCURL_MBEDTLS is not set
 CONFIG_LIBCURL_OPENSSL=y
@@ -198,7 +172,7 @@ CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 CONFIG_KERNEL_DEVTMPFS=y
 CONFIG_KERNEL_DEVTMPFS_MOUNT=y
 # CONFIG_BUSYBOX_CONFIG_IP is not set
-CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
+CONFIG_LOCALMIRROR="http://download.iopsys.eu/iopsys/mirror/"
 
 # Generation of /etc/banner.
 CONFIG_IMAGEOPT=y
@@ -218,10 +192,8 @@ 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
 # CONFIG_PACKAGE_urngd is not set
+

iop/iop.completion

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

iop/scripts/feeds_update.sh

@@ -32,7 +32,7 @@ function feeds_update {
     fi
 
     # targets need to be installed explicitly
-    targets="iopsys-brcm63xx-arm iopsys-ramips intel_mips iopsys-x86 iopsys-armvirt iopsys-bcm27xx iopsys-mediatek"
+    targets="iopsys-brcm63xx-mips iopsys-brcm63xx-arm iopsys-ramips intel_mips iopsys-x86 iopsys-armvirt"
     for target in $targets
     do
 	rm -f target/linux/$target

iop/scripts/genconfig.sh

@@ -5,7 +5,7 @@ function genconfig {
 	export IMPORT=1
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
-	export THEMEDIR="tmp/juci-themes"
+	export THEMEDIR="themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
 	export CONFIGPATH="package/feeds/iopsys/iop"
 	CUSTPATH="customerconfigs"
@@ -13,12 +13,11 @@ function genconfig {
 	export VERBOSE=0
 	export DEVELOPER=0
 	target="bogus"
-	target_config_path=""
-	bcm27xx="target/linux/iopsys-bcm27xx"
+	config_path=""
+	brcm63xx_mips="target/linux/iopsys-brcm63xx-mips"
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
 	intel_mips="target/linux/intel_mips"
-	mediatek="target/linux/iopsys-mediatek"
 	x86="target/linux/iopsys-x86"
 	armvirt="target/linux/iopsys-armvirt"
 
@@ -104,29 +103,27 @@ function genconfig {
 
 			if [ $pfound -eq 1 ]; then
 				target="$(echo $TARGET | tr '-' '_')"
-				target_config_path="$targetpath/config"
+				config_path="$targetpath/config"
 			fi
 
 			return
 		fi
 
+		[ -e $brcm63xx_mips/genconfig ] &&
+			iopsys_brcm63xx_mips=$(cd $brcm63xx_mips; ./genconfig)
 		[ -e $brcm63xx_arm/genconfig ] &&
 			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
 		[ -e $ramips/genconfig ] &&
 			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 		[ -e $intel_mips/genconfig ] &&
 			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
 		[ -e $x86/genconfig ] &&
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-		[ -e $bcm27xx/genconfig ] &&
-			iopsys_bcm27xx=$(cd $bcm27xx; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_mediatek iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
+			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_x86 iopsys_armvirt; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -135,10 +132,18 @@ function genconfig {
 			return
 	    fi
 
+	    for p in $iopsys_brcm63xx_mips; do
+		if [ $p == $profile ]; then
+		    target="iopsys_brcm63xx_mips"
+			config_path="$brcm63xx_mips/config"
+		    return
+		fi
+	    done
+
 	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_arm"
-			target_config_path="$brcm63xx_arm/config"
+			config_path="$brcm63xx_arm/config"
 		    return
 		fi
 	    done
@@ -146,15 +151,7 @@ function genconfig {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			target_config_path="$ramips/config"
-		    return
-		fi
-	    done
-
-	    for p in $iopsys_mediatek; do
-		if [ $p == $profile ]; then
-		    target="iopsys_mediatek"
-			target_config_path="$mediatek/config"
+			config_path="$ramips/config"
 		    return
 		fi
 	    done
@@ -162,7 +159,7 @@ function genconfig {
 	    for p in $iopsys_intel_mips; do
 		if [ $p == $profile ]; then
 		    target="intel_mips"
-			target_config_path="$intel_mips/config"
+			config_path="$intel_mips/config"
 		    return
 		fi
 	    done
@@ -170,7 +167,7 @@ function genconfig {
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
-			target_config_path="$x86/config"
+			config_path="$x86/config"
 		    return
 		fi
 	    done
@@ -178,28 +175,24 @@ function genconfig {
 	    for p in $iopsys_armvirt; do
 		if [ $p == $profile ]; then
 		    target="iopsys_armvirt"
-			target_config_path="$armvirt/config"
-		    return
-		fi
-	    done
-
-	    for p in $iopsys_bcm27xx; do
-		if [ $p == $profile ]; then
-		    target="iopsys_bcm27xx"
-			target_config_path="$bcm27xx/config"
+			config_path="$armvirt/config"
 		    return
 		fi
 	    done
 
 	}
 
-	git remote -v | grep -qE '(git@|ssh://)' && {
+	git remote -v | grep -q http || {
 		DEVELOPER=1
 
 		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
 	}
 
@@ -346,13 +339,11 @@ function genconfig {
 		v "cp $CONFIGPATH/config .config"
 		cp $CONFIGPATH/config .config
 
-		if [ -f $target_config_path/config ]; then
-		    cat $target_config_path/config >> .config
-		    echo "" >> .config
+		if [ -f $config_path/config ]; then
+		    cat $config_path/config >> .config
 		fi
-		if [ -f $target_config_path/$BOARDTYPE/config ]; then
-		    cat $target_config_path/$BOARDTYPE/config >> .config
-		    echo "" >> .config
+		if [ -f $config_path/$BOARDTYPE/config ]; then
+		    cat $config_path/$BOARDTYPE/config >> .config
 		fi
 
 		#special handling for intel_mips/iopsys_ramips which use TARGET_DEVICES
@@ -369,18 +360,6 @@ function genconfig {
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_mediatek" ]; then
-			subtarget="mt7622"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_bcm27xx" ]; then
-			subtarget="iopsys_bcm2711"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
@@ -407,12 +386,10 @@ function genconfig {
 				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
 					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
 					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
-					echo "" >> .config
 				fi
 				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
 					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
 					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
-					echo "" >> .config
 				fi
 			done
 		fi
@@ -433,10 +410,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" ]
@@ -445,14 +426,14 @@ function genconfig {
 		fi
 
 		# Force regeneration of themes
-		touch package/feeds/iopsys/juci/Makefile
+		touch package/feeds/juci/juci/Makefile
 
 		# Force regeneration of kernel Makefile
 		# Needed to disable kmods for iopsys-brcm targets
 		touch package/kernel/linux/Makefile
 
 		# we need to signal to bradcom SDK that we have changed the board id
-		# currently boardparms.c and boardparms_voice.c is the only place that is depending on boardid name
+		# currently boardparms.c and boardparms_voice.c is the only place that is depending on inteno boardid name
 		# so just touch that file.
 		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
 

iop/scripts/genconfig_min.sh

@@ -13,7 +13,7 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	config_path=""
-	bcm27xx="target/linux/iopsys-bcm27xx"
+	brcm63xx_mips="target/linux/iopsys-brcm63xx-mips"
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
 	intel_mips="target/linux/intel_mips"
@@ -108,6 +108,8 @@ function genconfig_min {
 			return
 		fi
 
+		[ -e $brcm63xx_mips/genconfig ] &&
+			iopsys_brcm63xx_mips=$(cd $brcm63xx_mips; ./genconfig)
 		[ -e $brcm63xx_arm/genconfig ] &&
 			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
 		[ -e $ramips/genconfig ] &&
@@ -118,11 +120,9 @@ function genconfig_min {
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-		[ -e $bcm27xx/genconfig ] &&
-			iopsys_bcm27xx=$(cd $bcm27xx; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
+			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_x86 iopsys_armvirt; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -131,6 +131,14 @@ function genconfig_min {
 			return
 	    fi
 
+	    for p in $iopsys_brcm63xx_mips; do
+		if [ $p == $profile ]; then
+		    target="iopsys_brcm63xx_mips"
+			config_path="$brcm63xx_mips/config"
+		    return
+		fi
+	    done
+
 	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_arm"
@@ -171,14 +179,6 @@ function genconfig_min {
 		fi
 	    done
 
-	    for p in $iopsys_bcm27xx; do
-		if [ $p == $profile ]; then
-		    target="iopsys_bcm27xx"
-		        config_path="$bcm27xx/config"
-		    return
-		fi
-	    done
-
 	}
 
 	git remote -v | grep -q http || {
@@ -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
 	}
 
@@ -333,14 +337,6 @@ function genconfig_min {
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_bcm27xx" ]; then
-			subtarget="iopsys_bcm2711"
-                        echo "CONFIG_TARGET_${target}=y" >> .config
-                        echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-                        echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-                        echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
-                        device=$(echo $BOARDTYPE | tr a-z A-Z)
-                        echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
@@ -393,7 +389,7 @@ function genconfig_min {
 		touch package/kernel/linux/Makefile
 
 		# we need to signal to bradcom SDK that we have changed the board id
-		# currently boardparms.c and boardparms_voice.c is the only place that is depending on boardid name
+		# currently boardparms.c and boardparms_voice.c is the only place that is depending on inteno boardid name
 		# so just touch that file.
 		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
 

iop/scripts/generate_tarballs.sh

@@ -1,32 +1,40 @@
 #!/bin/bash
-# shellcheck disable=SC2029
+
 
 build_bcmkernel_consumer() {
-	local tarfile bcmkernelcommith sdkversion serverpath serverlink
-
-	sdkversion="$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')"
-	sdkversion="${sdkversion:0:4}${sdkversion:(-1)}"
-	bcmkernelcommith="$(grep -w "PKG_SOURCE_VERSION:" "$curdir/feeds/broadcom/bcmkernel/${sdkversion:0:5}"*".mk" | cut -d'=' -f2)"
-
-	[ -n "$board" ] && [ -n "$bcmkernelcommith" ] || return
-
-	serverpath="$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz"
-	serverlink="$FPATH/bcmopen-$board-$majver.$minver-latest"
-
+	local tarfile bcmkernelcommith sdkversion
+	sdkversion=$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')
+	sdkversion=${sdkversion:0:4}${sdkversion:(-1)}
+	bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/broadcom/bcmkernel/${sdkversion:0:5}*.mk | cut -d'=' -f2)
 	# do not build bcmopen sdk if it was already built before
-	# if it was, check if there's a symlink in place and create it if missing
-	ssh "$SERVER" "test -f '$serverpath' && { test -L '$serverlink' || ln -sf '$serverpath' '$serverlink'; }" && return
-
-	cd "./build_dir/target-"*"/bcmkernel-"*"-${sdkversion:0:4}"*"/bcm963xx/release"
-	bash do_consumer_release -p "$profile" -y -F
-
+	[ -n "$board" -a -n "$bcmkernelcommith" ] || return
+	ssh $SERVER "test -f $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz" && return
+	cd ./build_dir/target-*/bcmkernel-*-${sdkversion:0:4}*/bcm963xx/release
+	bash do_consumer_release -p $profile -y -F
 	tarfile='out/bcm963xx_*_consumer.tar.gz'
-	[ $(ls -1 $tarfile | wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
-
-	scp -pv $tarfile "$SERVER":"$serverpath"
-	ssh "$SERVER" "test -f '$serverpath' && ln -sf '$serverpath' '$serverlink'"
+	[ $(ls -1 $tarfile |wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
+	scp -pv $tarfile $SERVER:$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz
+	ssh $SERVER "[ -f $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz ] && ln -sf $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz $FPATH/bcmopen-$board-$majver.$minver-latest"
 	rm -f $tarfile
+	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" -a -n "$natalieversion" -a -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"
 }
 
@@ -36,7 +44,7 @@ build_endptmngr_consumer() {
 	grep -q "CONFIG_TARGET_NO_VOICE=y" .config && return
 	endptversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
 	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
-	[ -n "$profile" ] && [ -n "$endptversion" ] && [ -n "$endptcommith" ] || return
+	[ -n "$profile" -a -n "$endptversion" -a -n "$endptcommith" ] || return
 	ssh $SERVER "test -f $FPATH/endptmngr-$profile-$endptversion-$endptcommith.tar.gz" && return
 	cd ./build_dir/target-*/endptmngr-$endptversion/
 	mkdir endptmngr-open-$endptversion
@@ -51,6 +59,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" -a -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>"
@@ -64,6 +112,7 @@ function generate_tarballs {
     set -e
     git remote -v | grep -q http && return # do not continue if this is an open SDK environment
 
+    target=$(grep CONFIG_TARGET_BOARD .config | cut -d'=' -f2 | tr -d '"')
     board=$(grep CONFIG_TARGET_FAMILY .config | cut -d'=' -f2 | tr -d '"')
     profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
     majver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f1 -d .)
@@ -88,14 +137,19 @@ function generate_tarballs {
 		esac
 	done
 
-	if [ -z "$stk_target" ]; then
+	if [ ! -n "$stk_target" ]; then
 		print_usage
 		exit 1
 	fi
 
 	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

iop/scripts/iopupgrade.sh

@@ -230,7 +230,7 @@ function ssh_upgrade {
     upd_fw_base=""
     upd_fw=""
     upd_host="192.168.1.1"
-    upd_sysupgrade=1
+    upd_sysupgrade=0
     do_dialog=0
 
     while getopts "f:hnxt:iscb" opt; do
@@ -280,14 +280,6 @@ function ssh_upgrade {
 	set_config_string CONFIG_TARGET_BOARD
 	firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t *[0-9].y[3])
 
-	# if target uses pkgtb
-	if [ -z "$firmwares"]
-	then
-	    # pkgtb files can not be streamed so copy over the file witch scp
-	    use_scp=1
-	    firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t last.pkgtb)
-	fi
-
 	for upd_fw_base in $firmwares
 	do
 	    #echo "firmware $upd_fw"
@@ -321,20 +313,10 @@ function ssh_upgrade {
 	[ $upd_forceboot  -eq 1 ] && extra_args="$extra_args -b"
 
 	file_size_kb=`du -k "$upd_fw" | cut -f1`
-	if [ "$use_scp" == "1" ]
-	then
-	    scp $upd_fw root@$upd_host:/tmp/ &&
-		ssh -o ConnectTimeout=60 root@$upd_host "iopu $extra_arg -f /tmp/$upd_fw_base"
-	else
-	    cat $upd_fw | pv -s ${file_size_kb}k | ssh root@$upd_host "iopu $extra_args"
-	fi
+	cat $upd_fw | pv -s ${file_size_kb}k | ssh root@$upd_host "iopu $extra_args"
     else
-	extra_args=""
-	[ $upd_noreboot   -eq 1 ] && extra_args="$extra_args -d"
-	[ $upd_keepconf   -eq 0 ] && extra_args="$extra_args -n"
-
 	scp $upd_fw root@$upd_host:/tmp/ &&
-	    ssh -o ConnectTimeout=60 root@$upd_host "sysupgrade -v $extra_args /tmp/$upd_fw_base" &&
+	    ssh -o ConnectTimeout=60 root@$upd_host "sysupgrade -v $3 /tmp/$upd_fw_base" &&
 	    echo "sysupgrade done!"
     fi
 }

iop/scripts/scp_changes.sh

@@ -0,0 +1,70 @@
+# this is a developer helper script to SCP changed files to remote host
+
+ROOT=build_dir/target-mips_uClibc-0.9.33.2/root-iopsys-brcm63xx-mips/
+ROOT_OLD=tmp/root_old/
+ROOT_TMP=tmp/root_tmp/
+
+function scp_changes_reset {
+	{ cd `dirname $0`
+		rm -rf "$ROOT_OLD"
+		mkdir -p "$ROOT_OLD"
+		cp -a "$ROOT"* "$ROOT_OLD"
+	}
+}
+
+function scp_changes {
+	if [ -z "$1" ] ; then
+		echo "usage: $0 scp_changes <host/-r(eset)/-p(retend)>"
+		echo "Error: host required"
+		exit 1
+	fi
+	{ cd `dirname $0`
+		if [ ! -d $ROOT ]; then
+			echo "$ROOT does not exist"
+			echo "please build the project first"
+			exit 1;
+		fi
+		if [ "$1" = "-r" ]; then
+			echo "reset changes"
+			scp_changes_reset
+			exit 0
+		fi
+		if [ ! -d $ROOT_OLD ]; then
+			echo "$ROOT_OLD does not exist"
+			echo "you didn't store state of previous buildroot"
+			#echo "please run ./scp_changes_reset.sh"
+			echo "doing it now"
+			scp_changes_reset
+			exit 1;
+		fi
+		FILES=`diff -rq "$ROOT" "$ROOT_OLD" 2>&1 | sed -ne "s?^Files .* and $ROOT_OLD\\(.*\\) differ?\\1?p" -ne "s?^Only in $ROOT\\(.*\\): \\(.*\\)?\\1/\\2?p"`
+		if [ "$1" = "-p" ]; then
+			echo "files that would be copied:"
+			echo $FILES
+			exit 0
+		fi
+		for f in $FILES
+		do
+			mkdir -p "$ROOT_TMP`dirname $f`"
+			cp -af "$ROOT$f" "$ROOT_TMP$f"
+		done
+		if [ -d "$ROOT_TMP" ]; then
+			echo "scp changed files to $1"
+			pushd "$ROOT_TMP" 2>&1 >/dev/null
+			scp -r * root@$1:/
+			RETVAL=$?
+			popd 2>&1 >/dev/null
+			rm -rf "$ROOT_TMP"
+			if [ "$RETVAL" -eq 0 ]; then
+				scp_changes_reset
+			else
+				echo "scp error"
+				exit $RETVAL
+			fi
+		else
+			echo "no change"
+		fi
+	}
+}
+
+register_command "scp_changes" "<host/-r(eset)/-p(retend)>  SCP only changed files to device"

iop/scripts/taas.sh

@@ -1,95 +0,0 @@
-
-# Shorthand command for doing a HIL runtime smoketest on the
-# latest built image. Does the image boot up correctly?
-# More info here:
-# https://dev.iopsys.eu/iopsys/iopsys-taas
-
-
-#--------------------------------------------------------------
-function taas-init() {
-	local f
-
-	# Path to TaaS binarys. Try some likely ones.
-	if ! which taas-smoketest >/dev/null; then
-		PATH="${PATH}:${PWD}/../iopsys-taas/bin"
-		PATH="${PATH}:${PWD}/../taas/bin"
-		PATH="${PATH}:${HOME}/iopsys-taas/bin"
-		PATH="${PATH}:${HOME}/taas/bin"
-		PATH="${PATH}:${HOME}/bin"
-		PATH="${PATH}:/opt/iopsys-taas/bin"
-		PATH="${PATH}:/opt/taas/bin"
-	fi
-
-	if ! which taas-smoketest >/dev/null; then
-		echo "Error; TaaS is missing! Install it with:"
-		echo "git clone git@dev.iopsys.eu:iopsys/iopsys-taas.git ../iopsys-taas"
-		exit 1
-	fi
-
-	# NAND erase block size.
-	nandBlkSz=$(grep CONFIG_TARGET_NAND_BLOCKSZ .config | \
-		tr -s "=\"" " " | cut -d " " -f 2)
-	nandBlkSz=$((nandBlkSz / 1024))
-
-	# Create a list of all images which might be of use.
-	for f in ${PWD}/bin/targets/iopsys-*/generic/last.* \
-			${PWD}/build_dir/target-arm*/bcmkernel/bcm963xx/targets/9*/bcm*_linux_raw_image_${nandBlkSz}.bin; do
-		[[ -s "$f" ]] && images+=("$f")
-	done
-
-	# Convert Iopsys target name to the TaaS product name format
-	# according to what is available in the remote lab for HIL.
-	# Also find a suitable image.
-	product=$(grep CONFIG_TARGET_PROFILE .config | \
-		tr -s "=\"" " " | cut -d " " -f 2) || exit
-	case "$product" in
-		smarthub3)
-			export product="SmartHub3a"
-			;;
-		dg400prime|eg400|ex600)
-			export product=$(echo -n "$product" | tr [[:lower:]] [[:upper:]])
-			;;
-		*)
-			echo "Unsupported target; skipping!"
-			exit 0
-			;;
-	esac
-
-	if [[ ${#images[@]} -eq 0 ]]; then
-		echo "No image found"
-		exit 1
-	fi
-}
-
-
-
-#--------------------------------------------------------------
-function taas-smoketest {
-	declare -a images
-
-	taas-init || return
-	echo "Testing a $product with ${images[@]}..."
-	command taas-smoketest "${images[@]}" "$product" "$@"
-}
-
-
-
-#--------------------------------------------------------------
-function taas-bootstrap {
-	declare -a images
-
-	if [[ -n "$1" ]]; then
-		taas-init || return
-		echo "Flashing $1..."
-		command taas-bootstrap "${images[@]}" "$@"
-	else
-		echo "Usage: ./iop taas-bootstrap dutX"
-		exit 1
-	fi
-}
-
-
-
-register_command "taas-bootstrap" "Write image to a remote lab device."
-register_command "taas-smoketest" "Write image to a remote lab device and test it."
-

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)
 

iopupgrade/files/sbin/iopu

@@ -163,7 +163,6 @@ function usage {
     echo "	-x		Force install even if firmware is not for this board"
     echo "	-b		Force install of bootloader regardless of version installed"
     echo "	-r		Jump into chroot env of other system"
-    echo "	-f		Firmware file to use"
     echo "	-C \"command\"	Execute command in chroot env of other system"
 }
 
@@ -178,64 +177,6 @@ function newroot_exec {
 
 }
 
-function system_is_y_image {
-
-    # find out what rootfs volume is active.
-    cur_vol=$(get_flashbank_current)
-    upd_vol=$(get_flashbank_next)
-
-    # convert volume name "rootfs_$upd_vol" into ubi volume id
-    upd_ubi_id=$(ubinfo -d 0 -N rootfs_$upd_vol | awk "/Volume ID:/ {print \$3}")
-    log "installing Root Fileystem into UBI volume rootfs_$upd_vol"
-
-    # prepare to match dsl.
-    function_call upd_conf_dsl
-
-    log "now starting writing data to flash with [ iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id ]"
-    run_cleanup=1	# When we start to actually write data there might be some
-                        # things that need cleanup if we get an error/crash
-    if ! iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id; then
-	log "iopupgrade program Failed"
-	exit 1
-    fi
-
-    log "Firmware programmed to flash."
-
-    # Force upgrade of boot loader
-    [ $upd_forceboot -eq 1 ] && chroot_cmdline="$chroot_cmdline -b"
-
-    if [ $upd_keepconfig -eq 1 ]; then
-	log "Transfering configuration to new system."
-	chroot_cmdline="$chroot_cmdline -c"
-    fi
-
-    mount_newroot
-    if ! chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline; then
-	log "Configuration migration failed!"
-	exit 1
-    fi
-    umount_newroot
-
-    log "New firmware fully installed."
-    run_cleanup=0
-
-
-    # Now make sure that we actually boot the new system on the next reboot
-    upd_finnish
-
-}
-
-function system_is_FIT_image {
-
-    # prepare to match dsl.
-    #function_call upd_conf_dsl
-
-    #here we write data 
-    bcm_flasher $firmware_file
-    bcm_bootstate 1
-    log "Firmware programmed to flash."
-}
-
 ###############################################################################
 
 # just one instance
@@ -253,7 +194,7 @@ trap ctrl_c INT
 trap timeout SIGALRM
 trap sig_pipe SIGPIPE
 
-while getopts "nrxbhcC:f:" opt; do
+while getopts "nrxbhcC:" opt; do
     case $opt in
 	n)
 	    upd_noreboot=1
@@ -275,9 +216,6 @@ while getopts "nrxbhcC:f:" opt; do
 	    newroot_exec "${OPTARG}"
 	    exit
 	    ;;
-	f)
-	    firmware_file="${OPTARG}"
-	    ;;
 	h)
 	    usage
 	    exit 1
@@ -297,18 +235,59 @@ log "Firmware upgrade started"
 # Should board name be checked
 if [ $upd_forceimage -eq 0 ]
 then
-   board=$(db get hw.board.model_name)
+   board=$(db get hw.board.iopVerBoard)
    cmdline_match="board=$board"
 fi
 
-# BUG: should probably read a config file.
-if [ -f /proc/nvram/boardid ]
-then
-    system_is_FIT_image
-else
-    system_is_y_image
+# find out what rootfs volume is active. 
+cur_vol=$(get_flashbank_current)
+upd_vol=$(get_flashbank_next)
+
+# convert volume name "rootfs_$upd_vol" into ubi volume id
+upd_ubi_id=$(ubinfo -d 0 -N rootfs_$upd_vol | awk "/Volume ID:/ {print \$3}")
+log "installing Root Fileystem into UBI volume rootfs_$upd_vol"
+
+# prepare to match dsl.
+function_call upd_conf_dsl
+
+# prepare to update CFE if it exists
+function_call upd_conf_cfe
+
+# prepare to update kernel if it is stored in MTD/JFFS2 
+function_call upd_conf_kernel
+
+log "now starting writing data to flash with [ iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id ]"
+run_cleanup=1	# When we start to actually write data there might be some
+		# things that need cleanup if we get an error/crash
+if ! iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id; then
+	log "iopupgrade program Failed"
+	exit 1
 fi
 
+log "Firmware programmed to flash."
+
+# Force upgrade of boot loader
+[ $upd_forceboot -eq 1 ] && chroot_cmdline="$chroot_cmdline -b"
+
+if [ $upd_keepconfig -eq 1 ]; then
+	log "Transfering configuration to new system."
+	chroot_cmdline="$chroot_cmdline -c"
+fi
+
+mount_newroot
+if ! chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline; then
+	log "Configuration migration failed!"
+	exit 1
+fi
+umount_newroot
+
+log "New firmware fully installed."
+run_cleanup=0
+
+
+# Now make sure that we actually boot the new system on the next reboot
+upd_finnish
+
 # spawn the reboot to a subshell to allow the main program to quit before reset
 # to avoid any hanged network connection like ssh
 if [ $upd_noreboot -eq 0 ]

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

juci/Makefile

@@ -1,122 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=juci
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/juci.git
-PKG_SOURCE_VERSION:=70b66bfc7f0e25e77b6920c3d44e5b05f4bfcf95
-PKG_VERSION:=2020-05-27
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-
-PKG_RELEASE=$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/juci
-  $(Package/juci/default)
-  SECTION:=juci
-  CATEGORY:=JUCI
-  MENU=1
-  TITLE:=JUCI Core Package (select this to select default plugins)
-  DEPENDS:=+libubox +libubus +owsd +rpcd +rpcd-mod-file +questd
-endef
-
-define Build/InstallDev 
-	$(INSTALL_DIR) $(1)/usr/src/
-	ln -s $(PKG_BUILD_DIR) $(1)/usr/src/juci
-endef 
-
-define Build/Compile
-	$(call Build/Compile/Default,THEME_PATH="$(TOPDIR)/tmp/juci-themes/")
-endef
-
-define Package/juci/description
- JUCI Javascript UCI Web interface.
-endef
-
-define Package/juci/install
-	$(INSTALL_DIR) $(1)/
-	$(CP) $(PKG_BUILD_DIR)/bin/juci/* $(1)/
-	$(CP) ./files/* $(1)/
-endef
-
-define Package/juci/postinst
-#!/bin/sh
-
-juci-update
-exit 0
-endef
-
-$(eval $(call BuildPackage,juci))
-
-####### Extensions / Themes and Plugins
-
-define RegisterAddonInner
-define Package/$(2)
-	SECTION:=juci
-	CATEGORY:=JUCI
-	TITLE:=default
-	SUBMENU:=$(1)
-	TITLE:=$(if $(3),$(3),JUCI $(2) plugin)
-	DEPENDS:=$(4)
-endef
-
-define Package/$(2)/install
-	$(INSTALL_DIR) $$(1)/
-	$(CP) $(PKG_BUILD_DIR)/bin/$(2)/* $$(1)/
-endef
-endef
-
-define RegisterAddon
-	$(eval $(call RegisterAddonInner,$(1),$(2),$(3),$(4),$(5)))
-	$(eval $(call BuildPackage,$(2)))
-endef
-
-$(eval $(call RegisterAddon,Plugins,juci-catv, CATV Module,@(PACKAGE_catv)))
-$(eval $(call RegisterAddon,Plugins,juci-cgroups, CGroups Module,@(PACKAGE_icgroupd)))
-$(eval $(call RegisterAddon,Plugins,juci-ddns, DDNS Configuration,@(PACKAGE_ddns-scripts)))
-$(eval $(call RegisterAddon,Plugins,juci-diagnostics, Simple Diagnostics,@(PACKAGE_busybox)))
-$(eval $(call RegisterAddon,Plugins,juci-ndt, NDT Speed Test client,@(PACKAGE_ndt)))
-$(eval $(call RegisterAddon,Plugins,juci-dnsmasq-dhcp, DHCP/DNSMasq Configuration,@(PACKAGE_dnsmasq||PACKAGE_dnsmasq-full)))
-$(eval $(call RegisterAddon,Plugins,juci-dropbear, Dropbear Configuration,@(PACKAGE_dropbear)))
-$(eval $(call RegisterAddon,Plugins,juci-easyqos, Easy QoS module,@(PACKAGE_easy-qos)))
-$(eval $(call RegisterAddon,Plugins,juci-event, Event Module,@(PACKAGE_owsd)))
-$(eval $(call RegisterAddon,Plugins,juci-firewall-fw3, Firewall Configuration,@(PACKAGE_firewall)))
-$(eval $(call RegisterAddon,Plugins,juci-icwmp, TR-069 Module,@(PACKAGE_icwmp)))
-$(eval $(call RegisterAddon,Plugins,juci-config-backup, Config Backup Module))
-$(eval $(call RegisterAddon,Plugins,juci-qos, QoS module,@(PACKAGE_qos-scripts)))
-$(eval $(call RegisterAddon,Plugins,juci-voice-client, Asterisk Voice Client Module,@(PACKAGE_asterisk)))
-$(eval $(call RegisterAddon,Plugins,juci-minidlna, MiniDLNA Configuration,@(PACKAGE_minidlna)))
-$(eval $(call RegisterAddon,Plugins,juci-mcproxy, Multicast Proxy Configuration,@(PACKAGE_mcproxy)))
-$(eval $(call RegisterAddon,Plugins,juci-mod-status, Status Reporting Module,@(PACKAGE_questd)))
-$(eval $(call RegisterAddon,Plugins,juci-mod-system, System Administration Module))
-$(eval $(call RegisterAddon,Plugins,juci-mwan3, mwan3 Configuration,@(PACKAGE_mwan3)))
-$(eval $(call RegisterAddon,Plugins,juci-natalie-dect, DECT Module,@(PACKAGE_dectmngr2)))
-$(eval $(call RegisterAddon,Plugins,juci-netmode, Netmode Module,@(PACKAGE_netmode)))
-$(eval $(call RegisterAddon,Plugins,juci-network-device, Network Device Configuration,@(PACKAGE_netifd)))
-$(eval $(call RegisterAddon,Plugins,juci-network-dsl, DSL Module))
-$(eval $(call RegisterAddon,Plugins,juci-network-netifd, Network Module,@(PACKAGE_netifd)))
-$(eval $(call RegisterAddon,Plugins,juci-network-port, Ethernet Port Configuration,@(PACKAGE_port-management)))
-$(eval $(call RegisterAddon,Plugins,juci-openvpn, OpenVPN configuration,@(PACKAGE_openvpn)))
-$(eval $(call RegisterAddon,Plugins,juci-owsd, OWSD configuration,@(PACKAGE_owsd)))
-$(eval $(call RegisterAddon,Plugins,juci-printer, p910nd Printer Server Configuration,@(PACKAGE_p910nd)))
-#$(eval $(call RegisterAddon,Plugins,juci-realtime-graphs, Realtime Graphs))
-$(eval $(call RegisterAddon,Plugins,juci-samba, Samba Configuration,@(PACKAGE_samba3)))
-$(eval $(call RegisterAddon,Plugins,juci-sfp, SFP Configuration,@(PACKAGE_peripheral_manager)))
-$(eval $(call RegisterAddon,Plugins,juci-snmpd, SNMP Module,@(PACKAGE_snmpd)))
-$(eval $(call RegisterAddon,Plugins,juci-sysupgrade, Sysupgrade Firmware Upgrade,@(PACKAGE_rpcd-mod-rpcsys)))
-$(eval $(call RegisterAddon,Plugins,juci-uhttpd, uHTTPD Configuration,@(PACKAGE_uhttpd)))
-$(eval $(call RegisterAddon,Plugins,juci-upnp, UPnP Configuration Module,@(PACKAGE_miniupnpd)))
-#$(eval $(call RegisterAddon,Plugins,juci-usb, USB Module))
-$(eval $(call RegisterAddon,Plugins,juci-wireless, Wireless Management Module))
-$(eval $(call RegisterAddon,Plugins,juci-wifilife, WiFi Life Module,@(PACKAGE_wifilife)))
-$(eval $(call RegisterAddon,Themes,juci-theme-iopsys))
-
-####### dynamically publish themes as packages #######
-$(foreach th,$(wildcard $(TOPDIR)/tmp/juci-themes/*),$(eval $(call RegisterAddon,Themes,$(notdir $(th)))))

juci/files/etc/config/juci

@@ -1,66 +0,0 @@
-config juci 'juci'
-	option homepage 'overview'
-	option theme 'juci-theme-iopsys'
-	option favicon 'favicon.ico'
-
-config login 'login'
-	option showusername '1'
-	option defaultuser 'user'
-
-config localization 'localization'
-	option default_language 'en'
-	list languages 'en'
-
-config wiki 'wiki'
-	option visible '0'
-	option version 'v4.2.x'
-
-config widget
-	list name 'overviewWidget11WAN'
-	list require 'ubus:network.interface'
-
-config widget
-	list name 'overviewWidget10Network'
-	list require 'ubus:network.interface'
-	list require 'ubus:router.network->hosts'
-
-config widget
-	list name 'overviewWidget00WiFi'
-	list require 'ubus:wifi'
-	list require 'ubus:wifi.wps'
-
-config menu
-	option path 'overview'
-	option page 'overview'
-
-config menu
-	option path 'system'
-	option page 'system'
-	option redirect 'first'
-
-config menu
-	option path 'status'
-	option page 'status'
-	option redirect 'first'
-
-config menu
-	option path 'status/system'
-	option page 'status-system'
-	list require 'ubus:router.system->info'
-
-config menu
-	option path 'status/network'
-	option page 'status-network'
-	list require 'ubus:network.interface'
-
-config menu
-	option path 'status/dsl'
-	option page 'network-dsl-status'
-	list require 'ubus:dsl->stats'
-	list require 'ubus:dsl->status'
-
-config menu
-	option path 'system/upgrade'
-	option page 'settings-upgrade'
-	list expose 'admin'
-

juci/files/etc/init.d/juci

@@ -1,41 +0,0 @@
-#!/bin/sh /etc/rc.common
-. /lib/functions.sh
-
-START=94
-STOP=06
-
-USE_PROCD=1
-NAME=juci
-
-start_service() {
-	mkdir -p /tmp/juci
-	touch /www/index.html.gz
-	chmod 755 /www/cgi-bin/luci
-	# this will simply update index.html to include any files that are for some reason not included
-	# a good way to make sure all plugins are properly included at each boot
-	config_load juci
-	local theme
-	config_get theme juci theme
-	if [ "$theme" ]
-	then
-		if [ -f /www/themes/theme.js.gz ] 
-			then
-			rm -f /www/themes/theme.js.gz
-		fi
-		if [ -f /www/themes/*$theme.js.gz ]
-			then
-			ln -s /www/themes/*$theme.js.gz /www/themes/theme.js.gz
-		fi
-	fi
-	juci-update
-}
-
-stop() {
-	service_stop /sbin/juci
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger juci
-}
-

juci/files/etc/uci-defaults/00-default-juci-rpcd-acl

@@ -1,49 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-USER_SECTION=""
-USER_EXISTS=0
-
-find_user(){
-	local section="$1"
-	local user="$2"
-	config_get username $section username
-	if [ "$username" == "$user" ]; then
-		USER_SECTION="$section"
-		USER_EXISTS=1
-	fi
-}
-
-config_load rpcd
-
-USER_EXISTS=0
-config_foreach find_user login root
-if [ $USER_EXISTS -eq 1 ]; then
-	uci delete rpcd.$USER_SECTION
-fi
-
-USER_EXISTS=0
-config_foreach find_user login admin
-if [ $USER_EXISTS -eq 0 ]; then
-	uci -q add rpcd login >/dev/null
-	uci -q set rpcd.@login[-1].username="admin"
-	uci -q set rpcd.@login[-1].password="\$p\$admin"
-	uci -q add_list rpcd.@login[-1].read="enduser"
-	uci -q add_list rpcd.@login[-1].read="administrator"
-	uci -q add_list rpcd.@login[-1].write="enduser"
-	uci -q add_list rpcd.@login[-1].write="administrator"
-fi
-
-USER_EXISTS=0
-config_foreach find_user login user
-if [ $USER_EXISTS -eq 0 ]; then
-	uci -q add rpcd login >/dev/null
-	uci -q set rpcd.@login[-1].username="user"
-	uci -q set rpcd.@login[-1].password="\$p\$user"
-	uci -q add_list rpcd.@login[-1].read="enduser"
-	uci -q add_list rpcd.@login[-1].write="enduser"
-fi
-
-uci commit rpcd
-

juci/files/usr/share/rpcd/acl.d/administrator.json

@@ -1,21 +0,0 @@
-{
-	"administrator": {
-		"description": "Administrator Access Rights",
-		"read": {
-			"ubus": {
-				"file": [
-					"write"
-				],
-				"rpc-sys": [
-					"upgrade_start",
-					"upgrade_test"
-				]
-			}
-		},
-		"write": {
-			"file": {
-				"/tmp/firmware.bin": ["write"]
-			}
-		}
-	}
-}

juci/files/usr/share/rpcd/acl.d/enduser.json

@@ -1,217 +0,0 @@
-{
-	"enduser": {
-		"description": "End User Access Rights",
-		"read": {
-			"ubus": {
-				"dect": [
-					"state",
-					"handset",
-					"status",
-					"call"
-				],
-				"dsl": [
-					"status",
-					"stats"
-				],
-				"network.device": [
-					"status"
-				],
-				"network.interface*": [
-					"status",
-					"dump",
-					"up",
-					"down"
-				],
-				"router.network": [
-					"clients",
-					"hosts",
-					"dump"
-				],
-				"router.system": [
-					"info",
-					"memory",
-					"filesystem",
-					"process",
-					"processes"
-				],
-				"session": [
-					"access",
-					"list",
-					"destroy",
-					"login"
-				],
-				"system": [
-					"info",
-					"board",
-					"reboot"
-				],
-				"testnet": [
-					"status"
-				],
-				"uci": [
-					"*"
-				],
-				"voice.asterisk": [
-					"status",
-					"call_log",
-					"platform",
-					"supported_countries"
-				],
-				"wifi": [
-					"status"
-				],
-				"wifi.ap.*": [
-					"status",
-					"stats",
-					"assoclist",
-					"stations"
-				],
-				"wifi.radio.*": [
-					"status",
-					"stats",
-					"scan",
-					"scanresults",
-					"autochannel"
-				],
-				"wifi.wps": [
-					"start",
-					"stop",
-					"status",
-					"showpin"
-				]
-			},
-			"uci": [
-				"dhcp",
-				"firewall",
-				"juci",
-				"network",
-				"voice_client",
-				"wireless"
-			],
-			"owsd": [
-				"client",
-				"wifi.radio",
-				"wifi.sta",
-				"wifi.wps"
-			]
-		},
-		"write": {
-			"uci": [
-				"dhcp",
-				"firewall",
-				"network",
-				"wireless"
-			],
-			"uci_granular": {
-				"dhcp": [
-					{
-						"match": {
-							".type": "dhcp"
-						},
-						"option": [
-							"*"
-						]
-					},
-					{
-						"match": {
-							".type": "host"
-						},
-						"option": [
-							"*"
-						]
-					}
-				],
-				"firewall": [
-					{
-						"match": {
-							".type": "settings",
-							".name": "settings"
-						},
-						"option": [
-							"disabled"
-						]
-					},
-					{
-						"match": {
-							".type": "zone"
-						},
-						"option": [
-							"masq",
-							"name",
-							"network"
-						]
-					},
-					{
-						"match": {
-							".type": "redirect"
-						},
-						"option": [
-							"*"
-						]
-					},
-					{
-						"match": {
-							".type": "rule"
-						},
-						"option": [
-							"*"
-						]
-					},
-					{
-						"match": {
-							".type": "dmz"
-						},
-						"option": [
-							"enabled",
-							"host",
-							"ip6addr"
-						]
-					}
-				],
-				"network": [
-					{
-						"match": {
-							".type": "interface"
-						},
-						"option": [
-							"*"
-						]
-					}
-				],
-				"wireless": [
-					{
-						"match": {
-							".type": "wifi-status"
-						},
-						"option": [
-							"wps"
-						]
-					},
-					{
-						"match": {
-							".type": "wifi-iface",
-							"mode": "ap"
-						},
-						"option": [
-							"*"
-						]
-					},
-					{
-						"match": {
-							".type": "wifi-device"
-						},
-						"option": [
-							"channel"
-						]
-					}
-				]
-			},
-			"owsd": [
-				"client",
-				"wifi.radio",
-				"wifi.sta",
-				"wifi.wps"
-			]
-		}
-	}
-}

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

@@ -11,14 +11,13 @@ PKG_RELEASE:=1
 PKG_VERSION:=0.3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libpicoevent.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f446f186102539cceedaa15a95a33547ac3c1fd7
+PKG_SOURCE_VERSION:=f4ab03b22fca57cec6c959fb5c54bcdd64c32467
 PKG_NAME:=libpicoevent
 
 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
 

libtrace/Makefile

@@ -11,7 +11,6 @@ PKG_SOURCE_VERSION:=e4b4c5cce35a52da152776a00532aa0b80879c5b
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=COPYING

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.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=46afa4c0aa56d8762d9402cfdaddf4adaa8a058a
+PKG_SOURCE_VERSION:=5fed40b905a673e41eee05fc60e4a424a9826b56
 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)
@@ -44,6 +43,18 @@ TARGET_CFLAGS += \
 	-Wall \
 	-Wextra
 
+ifeq ($(CONFIG_IEEE1905_SEND_EMPTY_TLVS),y)
+TARGET_CFLAGS += -DSEND_EMPTY_TLVS
+endif
+ifeq ($(CONFIG_IEEE1905_FIX_BROKEN_TLVS),y)
+TARGET_CFLAGS += -DFIX_BROKEN_TLVS
+endif
+ifeq ($(CONFIG_IEEE1905_SPEED_UP_DISCOVERY),y)
+TARGET_CFLAGS += -DSPEED_UP_DISCOVERY
+endif
+ifeq ($(CONFIG_IEEE1905_DO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS),y)
+TARGET_CFLAGS += -DDO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS
+endif
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
@@ -52,10 +63,8 @@ endef
 endif
 
 define Package/map-1905/install
-	$(INSTALL_DIR) $(1)/usr/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/libwifimap2.so $(1)/usr/lib/ieee1905/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifimap2.so $(1)/usr/lib/
 endef
 
 define Package/libmaputils/install
@@ -68,6 +77,7 @@ define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/map1905
 	$(CP) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/map1905/
 	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifimap2.so $(1)/usr/lib/
 	$(CP) $(PKG_BUILD_DIR)/libmaputils.so $(1)/usr/lib/
 endef
 

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=3.5.20
+PKG_VERSION:=2.0.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f396b503f111461e7869f302907e1d9ec639ca3a
+PKG_SOURCE_VERSION:=362ddbaf2b9a5510c89b740fcc23d8425770da3d
 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
 endef
 
 define Package/map-agent/description
@@ -52,7 +51,6 @@ endef
 
 define Package/map-agent/install
 	$(INSTALL_DIR) $(1)/etc
-	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/src/utils/*.so* $(1)/usr/lib/

map-agent/files/etc/config/mapagent

@@ -1,32 +0,0 @@
-config agent 'agent'
-	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 '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)

map-agent/files/etc/hotplug.d/ethernet/map-loop-detection

@@ -1,84 +0,0 @@
-#!/bin/sh
-
-diff=0
-wan=$(uci -q get ports.WAN.ifname)
-
-[ "$wan" == "" ] && exit 1 # no configuration
-[ "$PORT" != "$wan" ] && exit 0
-
-get_bridge() {
-	local id
-	local ifname="$1"
-	local bridge=""
-	id=$(cat /sys/class/net/${ifname}/brport/bridge/bridge/bridge_id)
-
-	#echo "bridge id = $id" > /dev/console
-
-	[ "$id" = "" ] && return
-
-	bridge=$(brctl show | grep $id | cut -f1)
-
-	case "$bridge" in
-		br-*)
-			bridge=$(echo $bridge | cut -c4-)
-		;;
-	esac
-
-	echo $bridge
-}
-
-disable_bstas() {
-	section="$1"
-
-	config_get mode "$section" mode "ap"
-	config_get ifname "$section" ifname
-	config_get device "$section" device
-	#echo mode=$mode ifname=$ifname > /dev/console
-
-	[ "$mode" == "sta" ] || return
-
-	uci set wireless.$section.disabled=1
-	bridge=$(get_bridge $ifname)
-	if [ "$bridge" != "" ]; then
-		#echo got bridge = $bridge > /dev/console
-		ubus call network.interface.$bridge remove_device '{"name":"$ifname"}'
-	fi
-	ifconfig "$ifname" down
-
-	diff=1
-	#echo disabled $ifname > /dev/console
-}
-
-enable_bstas() {
-	section="$1"
-	config_load "wireless"
-
-	config_get mode "$section" mode "ap"
-	config_get ifname "$section" ifname
-	config_get device "$section" device
-	#echo mode=$mode ifname=$ifname > /dev/console
-
-	[ "$mode" == "sta" ] || return
-
-	uci set wireless.$section.disabled=0
-	ifconfig "$ifname" up
-
-	diff=1
-	#echo enabled $ifname > /dev/console
-}
-
-config_load "wireless"
-
-if [ "$LINK" == "up" ]; then
-	config_foreach disable_bstas wifi-iface
-else
-	config_foreach enable_bstas wifi-iface
-fi
-
-#echo diff = $diff > /dev/console
-
-uci -q commit wireless
-[ "$diff" == "1" ] && {
-	#echo reloading via uci > /dev/console
-	ubus call uci commit '{"config":"wireless"}'
-}

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

@@ -1,31 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=98
-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
-#	procd_set_param stdout 1
-#	procd_set_param stderr 1
-	procd_close_instance
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "ieee1905"
-}
-
-reload_service() {
-	stop
-	start
-}

map-controller/Makefile

@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2020 IOPSYS Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=map-controller
-PKG_VERSION:=2.4.12
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=e4d286f6348519de2613d4ba3548ec811c60ad7b
-
-PKG_LICENSE:=PROPRIETARY IOPSYS
-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
-
-define Package/map-controller
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libmaputils +libwsc +libeasy
-endef
-
-define Package/map-controller/description
- This package provides WiFi MultiAP Controller as per the EasyMesh-R2 specs.
-endef
-
-define Package/map-controller/config
-	#source "$(SOURCE)/Config.in"
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-MAKE_PATH:=src
-
-define Package/map-controller/install
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapcontroller $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,map-controller))

map-controller/files/etc/config/mapcontroller

@@ -1,44 +0,0 @@
-config controller 'controller'
-	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'
-
-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'
-
-config bk-credentials
-	option band '5'
-	option encryption 'psk2'
-	option key '5555555555'
-	option ssid 'map-bkhaul-5'
-	option multi_ap '2'
-	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'
-	option encryption 'psk2'
-	option key '2222222222'
-	option ssid 'map-bkhaul-2'
-	option multi_ap '2'
-	option disallow_bsta '0'                # 0 or 1 profile-1 bSTA
-	option vlan '1'

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

@@ -1,58 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=98
-STOP=20
-
-USE_PROCD=1
-
-handle_controller_select() {
-	local section="$1"
-
-	config_get_bool local_ctrl "$section" local 0
-	return 1
-}
-
-start_service() {
-	local enabled
-	local local_ctrl=0
-
-	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"
-
-	config_load "mapagent"
-	config_foreach handle_controller_select controller_select
-	[ "$local_ctrl" -eq 0 ] && procd_append_param command "-w"
-
-	procd_set_param respawn
-#	procd_set_param stdout 1
-#	procd_set_param stderr 1
-	procd_close_instance
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "mapcontroller"
-}
-
-reload_service() {
-	local enabled
-
-	config_load "mapcontroller"
-	config_get_bool enabled controller enabled 1
-	if [ "$enabled" -eq 0 ]; then
-		stop
-		return
-	fi
-
-	pidof "mapcontroller" > /dev/null
-	if [[ $? -ne 0 ]] ; then
-		start
-		return
-	fi
-
-	procd_send_signal "mapcontroller"
-}

map-topology/Makefile

@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2020 iopsys
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=map-topology
-PKG_VERSION:=1.5.22
-
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=f10842f576fc29f6c3145a4b4b0efcb931d0e643
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=PROPRIETARY IOPSYS
-PKG_LICENSE_FILES:=LICENSE
-include $(INCLUDE_DIR)/package.mk
-
-define Package/map-topology
-	CATEGORY:=Utilities
-	DEPENDS:=+libubox +ubus +libpthread +libuci +libeasy \
-		+libieee1905 +libavahi-nodbus-support
-	TITLE:=Utility to build topology of a multi-AP network
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include
-
-define Package/map-topology/description
-	Constructs network topology and show it as json structure over UBUS
-endef
-
-MAKE_PATH:=src
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        $(CP) -rf ~/git/map-topology/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/map-topology/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/topologyd $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,map-topology))

map-topology/files/etc/config/topology

@@ -1,6 +0,0 @@
-
-config topology 'topology'
-	option enabled '1'
-	option depth '8'
-	option interval '60'
-	option maxlog '32'

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

@@ -1,24 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=97
-STOP=21
-
-USE_PROCD=1
-
-start_service() {
-	procd_open_instance
-        procd_set_param command "/usr/sbin/topologyd"
-	procd_set_param respawn
-#	procd_set_param stdout 1
-	procd_set_param stderr 1
-	procd_close_instance
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "network"
-}
-
-reload_service() {
-	procd_send_signal "topologyd"
-}

mcastmngr/files/etc/uci-defaults/61-mcast_config_generate

@@ -51,9 +51,6 @@ if [ -s "/etc/config/mcast" ]; then
 	if uci -q get mcast.@proxy[0] >/dev/null; then
 		# return if there is any valid content
 		exit
-	elif uci -q get mcast.@snooping[0] >/dev/null; then
-		# return if there is any valid content
-		exit
 	else
 		rm -f /etc/config/mcast
 	fi

mcastmngr/files/lib/mcast/broadcom.sh

@@ -11,10 +11,6 @@ PROG_EXE=/usr/sbin/mcpd
 # Parameters available in snooping configuration
 igmp_s_enable=0
 igmp_s_version=2
-igmp_s_query_interval=125
-igmp_s_q_resp_interval=100
-igmp_s_last_mem_q_int=10
-igmp_s_fast_leave=1
 igmp_s_robustness=2
 igmp_s_mode=0
 igmp_s_iface=""
@@ -81,10 +77,6 @@ read_snooping() {
 	if [ "$proto" == "igmp" ]; then
 		igmp_s_enable=$sec_enable
 		config_get igmp_s_version "$config" version 2
-		config_get igmp_s_query_interval "$config" query_interval 125
-		config_get igmp_s_q_resp_interval "$config" query_response_interval 100
-		config_get igmp_s_last_mem_q_int "$config" last_member_query_interval 10
-		config_get igmp_s_fast_leave "$config" fast_leave 1
 		config_get igmp_s_robustness "$config" robustness 2
 		config_get igmp_s_mode "$config" snooping_mode 0
 		config_get igmp_s_iface "$config" interface
@@ -96,10 +88,6 @@ read_snooping() {
 	if [ "$proto" == "mld" ]; then
 		mld_s_enable=$sec_enable
 		config_get mld_s_version "$config" version 2
-		config_get mld_s_query_interval "$config" query_interval 125
-		config_get mld_s_q_resp_interval "$config" query_response_interval 100
-		config_get mld_s_last_mem_q_int "$config" last_member_query_interval 10
-		config_get mld_s_fast_leave "$config" fast_leave 1
 		config_get mld_s_robustness "$config" robustness 2
 		config_get mld_s_mode "$config" snooping_mode 0
 		config_get mld_s_iface "$config" interface
@@ -260,28 +248,23 @@ configure_mcpd_snooping() {
 	local protocol="$1"
 	local exceptions
 	local filter_ip=""
-	local fast_leave=0
 	
 	# Configure snooping related params
 	if [ "$protocol" == "igmp" ]; then
-		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
-		config_mcast_querier_params $protocol $igmp_s_query_interval $igmp_s_q_resp_interval $igmp_s_last_mem_q_int
+		config_snooping_common_params $protocol $igmp_p_version $igmp_p_robustness $igmp_s_mode
+		config_mcast_querier_params $protocol $igmp_query_interval $igmp_q_resp_interval $igmp_last_mem_q_int
 		config_mcast_proxy_interface $protocol "$igmp_s_iface"
 		config_snooping_on_bridge $protocol $igmp_s_iface $igmp_s_mode
 		exceptions=$igmp_s_exceptions
-		fast_leave=$igmp_s_fast_leave
 	elif [ "$protocol" == "mld" ]; then
-		config_snooping_common_params $protocol $mld_s_version $mld_s_robustness $mld_s_mode
-		config_mcast_querier_params $protocol $mld_s_query_interval $mld_s_q_resp_interval $mld_s_last_mem_q_int
+		config_snooping_common_params $protocol $mld_p_version $mld_p_robustness $mld_s_mode
+		config_mcast_querier_params $protocol $mld_query_interval $mld_q_resp_interval $mld_last_mem_q_int
 		config_mcast_proxy_interface $protocol "$mld_s_iface"
 		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
 		exceptions=$mld_s_exceptions
-		fast_leave=$mld_s_fast_leave
 	fi
 
 	echo "${protocol}-proxy-enable 0" >> $CONFFILE
-	echo "${protocol}-fast-leave $fast_leave" >> $CONFFILE
-
 	if [ -n "$exceptions" ]; then
 		IFS=" "
 		for excp in $exceptions; do

mqtt-ciotc/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 IOPSYS
+# Copyright (C) 2013 Inteno
 #
 
 include $(TOPDIR)/rules.mk
@@ -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:=http://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/Config.in

@@ -1,15 +0,0 @@
-if PACKAGE_obuspa
-
-config OBUSPA_MTP_ENABLE_STOMP
-	bool "Enable STOMP as mtp protocol"
-	default y
-
-config OBUSPA_MTP_ENABLE_MQTT
-	bool "Enable MQTT as mtp protocol"
-	default y
-
-config OBUSPA_MTP_ENABLE_COAP
-	bool "Enable CoAP as mtp protocol"
-	default y
-
-endif

obuspa/Makefile

@@ -5,16 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=3.0.0.32
+PKG_VERSION:=2.0.20
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7afcb04746566f19478dfdb5dd922d57d9e60166
+PKG_SOURCE_VERSION:=44fa7f29682e89ca3992a9c88c5bdefa1cacdc52
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
-PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -24,50 +22,33 @@ PKG_FIXUP:=autoreconf
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/obuspa
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=USP agent
-  PKG_BUILD_DEPENDS:=+openssl +ubus +sqlite3 +curl +ubox +uci
-  DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +libmosquitto +uspd +libuci
+  DEPENDS:=+libcoap +libopenssl +libcurl +libsqlite3 +libcares +libubox +libubus +libblobmsg-json +uspd
 endef
 
 define Package/obuspa/description
  OB-USP-AGENT is a system daemon providing a User Services Platform (USP) Agent.
 endef
 
-define Package/obuspa/config
-	source "$(SOURCE)/Config.in"
-endef
-
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE
+	-D_GNU_SOURCE \
+	-Wall \
+	-Wextra \
+	-fstrict-aliasing \
+	-Werror=format-overflow \
+	-Wno-error=unused-parameter \
+	-Wno-error=sign-compare
 
-ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_STOMP),y)
-  CONFIGURE_ARGS += \
-	--enable-stomp
-else
-  CONFIGURE_ARGS += \
-	--disable-stomp
-endif
 
-ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_MQTT),y)
-  CONFIGURE_ARGS += \
-	--enable-mqtt
-else
-  CONFIGURE_ARGS += \
-	--disable-mqtt
-endif
-
-ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_COAP),y)
-  CONFIGURE_ARGS += \
-	--enable-coap
-else
-  CONFIGURE_ARGS += \
-	--disable-coap
+ifneq ($(CONFIG_USE_MUSL),)
+TARGET_CFLAGS += -DUSE_MUSL
 endif
 
 ifeq ($(LOCAL_DEV),1)
@@ -81,12 +62,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_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
-	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-obuspa $(1)/etc/hotplug.d/iface/
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -1,60 +1,44 @@
-config obuspa 'global'
-	option enabled '1'
+# controller, mtp, connection makes a group and related to one another
+# ex: first controller will be mapped to first mtp and first connection
+# details, always defined in groups
+
+config obuspa
+	option enable 'true'
+	option cert '/etc/obuspa/rootCA.pem'
 	option interface 'wan'
-	#option ifname 'eth0.1'
-	option debug '0'
+	option debug 'false'
 	option log_level '1'
-	#option db_file '/etc/obuspa/usp.db'
-	option role_file '/etc/obuspa/roles.json'
-	#option trust_cert '/etc/obuspa/rootCA.pem'
-	#option client_cert '/etc/obuspa/client.pem'
 	#option log_dest '/var/log/obuspa'
 
-config localagent 'localagent'
-	option Enable '1'
+config controller
+	option endpointid 'self::usp-controller.com'
+	option enable 'true'
+	# Trust cerificate number
+	option AssignedRole 1
+	option PeriodicNotifInterval "86400"
+	option PeriodicNotifTime "0001-01-01T00:00:00Z"
+	option USPRetryMinimumWaitInterval "5"
+	option USPRetryIntervalMultiplier "2000"
+	option ControllerCode ""
+	option protocol 'STOMP'
 
-# Adds Device.LocalAgent.Controller.
-config controller 'localcontroller'
-	option EndpointID 'proto::interop-usp-controller'
-	option Protocol 'MQTT'
-	option Topic '/usp/controller'
-	option mqtt 'localmqtt'
-	option assigned_role_name 'Full Access'
-
-# Adds Device.LocalAgent.MTP.
 config mtp
-	option Protocol 'MQTT'
-	option ResponseTopicConfigured '/usp/endpoint'
-	option mqtt 'localmqtt'
+	option enable 'true'
+	option protocol 'STOMP'
+	option destination ''
 
-# Adds Device.MQTT.Client.
-config mqtt 'localmqtt'
-	option BrokerAddress '127.0.0.1'
-	option BrokerPort '1883'
-	option TransportProtocol 'TCP/IP'
-	option Username 'admin'
-	option Password 'admin'
+config connection
+	option host 'usp-controller.com'
+	option username 'username'
+	option password 'password'
+	option encryption 'true'
+	option enable 'true'
+	option port 61613
+	option virtualhost '/'
+	option EnableHeartbeats "true"
+	option OutgoingHeartbeat "30000"
+	option IncomingHeartbeat "300000"
+	option ServerRetryInitialInterval "60"
+	option ServerRetryIntervalMultiplier "2000"
+	option ServerRetryMaxInterval "30720"
 
-# Add Device.LocalAgent.Subscription.
-config subscription
-	option ID 'default-boot-event-ACS'
-	option NotifType 'Event'
-	option ReferenceList 'Device.Boot!'
-	option Persistent 'true'
-	option controller 'localcontroller'
-
-config challenge 'admin'
-	option Description 'Request to get Administrative access'
-	option role_name 'Full Access'
-	option Enable '1'
-	option Value 'admin'
-	option Retries 2
-	option LockoutPeriod 60
-
-config challenge 'user'
-	option Description 'Request to get User access'
-	option role_name 'user'
-	option Enable '1'
-	option Value 'user'
-	option Retries 3
-	option LockoutPeriod 30

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

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-[ "$(uci -q get obuspa.global.interface)" == "$INTERFACE" ] || exit 0
-
-[ "$ACTION" = ifup -o "$ACTION" = ifupdate ] || exit 0
-[ "$ACTION" = ifupdate -a -z "$IFUPDATE_ADDRESSES" ] && exit 0
-
-/etc/init.d/obuspa reload
-