Event catch for Led blinking

Telia Eesti-Make tone Configurable adding the tonetypes
Telia Eesti-Make tone Configurable
2025-12-26 20:14:11 +08:00 · 2019-10-08 15:21:51 +02:00 · 2019-09-05 09:49:57 +02:00 · 2019-09-05 09:47:50 +02:00 · 2019-08-21 10:08:05 +02:00 · 2019-08-19 10:29:29 +02:00
114 changed files with 1720 additions and 2095 deletions
--- a/ated/Makefile
+++ b/ated/Makefile
@@ -1,15 +1,8 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
+# Copyright (C) 2016 inteno
 #
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
 #

 include $(TOPDIR)/rules.mk
@@ -27,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 #PKG_BUILD_PARALLEL:=1

--- a/bashdb/Makefile
+++ b/bashdb/Makefile
@@ -13,9 +13,6 @@ PKG_MD5SUM:=b72c17870bfab2fd791b1f6de4d79f9e
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
--- a/bbf/Config_bbfdm.in
+++ b/bbf/Config_bbfdm.in
@@ -1,27 +0,0 @@
-if PACKAGE_libbbfdm
-
-config LIBBBFDM_VENDOR_PREFIX
-    string "Vendor Prefix"
-    default "X_IOPSYS_EU_"
-
-config BBF_TR181
-	bool "Compile with tr181 device features"
-	default y
-
-config BBF_TR104
-	bool "Compile with tr104 voice features"
-	default y
-
-config BBF_TR143
-	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
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -1,89 +0,0 @@
-#
-# Copyright (C) 2019 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libbbfdm
-PKG_VERSION:=1.0-2019-12-10
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0ea0b2c89a51ad56ca76d171b7fd5dcf38e102cd
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libbbfdm
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace
-endef
-
-define Package/libbbfdm/config
-	source "$(SOURCE)/Config_bbfdm.in"
-endef
-
-define Package/libbbfdm/description
- Test description will update later.
-endef
-
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBBBFDM_VENDOR_PREFIX)\\\"
-
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE -D_AADJ
-
-ifeq ($(CONFIG_BBF_TR181),y)
-CONFIGURE_ARGS += \
-	--enable-tr181
-endif
-
-ifeq ($(CONFIG_BBF_TR104),y)
-CONFIGURE_ARGS += \
-	--enable-tr104
-endif
-
-ifeq ($(CONFIG_BBF_TR143),y)
-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
-
-define Package/libbbfdm/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	$(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
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
-	$(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/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libbbfdm))
--- a/bbk_cli/Makefile
+++ b/bbk_cli/Makefile
@@ -1,42 +0,0 @@
-#
-# Copright (C) 2018 The Internet Foundation In Sweden
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bbk_cli
-PKG_SOURCE_VERSION:=7b810a696c78b746185c11282bdbe3fb7f8c5d4b
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/dotse/bbk.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bbk_cli
-	CATEGORY:=Utilities
-	DEPENDS:=+libpthread +libstdcpp
-	TITLE:=Bredbandskollen CLI - A bandwidth measurement tool
-endef
-
-define Package/bbk_cli/description
-	To measure connection speed in an environment that is missing a web browser, 
-	for example, in a server, you can use our command line interface bbk_cli, 
-	which is available for some of the most common operating systems.
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/src/cli CROSS_COMPILE="$(TARGET_CROSS)"
-endef
-
-define Package/bbk_cli/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/cli/cli $(1)/sbin/bbk_cli
-endef
-
-$(eval $(call BuildPackage,bbk_cli))
--- a/bbk_cli/patches/0001-add-openwrt-cross-compile-support.patch
+++ b/bbk_cli/patches/0001-add-openwrt-cross-compile-support.patch
@@ -1,25 +0,0 @@
-diff --git a/src/framework/engine.h b/src/framework/engine.h
-index 57a48ad..9e1bc36 100644
--- a/src/framework/engine.h
-+++ b/src/framework/engine.h
-@@ -10,6 +10,7 @@
- #include <map>
- #include <vector>
- #include <string>
-+#include <sys/select.h>
- 
- #include "logger.h"
- 
-diff --git a/src/framework/mk.inc b/src/framework/mk.inc
-index 793e211..13275be 100644
--- a/src/framework/mk.inc
-+++ b/src/framework/mk.inc
-@@ -7,7 +7,7 @@ OS:=$(shell uname)
- CXXFLAGS += -O2 -W -Wall -I$(DIRLEVEL)
- 
- ifeq ($(OS),Linux)
-CXX = g++
-+CXX = $(CROSS_COMPILE)g++
- endif
- 
- ifeq ($(OS),Darwin)
--- a/bootchart2/Makefile
+++ b/bootchart2/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_VERSION:=3ab81137cafe25c2ca4bc3a5f322a63646f9ce8d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
 include $(INCLUDE_DIR)/package.mk

 define Package/bootchart2
--- a/catv/Makefile
+++ b/catv/Makefile
@@ -1,19 +1,9 @@
-#
-# Copyright (C) 2018 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:=catv
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
 include $(INCLUDE_DIR)/package.mk

 define Package/catv
--- a/crashlog/Makefile
+++ b/crashlog/Makefile
@@ -1,18 +1,9 @@
-#
-# 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_NAME:=crashlog
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none

 include $(INCLUDE_DIR)/package.mk

--- a/dectmngr2/Makefile
+++ b/dectmngr2/Makefile
@@ -1,20 +1,19 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # 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_SOURCE_VERSION:=5a5c94b289c79bc3a635b8d742dd9b73dcc0615f
 PKG_NAME:=dectmngr2

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE

 RSTRIP:=true
 export BUILD_DIR
@@ -30,7 +29,7 @@ define Package/dectmngr2
  CATEGORY:=Utilities
  TITLE:=Dectmngr2
  URL:=
-  DEPENDS:= +natalie-dect-h +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen @(PACKAGE_bcmkernel||PACKAGE_bcmopen) +libubox +ubus +libpicoevent endptmngr
+  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent
 endef

 define Package/dectmngr2/description
--- a/dslmngr/Makefile
+++ b/dslmngr/Makefile
@@ -19,9 +19,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 endif

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-

 include $(INCLUDE_DIR)/package.mk

--- a/easy-qos/Makefile
+++ b/easy-qos/Makefile
@@ -1,29 +1,19 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# 
-
 include $(TOPDIR)/rules.mk

 PKG_NAME:=easy-qos
-PKG_VERSION:=1.1
+PKG_VERSION:=1.0
 PKG_RELEASE:=0

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
 include $(INCLUDE_DIR)/package.mk

 define Package/easy-qos
  SECTION:=net
  CATEGORY:=Network
  TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_intel_mips||TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_brcm63xx_mips)
 endef

 define Package/easy-qos/description
-	This package contains Easy QoS utility
+	This package contains Easy QoS utitie
 endef

 define Build/Prepare
@@ -39,11 +29,7 @@ define Package/easy-qos/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(CP) ./files/etc/config/easy_qos $(1)/etc/config/
-ifeq ($(CONFIG_TARGET_intel_mips),y)
-	$(CP) ./files/etc/init.d/easy_qos.classcfg $(1)/etc/init.d/easy_qos
-else
 	$(CP) ./files/etc/init.d/easy_qos.iptables $(1)/etc/init.d/easy_qos
-endif
 	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
 	$(CP) ./files/etc/firewall.easyqos $(1)/etc/firewall.easyqos
 endef
--- a/easy-qos/files/etc/init.d/easy_qos.classcfg
+++ b/easy-qos/files/etc/init.d/easy_qos.classcfg
@@ -1,301 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-USE_PROCD=1
-
-RULE_LIST="/tmp/easy_qos_rule.list"
-CLIENT_LIST="/tmp/easy_qos_class_client.list"
-BRIDGE_INTF=""
-
-[ -f /etc/profile.d/intel.sh ] && {
-	. /etc/profile.d/intel.sh
-	sh /etc/profile.d/intel.sh
-}
-
-log() {
-	echo "${@}"|logger -t easy_qos_class -p debug
-}
-
-exec_log() {
-	${@}
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-	fi
-}
-
-exec_class_log() {
-	${@} |grep -i successful
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-		return 1
-	fi
-	return 0
-}
-
-get_priority() {
-	local prio=$(echo $1|tr [A-Z] [a-z]);
-	case "${prio}" in
-		"lowest")
-			echo 8;;
-		"low")
-			echo 7;;
-		"besteffort")
-			echo 6;;
-		"normal")
-			echo 5;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 3;;
-		"high")
-			echo 2;;
-		"highest")
-			echo 1;;
-	esac
-}
-
-get_mark() {
-	local prio=$(echo $1|tr [A-Z] [a-z]);
-	case "${prio}" in
-		"lowest")
-			echo "0x41/0x3df";;
-		"low")
-			echo "0x82/0x3df";;
-		"besteffort")
-			echo "0xc3/0x3df";;
-		"normal")
-			echo "0x104/0x3df";;
-		"video")
-			echo "0x145/0x3df";;
-		"medium")
-			echo "0x186/0x3df";;
-		"high")
-			echo "0x1c7/0x3df";;
-		"highest")
-			echo "0x208/0x3df";;
-	esac
-}
-
-clean_client_entries() {
-	[ -f ${CLIENT_LIST} ] && rm ${CLIENT_LIST}
-}
-
-map_client_entries() {
-	local clients ip mac host
-
-	json_load "$(ubus call router.network 'clients')"
-	json_get_keys keys
-
-	for key in ${keys};
-	do
-		json_select ${key}
-		json_get_vars ipaddr macaddr hostname
-		clients="${macaddr} ${ipaddr} ${hostname};${clients}"
-		json_select ..
-	done
-
-	json_init
-
-	IFS=";"
-	for client in ${clients};
-	do
-		macaddr=$(echo ${client} | cut -d" " -f1)
-		json_add_object "${macaddr//:/_}"
-		json_add_string "ip" "$(echo ${client} | cut -d" " -f2)"
-		json_add_string "macaddr" "$(echo ${client} | cut -d" " -f1)"
-		json_add_string "host" "$(echo ${client} | cut -d" " -f3)"
-		json_close_object
-	done
-
-	IFS=' '
-	echo `json_dump` > ${CLIENT_LIST}
-	json_cleanup
-}
-
-# Find the IP of a corresponding mac from arp table
-get_ipaddress() {
-	local clients ip mac host
-
-	json_load "$(cat ${CLIENT_LIST})"
-	json_get_keys keys
-
-	# jshn seems a bit iffy on having : in key, replace by _
-	json_select "${1//:/_}" 2 > /dev/null
-	json_get_var ip ip
-
-	echo "$ip"
-}
-
-check_and_create() {
-	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
-	# Create rule if not exists
-	if [ ${?} -ne 0 ]; then
-		exec_log iptables -t mangle -A PREROUTING ${@}
-	else
-		log "Rule exists for ${@}"
-	fi
-}
-
-create_ip_rule() {
-	local proto=$1; shift
-	local src_ip=$1; shift
-	local mark=$1; shift
-	local ports=$1;
-	local cmd="";
-
-	cmd="-j EXTMARK --set-mark ${mark}";
-	if [ "${proto}" != "icmp" ]; then
-		if [ -n "${ports}" ]; then
-			cmd="--match multiport --dports ${ports} ${cmd}";
-		fi
-	fi
-
-	if [ "${proto}" == "icmp" ]; then
-		cmd="-p icmp -m icmp --icmp-type 8 $cmd"
-	elif [ "${proto}" == "all" ]; then
-		cmd="-p all $cmd"
-	else
-		cmd="-p ${proto} -m ${proto} $cmd"
-	fi
-	cmd="-s ${src_ip} $cmd"
-
-	check_and_create ${cmd}
-}
-
-is_lan_bridge() {
-	local _section=$1
-	local _type
-	local _is_lan
-
-	config_get _type "$section" "type"
-	config_get _is_lan "$section" "is_lan"
-
-	if [ "${_type}" == "bridge" -a "${_is_lan}" == "1" ]; then
-		BRIDGE_INTF="br-${_section}"
-	fi
-}
-
-get_bridge_interface() {
-	config_load network
-	config_foreach is_lan_bridge interface
-}
-
-validate_rule_section()
-{
-	uci_validate_section easy_qos rule "${1}" \
-		'priority:string' \
-		'macaddr:string' \
-		'proto:string:none' \
-		'port:list(uinteger)' \
-		'comment:string:none'
-}
-
-# Clear existing rules before applying new rules
-clear_existing_rules() {
-	# execute the delete rules written onto a file then delete the file
-	[ -f ${RULE_LIST} ] || return 0
-
-	while read line
-	do
-		log "Deleting old classification rules"
-		exec_class_log classcfg -D ${line} -i ${BRIDGE_INTF}
-	done <${RULE_LIST}
-
-	local rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
-	while [ -n "${rule}" ]; do
-		exec_log iptables -t mangle ${rule}
-		rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
-	done
-	sync
-
-	[ -f ${RULE_LIST} ] && rm ${RULE_LIST}
-}
-
-# classcfg -M local_dhcp -i lo -p udp --dport 67:67 --dport 68:68 -j mark --mark 1
-create_rule() {
-	local proto=$1; shift
-	local mac_addr=$1; shift
-	local mark=$1; shift
-	local ports=$1;
-	local cmd="";
-	# Rule name is uniqe, so we take hash of all the input as rule_name
-	local rule_name="$(echo ${mac_addr}${proto}${mark}${ports} |md5sum |head -c 30)"
-
-	cmd="-j mark --mark ${mark}";
-
-	if [ "${mac_addr}" != "none" ]; then
-		cmd="--smac ${mac_addr} ${cmd}";
-	fi
-
-	if [ "${proto}" != "icmp" ]; then
-		if [ "${ports}" != "none" ]; then
-			IFS=","
-			for port in ${ports};
-			do
-				cmd="--dport ${port}:${port} ${cmd}";
-			done
-			IFS=' '
-		fi
-	fi
-	if [ "${proto}" != "none" ]; then
-		cmd="-p ${proto} $cmd"
-	fi
-	cmd="-i ${BRIDGE_INTF} $cmd"
-	cmd="-A ${rule_name} $cmd"
-
-	# Store the rule_names for cleanup on reload
-	exec_class_log classcfg ${cmd}
-	[ $? -eq 0 ] && \
-		echo ${rule_name}  >> ${RULE_LIST}
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num port_list ip ipmark
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	prio_num=$(get_priority ${priority})
-	port_list=$(echo ${port}|sed 's/ /,/g')
-	ipmark=$(get_mark ${priority})
-	ip=$(get_ipaddress ${macaddr})
-
-	if [ -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
-			create_rule tcp ${macaddr} ${prio_num} ${port_list}
-			create_rule udp ${macaddr} ${prio_num} ${port_list}
-			if [ -n "${ip}" ]; then
-				create_ip_rule tcp ${ip} ${ipmark} ${port_list}
-				create_ip_rule udp ${ip} ${ipmark} ${port_list}
-			fi
-		else
-			create_rule ${proto} ${macaddr} ${prio_num} ${port_list}
-			if [ -n "${ip}" ]; then
-				create_ip_rule ${proto} ${ip} ${ipmark} ${port_list}
-			fi
-		fi
-	fi
-}
-
-reload_service() {
-	get_bridge_interface
-	map_client_entries
-	clear_existing_rules
-	config_load easy_qos
-	config_foreach manage_rule rule
-	clean_client_entries
-}
-
-start_service() {
-	[ -x /opt/intel/usr/sbin/classcfg ] || exit 0
-	reload_service
-	log "Easy QoS class installed"
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos" "network"
-}
-
--- a/easy-qos/files/etc/init.d/easy_qos.ebtables
+++ b/easy-qos/files/etc/init.d/easy_qos.ebtables
@@ -102,7 +102,7 @@ manage_rule() {
 	prio_num=$(get_priority ${priority})
 	if [ -n "${macaddr}" -a -n "${prio_num}" ]; then
 		for p in ${port}; do
-			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
+			if [ "${protocol}" == "none" ]; then
 				create_rule tcp ${macaddr} ${prio_num} ${p}
 				create_rule udp ${macaddr} ${prio_num} ${p}
 			else
@@ -111,7 +111,7 @@ manage_rule() {
 		done
 		# Create rule for all ports if port is not mentioned in uci
 		if [ -z "${port}" ]; then
-			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
+			if [ "${protocol}" == "none" ]; then
 				create_rule tcp ${macaddr} ${prio_num}
 				create_rule udp ${macaddr} ${prio_num}
 			else
--- a/easy-qos/files/etc/init.d/easy_qos.iptables
+++ b/easy-qos/files/etc/init.d/easy_qos.iptables
@@ -103,18 +103,18 @@ validate_rule_section()

 # Clear existing rules before applying new rules
 clear_existing_rules() {
-	local rule=$(iptables -t mangle -S PREROUTING | grep -m 1 MARK |sed 's/-A/-D/1')
+	local rule=$(iptables -t mangle -S OUTPUT|grep -m 1 MARK |sed 's/-A/-D/1')
 	while [ -n "${rule}" ]; do
 		exec_log iptables -t mangle ${rule}
-		rule=$(iptables -t mangle -S PREROUTING | grep -m 1 MARK |sed 's/-A/-D/1')
+		rule=$(iptables -t mangle -S OUTPUT|grep -m 1 MARK |sed 's/-A/-D/1')
 	done
 }

 check_and_create() {
-	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
+	iptables -t mangle -C OUTPUT ${@} 2>/dev/null
 	# Create rule if not exists
 	if [ ${?} -ne 0 ]; then
-		exec_log iptables -t mangle -A PREROUTING ${@}
+		exec_log iptables -t mangle -A OUTPUT ${@}
 	else
 		log "Rule exists for ${@}"
 	fi
@@ -158,7 +158,7 @@ manage_rule() {
 	port_list=$(echo ${port}|sed 's/ /,/g')

 	if [ -n "${ip}" -a -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
+		if [ "${proto}" == "none" ]; then
 			create_rule tcp ${ip} ${prio_num} ${port_list}
 			create_rule udp ${ip} ${prio_num} ${port_list}
 		else
--- a/easy-soc-libs.deprecated/Config.in
+++ b/easy-soc-libs.deprecated/Config.in
@@ -1,10 +0,0 @@
-if (PACKAGE_libwifix)
-menu "configurations"
-
-config LIBWIFIX_DEBUG
-	depends on PACKAGE_libwifix
-	bool "Enable wifi debugging"
-	default n
-
-endmenu
-endif
--- a/easy-soc-libs.deprecated/Makefile
+++ b/easy-soc-libs.deprecated/Makefile
@@ -1,108 +0,0 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# 
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=easy-soc-libs.deprecated
-PKG_VERSION:=1.0.1
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cec7ae3a5c8348ea2d81a2abac0599a098752e3a
-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_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/easy-soc-libs.deprecated
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=IOPSYS easy SoC libraries (deprecated)
-  SUBMENU:=IOPSYS easy SoC libraries (deprecated)
-  DEPENDS:=+libopenssl
-  MENU:=1
-endef
-
-define Package/libwifix/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/libwifix
-  $(call Package/easy-soc-libs.deprecated)
-  TITLE:= WiFi library for wifix (deprecated)
-  DEPENDS+=+libnl +libnl-route
-endef
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-  TARGET_PLATFORM=BROADCOM
-  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 -DCONFIG_BCM963138 \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
-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
-  $(info Unexpected CONFIG_TARGET)
-endif
-
-export TARGET_PLATFORM
-
-ifdef CONFIG_LIBWIFIX_DEBUG
-  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
-endif
-
-subdirs := \
-	$(if $(CONFIG_PACKAGE_libwifix),libwifix)
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/openssl \
-	-I$(STAGING_DIR)/usr/include/libnl3
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	FPIC="$(FPIC)" \
-	PLATFORM="$(TARGET_PLATFORM)" \
-	subdirs="$(subdirs)"
-
-define Build/InstallDev/libwifix
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifix/wifi.h $(1)/usr/include/wifix.h
-	$(CP) $(PKG_BUILD_DIR)/libwifix/libwifi*.so* $(1)/usr/lib/
-endef
-
-define Build/Compile
-	$(call Build/Compile/Default)
-endef
-
-define Build/InstallDev
-	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
-endef
-
-define Package/libwifix/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifix/libwifi*.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libwifix))
--- a/easy-soc-libs/Makefile
+++ b/easy-soc-libs/Makefile
@@ -1,29 +1,24 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB
+# Copyright (C) 2018 Iopsys
 #
-# This is free software, licensed under the GNU General Public License v2.
-# 

 include $(TOPDIR)/rules.mk

 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=2.4.1
+PKG_VERSION:=1.0.1
 PKG_RELEASE:=1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0accbd7266b2742ad8921edd5dab974fc384a49a
+PKG_SOURCE_VERSION:=4c204761a38a27ff9ff7021c3c34b92d7e3fdb84
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 endif

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk

 define Package/easy-soc-libs
@@ -39,16 +34,10 @@ define Package/libwifi/config
  source "$(SOURCE)/Config.in"
 endef

-define Package/libeasy
-  $(call Package/easy-soc-libs)
-  TITLE:= Helper and utility functions library (libeasy)
-  DEPENDS+=+libnl +libnl-route
-endef
-
 define Package/libwifi
  $(call Package/easy-soc-libs)
  TITLE:= WiFi library (libwifi)
-  DEPENDS+=+libnl +libnl-route
+  DEPENDS+=+TARGET_intel_mips:libnl +TARGET_intel_mips:libnl-route
 endef

 define Package/libethernet
@@ -88,14 +77,13 @@ 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
+  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi
 endef

 subdirs := \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
-	$(if $(CONFIG_PACKAGE_libeasy),libeasy)
+	$(if $(CONFIG_PACKAGE_libethernet),libethernet)

 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
@@ -115,18 +103,11 @@ define Build/Prepare
 endef
 endif

-define Build/InstallDev/libeasy
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libeasy/easy.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy.so* $(1)/usr/lib/
-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/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
 endef

 define Build/InstallDev/libdsl
@@ -154,14 +135,9 @@ 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/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
 endef

 define Package/libethernet/install
@@ -181,4 +157,3 @@ endef
 $(eval $(call BuildPackage,libwifi))
 $(eval $(call BuildPackage,libdsl))
 $(eval $(call BuildPackage,libethernet))
-$(eval $(call BuildPackage,libeasy))
--- a/endptmngr/Makefile
+++ b/endptmngr/Makefile
@@ -1,23 +1,22 @@
 #
-# Copyright (C) 2018 IOPSYS Software Solutions AB
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # 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:=0.2
-PKG_SOURCE_VERSION:=ef49d57c3824df4dfb4921d39461e2bd14f918a7
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
+PKG_SOURCE_VERSION:=631e61b7ab5d86f2f4c86756a117badff9fb0f2c
+

 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_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 PKG_NAME:=endptmngr-open
-PATCH_DIR:=
 else
 PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/endptmngr
 PKG_SOURCE_PROTO:=git
@@ -29,7 +28,6 @@ RSTRIP:=true
 export BUILD_DIR

 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1



@@ -43,7 +41,7 @@ define Package/endptmngr
  CATEGORY:=Utilities
  TITLE:=Brcmslic
  URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen @(PACKAGE_bcmkernel||PACKAGE_bcmopen) @TARGET_HAS_VOICE
+  DEPENDS:= +libubox +ubus +libpicoevent +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen
 endef

 define Package/endptmngr/description
--- a/fatrace/Makefile
+++ b/fatrace/Makefile
@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2006-2010 OpenWrt.org
 #
-# This is free software, licensed under the GNU General Public License v3.
+# This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

@@ -20,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 #PKG_BUILD_PARALLEL:=1

--- a/gigaset-elements/.gitignore
+++ b/gigaset-elements/.gitignore
@@ -0,0 +1,3 @@
+
+git-src
+
--- a/gigaset-elements/Makefile
+++ b/gigaset-elements/Makefile
@@ -0,0 +1,65 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gigaset-elements
+
+PKG_VERSION:=2.4.2
+# PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_GIGASET_ELEMENTS_SRC_URL ?= git@dev.iopsys.eu:3rdparty/gigaset-elements.git
+PKG_GIGASET_ELEMENTS_VERSION ?= v$(PKG_VERSION)
+
+PKG_SOURCE_URL:=$(PKG_GIGASET_ELEMENTS_SRC_URL)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=aa906b37062b6d7937a9c0f8e7b62b32afe4bdeb
+
+
+PKG_MAINTAINER:=Magier Marcin, Figlarek Piotr
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+
+include $(INCLUDE_DIR)/package.mk
+
+######################################################
+
+define Package/gigaset-elements
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libjson-c +libcurl +libpthread
+  TITLE:=Gigaset elements
+endef
+
+######################################################
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) all
+endef
+
+
+
+define Package/gigaset-elements/install
+	$(CP) -r $(PKG_BUILD_DIR)/sysroot_common/* $(1)/
+	$(CP) -r $(PKG_BUILD_DIR)/sysroot_$(CONFIG_ARCH)/* $(1)/
+endef
+
+
+
+define Package/gigaset-elements/preinst
+#!/bin/sh
+mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/cert
+mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/fw
+endef
+
+
+define Package/gigaset-elements/postrm
+#!/bin/sh
+rm -rf $${IPKG_INSTROOT}/usr/gigaset/data
+rm -rf /usr/share/gigaset
+endef
+
+
+######################################################
+
+$(eval $(call BuildPackage,gigaset-elements))
+
--- a/gryphon-led-module/Makefile
+++ b/gryphon-led-module/Makefile
@@ -28,7 +28,7 @@ define KernelPackage/$(PKG_NAME)
  FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
  KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
  AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  PKG_LICENSE:=GPLv2
+  PKG_LICENSE:=Genexis
  PKG_LICENSE_URL:=
 endef

--- a/ice-client/Config.in
+++ b/ice-client/Config.in
@@ -0,0 +1,4 @@
+
+config ICE_OPEN
+       bool "Use pre-compiled version for Open SDK"
+       default n
--- a/ice-client/Makefile
+++ b/ice-client/Makefile
--- a/ice-client/files/ice-client.uci_default
+++ b/ice-client/files/ice-client.uci_default
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+grep -rq "^ice:" /etc/passwd || {
+	adduser -D -H -s /bin/false ice
+}
+
+uci -q delete passwords.ice
+uci -q set passwords.ice=usertype
+uci -q set passwords.ice.password="\$WPAKEY"
+uci -q del_list passwords.ice._access_w=root
+uci -q add_list passwords.ice._access_w=root
+uci -q del_list passwords.ice._access_r=root
+uci -q add_list passwords.ice._access_r=root
+uci -q commit passwords
+
+uci show rpcd | grep username=.*ice.* >/dev/null || {
+cat >> /etc/config/rpcd << EOF
+
+config login
+	option username 'ice'
+	option password '\$p\$ice'
+	list _access_w 'none'
+	list write 'user-user'
+	list write 'juci-broadcom-dsl'
+	list write 'juci-broadcom-dsl-admin'
+	list write 'juci-broadcom-ethernet'
+	list write 'juci-broadcom-iptv'
+	list write 'juci-broadcom-vlan'
+	list write 'juci-broadcom-vlan-admin'
+	list write 'juci-wireless'
+	list write 'juci-wireless-admin'
+	list write 'juci-catv'
+	list write 'juci-ddns'
+	list write 'juci-diagnostics'
+	list write 'juci-dnsmasq-dhcp'
+	list write 'juci-dropbear'
+	list write 'juci-ethernet'
+	list write 'juci-event'
+	list write 'juci-firewall-fw3'
+	list write 'juci-iconnect'
+	list write 'juci-igmpinfo'
+	list write 'juci-inteno-backup'
+	list write 'juci-inteno-multiwan'
+	list write 'juci-inteno-provisioning'
+	list write 'juci-inteno-qos'
+	list write 'juci-inteno-voice-client'
+	list write 'juci-minidlna'
+	list write 'juci-mod-status'
+	list write 'juci-mod-system'
+	list write 'juci-natalie-dect'
+	list write 'juci-netmode'
+	list write 'juci-network-netifd'
+	list write 'juci-owsd'
+	list write 'juci-printer'
+	list write 'juci-realtime-graphs'
+	list write 'juci-samba'
+	list write 'juci-sfp'
+	list write 'juci-snmpd'
+	list write 'juci-sysupgrade'
+	list write 'juci-uhttpd'
+	list write 'juci-upnp'
+	list write 'juci-usb'
+	list write 'core'
+	list write 'unauthenticated'
+
+EOF
+}
+
+uci -q del_list dhcp.@domain[0].name="inteno.lan"
+uci -q add_list dhcp.@domain[0].name="inteno.lan"
+uci -q commit dhcp
+
+exit 0
+
--- a/icgroupd/Makefile
+++ b/icgroupd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB
+# Copyright (C) 2016 Inteno Broadband AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
--- a/icwmp/Config_cwmp.in
+++ b/icwmp/Config_cwmp.in
@@ -19,9 +19,17 @@ config CWMP_DEBUG
 	bool "Compile with debug options"
 	default y

+config XMPP_ENABLE
+	bool "enable xmpp feature"
+	default n
+
 config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
+
+config LIBDATAMODEL_VENDOR_PREFIX
+    string "Vendor Prefix"
+    default "X_IOPSYS_EU_"
    
 endif

--- a/icwmp/Config_datamodel.in
+++ b/icwmp/Config_datamodel.in
@@ -0,0 +1,7 @@
+if PACKAGE_libdatamodel
+
+config UPNP_TR064
+	bool "Compile with tr064 features"
+	default n
+
+endif
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB
+# Copyright (C) 2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,17 +8,15 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-12-11
+PKG_VERSION:=4.0-2019-08-17
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3fdaca7e3463d46a52f31496b0f84deb6b21eaf8
+PKG_SOURCE_VERSION:=17b9e07a38753eab3964dffd0b0cc7da3118840a
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING

 PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
@@ -32,53 +30,46 @@ CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)

 include $(INCLUDE_DIR)/package.mk

+define Package/libdatamodel
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library for broadband-forum data model
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+endef
+
 define Package/icwmp_stun
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=TR-069 stun Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 stun Client
+	DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
 endef

 define Package/icwmp_xmpp
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=TR-069 xmpp feature
-  DEPENDS:=+libuci +libubox +libexpat +libstrophe
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 xmpp feature
+	DEPENDS:=+libuci +libubox +libexpat +libstrophe
 endef

 define Package/icwmp_twamp
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=TR-069 twamp feature
-  DEPENDS:=+libuci
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 twamp feature
+	DEPENDS:=+libuci
 endef

 define Package/icwmp_udpechoserver
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=TR-069 udpechoserver feature
-  DEPENDS:=+libuci
-endef
-
-define Package/icwmp_bulkdata
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=TR-069 BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm
-endef
-
-define Package/icwmp-tr098
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=CWMP client for TR-098 Data Model
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libcurl +libtr098
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 udpechoserver feature
+	DEPENDS:=+libuci
 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
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +libexpat +libstrophe +curl +libtrace +libdatamodel
 endef

 define Package/icwmp/description
@@ -103,6 +94,10 @@ define Package/icwmp-zstream/config
 	source "$(SOURCE)/Config_cwmp.in"
 endef

+define Package/libdatamodel/config
+	source "$(SOURCE)/Config_datamodel.in"
+endef
+
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
 ifneq ($(USE_LOCAL),)
 define Build/Prepare
@@ -110,14 +105,15 @@ define Build/Prepare
 endef
 endif

+ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+TARGET_CFLAGS += -DEX400
+endif
+
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBDATAMODEL_VENDOR_PREFIX)\\\"
+
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ

-ifeq ($(CONFIG_PACKAGE_icwmp-tr098),y)
-CONFIGURE_ARGS += \
-	--enable-icwmp_tr098
-endif
-
 ifneq ($(CWMP_REVISION)_,_)
 ifneq ($(CWMP_REVISION),exported)
 ifneq ($(CWMP_REVISION),Unversioned directory)
@@ -135,6 +131,16 @@ CONFIGURE_ARGS += \
 	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubus-include-path=$(STAGING_DIR)/usr/include
 	
+ifeq ($(CONFIG_UPNP_TR064),y)
+CONFIGURE_ARGS += \
+	--enable-upnptr064
+endif
+	
+ifeq ($(CONFIG_XMPP_ENABLE),y)
+CONFIGURE_ARGS += \
+	--enable-xmpp
+endif
+	
 ifeq ($(BUILD_VARIANT),zstream)
 CONFIGURE_ARGS += \
 	--enable-http=zstream \
@@ -166,12 +172,18 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif

+define Package/libdatamodel/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib/
+endef
+
 define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/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/dmmap $(1)/etc/icwmpd
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
@@ -187,11 +199,6 @@ endif
 	$(CP) ./files/* $(1)/
 endef

-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
@@ -229,15 +236,17 @@ define Package/icwmp_twamp/install
 	$(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
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include/libdatamodel
+	$(CP) $(PKG_BUILD_DIR)/dm/*.h $(1)/usr/include/libdatamodel
+	$(CP) $(PKG_BUILD_DIR)/dm/dmtree/common/root.h $(1)/usr/include/libdatamodel
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.a $(1)/lib
 endef

+
 define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
 	echo "$(CWMP_BKP_FILE)" >> $${IPKG_INSTROOT}/etc/sysupgrade.conf
@@ -257,11 +266,11 @@ define Package/icwmp-$(BUILD_VARIANT)/prerm
 	exit 0
 endef

+
 $(eval $(call BuildPackage,icwmp-curl))
+$(eval $(call BuildPackage,libdatamodel))
 $(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))
--- a/icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts
+++ b/icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts
@@ -41,14 +41,4 @@ set_cwmp_reqopts() {
 	fi
 }

-regenerate_ssl_link(){
-	local cert_dir="/etc/ssl/certs"
-	local all_file=$(ls $cert_dir/*.pem)
-	for cfile in $all_file
-	do
-		ln -s $cfile $cert_dir/$(openssl x509 -hash -noout -in $cfile).0
-	done
-}
-
 set_cwmp_reqopts
-regenerate_ssl_link
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2019 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ieee1905
-PKG_VERSION:=1.1.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3008fe46ee9247f0203b3a125fddebadbdd7dcdc
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ieee1905
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=IEEE1905 handler
-  DEPENDS:= +libwifi +ubox +libpicoevent +libpcap +libopenssl +libuci +libjson-c
-endef
-
-define Package/ieee1905/description
- IEEE1905 stack with extended functionalities.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE \
-	-DSEND_EMPTY_TLVS \
-	-DFIX_BROKEN_TLVS \
-	-DSPEED_UP_DISCOVERY \
-	-DREGISTER_EXTENSION_BBF
-	#-DDO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS \
-
-#define Build/Prepare
-#        $(CP) -rf ./ieee1905/* $(PKG_BUILD_DIR)/
-#endef
-
-define Package/ieee1905/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/hotplug.d
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/button
-	$(INSTALL_BIN) ./files/etc/init.d/ieee1905 $(1)/etc/init.d/ieee1905
-	$(INSTALL_BIN) ./files/etc/hotplug.d/button/11-ieee1905 $(1)/etc/hotplug.d/button/11-ieee1905
-	$(INSTALL_DATA) ./files/etc/config/ieee1905 $(1)/etc/config/ieee1905
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ieee1905d $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libs/*.so $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,ieee1905))
--- a/ieee1905/files/etc/config/ieee1905
+++ b/ieee1905/files/etc/config/ieee1905
@@ -1,39 +0,0 @@
-config ieee1905
-        option enabled '1'
-        option debug  true
-
-config meshcomms 'global'
-        option enabled '1'
-        option basemacint 'wan'
-        option mapall true
-#        option registrar 'rai0'
-        option debug_level  2
-        option port  8888
-        option cmdu_event false
-
-#config al-iface
-#        option enabled '1'
-#        option ifname 'br-lan'
-#        option media 'bridge'
-#        option manufacturer_name 'Broadcom'
-#        option model_name 'Eth EG400'
-#        option model_number '00002'
-#        option device_name 'EG400R1'
-
-#config al-iface
-#        option enabled '1'
-#        option ifname 'wl0'
-#        option media 'ap'
-#        option manufacturer_name 'Mediatek'
-#        option model_name 'WIFI EX400'
-#        option model_number '00001'
-#        option device_name 'EX400R0'
-
-#config al-iface
-#        option enabled '1'
-#        option ifname 'wl1'
-#        option media 'ap'
-#        option manufacturer_name 'Mediatek'
-#        option model_name 'WIFI EX400'
-#        option model_number '00001'
-#        option device_name 'EX400R0'
--- a/ieee1905/files/etc/hotplug.d/button/11-ieee1905
+++ b/ieee1905/files/etc/hotplug.d/button/11-ieee1905
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-TOPOLOGY_FILE="/tmp/topology_change"
-WPS_FILE="/tmp/virtual_push_button"
-
-handle_topology_change() {
-	[ -f ${TOPOLOGY_FILE} ] && \
-		touch ${TOPOLOGY_FILE}
-}
-
-handle_wps() {
-	[ -f ${WPS_FILE} ] && \
-		touch ${WPS_FILE}
-}
-
-case "$ACTION" in
-	add|register)
-		[ "wifibutton" == "$INTERFACE" -o "ecobutton" == "$INTERFACE" ] && {
-			handle_wps
-		}
-		[ "wifi_2g" == "$INTERFACE" ] && {
-			handle_wps
-		}
-		[ "wifi_5g" == "$INTERFACE" ] && {
-			handle_wps
-		}
-		[ "wpsbutton" == "$INTERFACE" ] && {
-			handle_wps
-		}
-		[ "wpscbutton" == "$INTERFACE" ] && {
-			handle_topology_change
-		}
-        ;;
-        remove|unregister)
-        ;;
-esac
--- a/ieee1905/files/etc/init.d/ieee1905
+++ b/ieee1905/files/etc/init.d/ieee1905
@@ -1,197 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/sbin/ieee1905d
-MESH_CONF=/tmp/meshcomms.config
-INTERFACE=""
-
-validate_global_section()
-{
-	uci_validate_section ieee1905 meshcomms "${1}" \
-		'enabled:bool:false' \
-		'basemacint:string:wan' \
-		'almac:string' \
-		'registrar:string' \
-		'mapall:bool:true' \
-		'debug_level:uinteger:5' \
-		'port:port:8888' \
-		'cmdu_event:bool:true'
-}
-
-validate_ieee1905_section()
-{
-	uci_validate_section ieee1905 ieee1905 "${1}" \
-		'debug:bool:true' \
-		'enabled:bool:true'
-}
-
-get_device_name() {
-	local device
-	# Get wan L3 interface
-	ubus list |grep -iq network.interface.${1}
-	if [ "$?" -eq 0 ]; then
-		json_load "$(ubus -t 2 call network.interface.${1} status)"
-		json_get_var device device
-		echo ${device}
-	fi
-}
-
-get_interface_mac() {
-	local l3 basemac
-	l3=$(get_device_name ${1})
-	if [ -n ${l3} ]; then
-		json_load "$(ubus -t 2 call network.device status "{\"name\":\"${l3}\"}")"
-		json_get_var basemac macaddr
-	fi
-	local first=0x$(echo $basemac |cut -d : -f 1)
-	local rest=$(echo $basemac |cut -d : -f 2-)
-	# Set local bit
-	first=$((first|2))
-	first=$(printf "%x" $first)
-	basemac="${first}:${rest}"
-	echo ${basemac}
-}
-
-validate_al_section()
-{
-	uci_validate_section ieee1905 al-iface "${1}" \
-		'enabled:bool:false' \
-		'ifname:string' \
-		'media:string:eth' \
-		'manufacturer_name:string:iopsys' \
-		'model_name:string' \
-		'model_number:string' \
-		'device_name:string'
-}
-
-configure_interface()
-{
-	local ifname media enabled manufacturer_name model_name model_number device_name
-	validate_al_section ${1} || {
-		echo "Validation of global section failed"
-		return 1;
-	}
-
-	if [ ${enabled} -eq 0 ]; then
-		return;
-	fi
-
-	if [ -z ${INTERFACE} ]; then
-		INTERFACE=${ifname}
-	else
-		INTERFACE="${INTERFACE},${ifname}"
-	fi
-
-	json_add_object
-	json_add_string ifname ${ifname}
-	json_add_string media ${media}
-	json_add_string manufacturer_name ${manufacturer_name}
-	json_add_string model_name ${model_name}
-	json_add_string model_number ${model_number}
-	json_add_string device_name ${device_name}
-	json_close_object
-}
-
-configure_meshcomms()
-{
-	local enabled almac basemacint mapall debug_level port l3device basemac intf registrar cmdu_event
-
-	validate_global_section global || {
-		echo "Validation of global section failed"
-		return 1;
-	}
-
-	if [ -z ${almac} ]; then
-		basemac=$(get_interface_mac ${basemacint})
-	else
-		basemac=${almac}
-	fi
-
-
-	local fname cname model cUrl
-	fname=$(db get hw.board.boardId)
-	cname=$(db get hw.board.iopVerCustomer)
-	model=$(db get hw.board.routerModel)
-	cUrl="http://192.168.1.1"
-
-	json_init
-	# fill the al-iface info
-	json_add_array al-iface
-	config_foreach configure_interface al-iface
-	json_close_array
-	json_add_object deviceInfo
-	json_add_string friendly_name ${fname}
-	json_add_string manufacturer_name ${cname}
-	json_add_string model ${model}
-	json_add_string control_url ${cUrl}
-	json_close_object
-	json_add_object meshcomms
-	json_add_int enabled ${enabled}
-	json_add_string mac ${basemac}
-	json_add_string interfaces ${INTERFACE}
-	json_add_int map ${mapall}
-	json_add_string registrar ${registrar}
-	json_add_int debug_level ${debug_level}
-	json_add_int port ${port}
-	json_add_int cmdu_event ${cmdu_event}
-	json_close_object
-
-	json_dump >${MESH_CONF}
-
-}
-
-configure_ieee1905()
-{
-	local enabled debug
-
-	validate_ieee1905_section ${1} || {
-		echo "Validation of ieee1905 section failed"
-		exit 1;
-	}
-
-	if [ ${debug} -eq 1 ]; then
-		# Forward stdout of the command to logd
-		procd_set_param stdout 1
-		# Same for stderr
-		procd_set_param stderr 1
-	fi
-
-	if [ ${enabled} -ne 1 ]; then
-		exit 0;
-	fi
-}
-
-configure_network() {
-	[ -f ${MESH_CONF} ] && rm ${MESH_CONF}
-
-	ebtables -L FORWARD|grep -iqE "1:80:C2:(0)+:(0)+:13.*-j.*DROP"
-	if [ "$?" -ne 0 ]; then
-		echo "Applying drop rule to drop pkts forwared by kernel to 1905.1 multicast mac"
-		ebtables -A FORWARD -d 01:80:c2:00:00:13 -j DROP
-	fi
-
-	config_load ieee1905
-	config_foreach configure_ieee1905 ieee1905
-	config_foreach configure_meshcomms meshcomms
-}
-
-start_service() {
-	procd_open_instance ieee1905
-	procd_set_param command ${PROG}
-	configure_network
-	procd_set_param respawn
-	procd_close_instance
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers() {
-	procd_add_reload_trigger "network"
-	procd_add_reload_trigger "netmode"
-}
--- a/ifbt/Makefile
+++ b/ifbt/Makefile
@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=ifbt
-PKG_VERSION:=0.2
+PKG_VERSION:=0.1

-PKG_SOURCE_VERSION:=6a279efa5046ace0681a1d0e79592a120f80e171
+PKG_SOURCE_VERSION:=0286812ed8036dea758f904694dc416481fba64d
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ifbt.git

@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

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

 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
--- a/ifsi/Makefile
+++ b/ifsi/Makefile
@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2015 Inteno
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ifsi
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+LDFLAGS+= \
+        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+		-Wl,-rpath-link=$(STAGING_DIR)/lib
+
+define Package/ifsi
+  CATEGORY:=Utilities
+  DEPENDS:=+ubus +libubox
+  TITLE:=Inteno Functional Script Interface
+endef
+
+define Package/ifsi/description
+	Inteno Functional Script Interface
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Package/ifsi/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ifsi $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,ifsi))
--- a/ifsi/src/Makefile
+++ b/ifsi/src/Makefile
@@ -0,0 +1,17 @@
+CC		= gcc
+CFLAGS		= -g -Wall
+LOCLIBS		= 
+LIBS		= -lubus -lubox -lblobmsg_json
+OBJS		= ifsi.o
+SRCS		= ifsi.c
+LIBSRCS		= 
+ISRCS		= 
+
+all: ifsi
+
+ifsi: ${OBJS}
+	${CC} ${LDFLAGS} ${LIBSRCS} -o ifsi ${OBJS} ${LIBS}
+
+clean:
+	rm -f ifsi *.o
+
--- a/ifsi/src/ifsi.c
+++ b/ifsi/src/ifsi.c
@@ -0,0 +1,74 @@
+/*
+ * ifsi -- Inteno functional script interface
+ *
+ * Copyright (C) 2012-2013 Inteno Broadband Technology AB. All rights reserved.
+ *
+ * Author: dev@inteno.se
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#include <unistd.h>
+
+#include <libubox/blobmsg.h>
+#include <libubox/blobmsg_json.h>
+#include <libubox/uloop.h>
+
+#include <libubus.h>
+
+static struct ubus_context *ctx;
+static struct ubus_event_handler event_listener;
+static struct blob_buf b;
+
+
+static void receive_event(struct ubus_context *ctx, struct ubus_event_handler *ev,
+			  const char *type, struct blob_attr *msg)
+{
+	char *str;
+	uint32_t id;
+
+	str = blobmsg_format_json(msg, true);
+	fprintf(stdout, "I got %s event %s\n", type, str);
+	free(str);
+}
+
+int main(int argc, char **argv)
+{
+	const char *ubus_socket = NULL;
+	int ret;
+
+	uloop_init();
+
+	ctx = ubus_connect(ubus_socket);
+	if (!ctx) {
+		fprintf(stderr, "Failed to connect to ubus\n");
+		return 1;
+	}
+
+	ubus_add_uloop(ctx);
+
+	event_listener.cb = receive_event;
+	ret = ubus_register_event_handler(ctx, &event_listener, "*");
+	if (ret)
+		fprintf(stderr, "Couldn't register to router events\n");
+
+	uloop_run();
+
+	ubus_free(ctx);
+	uloop_done();
+
+	return 0;
+}
+
--- a/imonitor/Makefile
+++ b/imonitor/Makefile
@@ -18,9 +18,6 @@ PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk

--- a/inbd/Makefile
+++ b/inbd/Makefile
@@ -12,7 +12,7 @@ PKG_NAME:=inbd
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1

-PKG_SOURCE_VERSION:=53ca7f58edb87976b5897ccaf487bb0cbbf39d07
+PKG_SOURCE_VERSION:=665a72a6bb2b5ea5a17ad6248957fe35525b3782
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd

@@ -20,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 PKG_BUILD_PARALLEL:=1

--- a/inotify-tools/Makefile
+++ b/inotify-tools/Makefile
@@ -20,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
 # support parallel build
 PKG_BUILD_PARALLEL:=1

--- a/iop/Makefile
+++ b/iop/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 iopsys
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=iop
 PKG_VERSION:=1.0
 PKG_RELEASE:=0
-PKG_LICENSE:=GPLv2

 include $(INCLUDE_DIR)/package.mk

--- a/iop/config
+++ b/iop/config
@@ -14,7 +14,6 @@ CONFIG_PACKAGE_comgt-ncm=y
 CONFIG_PACKAGE_crashlog=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
-CONFIG_PACKAGE_easy-qos=y
 CONFIG_PACKAGE_gdb=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
@@ -37,7 +36,6 @@ CONFIG_PACKAGE_juci-ddns=y
 CONFIG_PACKAGE_juci-diagnostics=y
 CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
 CONFIG_PACKAGE_juci-dropbear=y
-CONFIG_PACKAGE_juci-easyqos=y
 CONFIG_PACKAGE_juci-event=y
 CONFIG_PACKAGE_juci-firewall-fw3=y
 CONFIG_PACKAGE_juci-icwmp=y
@@ -80,7 +78,6 @@ CONFIG_PACKAGE_ndisc6=y
 CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_ntfs-3g=y
 CONFIG_PACKAGE_ntpd=y
-CONFIG_PACKAGE_obuspa=y
 CONFIG_PACKAGE_odhcp6c=y
 CONFIG_PACKAGE_odhcpd=y
 CONFIG_PACKAGE_openssl-util=y
@@ -117,14 +114,11 @@ CONFIG_PACKAGE_umbim=y
 CONFIG_PACKAGE_uqmi=y
 CONFIG_PACKAGE_usb-modeswitch=y
 CONFIG_PACKAGE_usbreset=y
-CONFIG_PACKAGE_uspd=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
 CONFIG_PACKAGE_libwifi=y
 CONFIG_PACKAGE_wifilife=y
 CONFIG_PACKAGE_wifimngr=y
-CONFIG_PACKAGE_libwifix=y
-CONFIG_PACKAGE_wifixd=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
@@ -194,5 +188,5 @@ CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 CONFIG_KERNEL_DEVTMPFS=y
 CONFIG_KERNEL_DEVTMPFS_MOUNT=y
 # CONFIG_BUSYBOX_CONFIG_IP is not set
-CONFIG_LOCALMIRROR="http://download.iopsys.eu/iopsys/mirror/"
+LOCAL_MIRROR="http://download.iopsys.eu/iopsys/mirror/"

--- a/iop/scripts/genconfig.sh
+++ b/iop/scripts/genconfig.sh
@@ -139,6 +139,7 @@ function genconfig {
 		DEVELOPER=1

 		bcmAllowed=0
+		iceAllowed=0
 		endptAllowed=0
 		natalieAllowed=0
 		mediatekAllowed=0
@@ -149,6 +150,7 @@ function genconfig {
 		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
 		git ls-remote git@dev.iopsys.eu:iopsys/wifilife.git -q 2>/dev/null && wifilifeAllowed=1
+		git ls-remote git@private.inteno.se:ice-client.git -q -q 2>/dev/null && iceAllowed=1
 	}

 	v() {
@@ -354,6 +356,7 @@ function genconfig {
 			# rewrite url to clone with ssh instead of http
 			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
 			[ $bcmAllowed -eq 0 ] && echo "CONFIG_BCM_OPEN=y" >> .config
+			[ $iceAllowed -eq 0 ] && echo "CONFIG_ICE_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
@@ -361,6 +364,7 @@ function genconfig {
 		else
 			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
 			echo "CONFIG_BCM_OPEN=y" >> .config
+			echo "CONFIG_ICE_OPEN=y" >> .config
 			echo "CONFIG_ENDPT_OPEN=y" >> .config
 			echo "CONFIG_NATALIE_OPEN=y" >> .config
 			echo "CONFIG_MEDIATEK_OPEN=y" >> .config
--- a/iop/scripts/generate_tarballs.sh
+++ b/iop/scripts/generate_tarballs.sh
@@ -59,6 +59,23 @@ build_endptmngr_consumer() {
 	cd "$curdir"
 }

+build_ice_consumer() {
+	# create ice-client open version tar file
+	local iceversion icebasever icerelease icecommith
+	icecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/ice-client/Makefile | head -1 | cut -d'=' -f2)
+	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
+	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
+	iceversion=$icebasever$icerelease
+	[ -n "$target" -a -n "$iceversion" -a -n "$icecommith" ] || return
+	ssh $SERVER "test -f $FPATH/ice-client-$target-$iceversion-$icecommith.tar.gz" && return
+	cd ./build_dir/target-*/ice-client-$icebasever/ipkg-* || cd ./build_dir/target-mips*musl-*/ice-client-$icebasever/ipkg-*
+	tar -czv  ice-client -f ice-client-$target-$iceversion-$icecommith.tar.gz
+	scp -pv ice-client-$target-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
+	cp ice-client-$target-$iceversion-$icecommith.tar.gz $curdir/
+	rm -f ice-client-$target-$iceversion-$icecommith.tar.gz
+	cd "$curdir"
+}
+
 build_wifilife_consumer() {
 	local ver commit
 	ver=$(grep -w "PKG_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
@@ -112,8 +129,8 @@ function print_usage {

 function generate_tarballs {

-    SERVER="god@download.iopsys.eu"
-    FPATH="/var/www/html/iopsys/opensdk"
+    SERVER="god@software.inteno.se"
+    FPATH="/var/www/html/iopsys/consumer"

    set -e
    git remote -v | grep -q http && return # do not continue if this is an open SDK environment
@@ -152,9 +169,11 @@ function generate_tarballs {
 		build_bcmkernel_consumer
 		build_natalie_consumer
 		build_endptmngr_consumer
+		build_ice_consumer
 		build_wifilife_consumer
 	elif [ "$stk_target" == "mediatek" ]; then
 		build_mediatek_kernel
+		build_ice_consumer		
 		build_wifilife_consumer
 	else
 		echo "Invalid target: $stk_target"
--- a/iop/scripts/licenses_gen.sh
+++ b/iop/scripts/licenses_gen.sh
@@ -1,35 +0,0 @@
-#!/bin/sh
-function license_report {
-    LICDIR="/tmp/licenses-generator/"
-    LICBIN="${LICDIR}/bin"
-
-
-    dpkg -s python3 python3-requests python3-yaml python3-mako python3-six &> /dev/null
-    if [ $? -ne 0 ]
-        then
-            echo "Missing dependencies"
-            sudo apt-get update
-            sudo apt-get install python3 python3-requests python3-yaml python3-mako python3-six
-
-        else
-            echo    "Dependecy check passed"
-    fi
-
-
-if [ -d "$LICDIR" ]; then
-  ### Take action if $DIR exists ###
-  echo "Creating json licences file and html formated report"
-else
-  ###  Control will jump here if $DIR does NOT exists ###
-  echo "Error: licenses-generator not found. getting from iopsys repo"
-  git clone git@dev.iopsys.eu:iopsys/licenses-generator.git $LICDIR
-fi
-  LICGET=`${LICBIN}/licenses-generator  gen-License bin/`
-  echo $LICGET
-  ${LICBIN}/licenses-generator gen-licrprt $LICGET
-exit 0
-
-}
-
-
-register_command "license_report" "Generate a Licence report on latest build in json format and html under reports"
--- a/iopupgrade/Makefile
+++ b/iopupgrade/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 iopsys
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -20,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 PKG_BUILD_PARALLEL:=1

--- a/iopupgrade/files/sbin/iopu
+++ b/iopupgrade/files/sbin/iopu
@@ -164,7 +164,7 @@ trap finish EXIT
 trap timeout SIGALRM
 trap sig_pipe SIGPIPE

-while getopts "nrxbh" opt; do
+while getopts "nrxb" opt; do
    case $opt in
 	n)
 	    upd_noreboot=1
@@ -184,7 +184,7 @@ while getopts "nrxbh" opt; do
 	    exit 0
 	    ;;
 	h)
-	    usage
+	    upd_usage
 	    exit 1
 	    ;;
    esac
--- a/iwatchdog/Makefile
+++ b/iwatchdog/Makefile
@@ -1,9 +1,6 @@
-# Copyright (C) 2019 iopsys
 #
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# Copyright (C) 2013 Inteno
 #
-
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

@@ -11,9 +8,6 @@ PKG_NAME:=iwatchdog
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 PKG_BUILD_PARALLEL:=1

@@ -28,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk

 define Package/iwatchdog
  CATEGORY:=Utilities
-  TITLE:=IOPSYS watchdog
+  TITLE:=Inteno watchdog
 endef

 define Package/iwatchdog/description
--- a/json-editor/Makefile
+++ b/json-editor/Makefile
@@ -1,32 +0,0 @@
-#
-# Copyright (C) 2019 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=json-editor
-PKG_RELEASE:=1.0.0
-
-PKG_SOURCE_VERSION:=44b32937a062ec4ffc9f7355841dc94ab6efa50f
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/json-editor.git
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/json-editor
-  SECTION:=base
-  CATEGORY:=Libraries
-  DEPENDS:=+libjson-c +libblobmsg_json
-  TITLE:=JSON-editor
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/src/json-editor.h $(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libjson-editor.so $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,json-editor))
--- a/libjwt/Makefile
+++ b/libjwt/Makefile
@@ -17,8 +17,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_FIXUP:=autoreconf

-PKG_LICENSE:=LGPLv3
-PKG_LICENSE_FILES:=COPYING
 include $(INCLUDE_DIR)/package.mk

 define Package/libjwt
--- a/libpicoevent/Makefile
+++ b/libpicoevent/Makefile
@@ -14,8 +14,6 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=7875222706cb6999af0361ef0aebdc85cd75c127
 PKG_NAME:=libpicoevent

-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz

--- a/libtrace/Makefile
+++ b/libtrace/Makefile
@@ -12,9 +12,6 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf

--- a/lmbench/Makefile
+++ b/lmbench/Makefile
@@ -15,9 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/lmbench/
 PKG_MD5SUM:=b3351a3294db66a72e2864a199d37cbf

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
 PKG_BUILD_DEPENDS:=librpc

 include $(INCLUDE_DIR)/package.mk
--- a/logrotate/Makefile
+++ b/logrotate/Makefile
@@ -19,9 +19,6 @@ PKG_CAT:=zcat

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
 include $(INCLUDE_DIR)/package.mk

 define Package/logrotate
--- a/loop-detector/Makefile
+++ b/loop-detector/Makefile
@@ -1,9 +1,3 @@
-# Copyright (C) 2019 iopsys
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
 include $(TOPDIR)/rules.mk

 PKG_NAME:=loop-detector
@@ -17,9 +11,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
 include $(INCLUDE_DIR)/package.mk


--- a/ltq-nand/Makefile
+++ b/ltq-nand/Makefile
@@ -16,9 +16,6 @@ PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand/archive/
 #PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand.git
 #PKG_SOURCE_VERSION:=07b5b0331af6de4174dab2c02bf260ee9625452a

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/host-build.mk


--- a/meshcomms/Makefile
+++ b/meshcomms/Makefile
@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2019 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=meshcomms
-PKG_VERSION:=1.0.2
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=72048b609104a5479ac2cdae21d5d1f733fd2bc3
-PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/meshcomms.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=BSD2+Patent
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/meshcomms
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Mesh agent
-  DEPENDS:=+libpcap +libopenssl +libubox +libubus +libblobmsg-json
-endef
-
-define Package/meshcomms/description
- meshComms is an open source implementation of IEEE 1905.1a that is an output
- of the Broadband Forum Open Broadband - Multi Access Point (OB-MAP) project.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE
-#        -DDO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS
-
-#define Build/Prepare
-#        $(CP) -rf ./meshcomms/* $(PKG_BUILD_DIR)/
-#endef
-
-define Package/meshcomms/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/meshcomms
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/meshcomms/common
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/meshcomms/bbf
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/meshcomms/al
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/meshcomms/factory
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/meshcomms.conf $(1)/etc/config/meshcomms
-	$(INSTALL_BIN) ./files/meshcomms.init $(1)/etc/init.d/meshcomms
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/output/al_entity $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/output/libmeshcomms.so $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/output/libmeshcomms.so $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/include/meshcomms.h $(STAGING_DIR)/usr/include/meshcomms/
-	$(CP) $(PKG_BUILD_DIR)/src/common/interfaces/*.h $(STAGING_DIR)/usr/include/meshcomms/
-	$(CP) $(PKG_BUILD_DIR)/src/factory/interfaces/*.h $(STAGING_DIR)/usr/include/meshcomms/
-	$(CP) $(PKG_BUILD_DIR)/src/factory/interfaces/extensions/bbf/*.h $(STAGING_DIR)/usr/include/meshcomms/
-	$(CP) $(PKG_BUILD_DIR)/src/al/internal_interfaces/*.h $(STAGING_DIR)/usr/include/meshcomms/
-endef
-
-$(eval $(call BuildPackage,meshcomms))
--- a/meshcomms/files/meshcomms.conf
+++ b/meshcomms/files/meshcomms.conf
@@ -1,8 +0,0 @@
-config meshcomms 'global'
-    option basemacint 'wan'
-    list interfaces 'lan'
-    list interfaces 'wan'
-    option mapall true
-    option debug  false
-    option port  8888
-
--- a/meshcomms/files/meshcomms.init
+++ b/meshcomms/files/meshcomms.init
@@ -1,105 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/sbin/al_entity
-
-validate_global_section()
-{
-	uci_validate_section meshcomms meshcomms "${1}" \
-		'basemacint:string:wan' \
-		'interfaces:string:lan' \
-		'mapall:bool:true' \
-		'debug:bool:true' \
-		'port:port:8888'
-}
-
-get_device_name() {
-	local device
-	# Get wan L3 interface
-	ubus list |grep -iq network.interface.${1}
-	if [ "$?" -eq 0 ]; then
-		json_load "$(ubus -t 2 call network.interface.${1} status)"
-		json_get_var device device
-		echo ${device}
-	fi
-}
-
-get_interface_mac() {
-	local l3 basemac
-	l3=$(get_device_name ${1})
-	if [ -n ${l3} ]; then
-		json_load "$(ubus -t 2 call network.device status "{\"name\":\"${l3}\"}")"
-		json_get_var basemac macaddr
-	fi
-	echo ${basemac}
-}
-
-configure_meshcomms()
-{
-	local basemacint interfaces mapall debug port l3device basemac intf
-
-	validate_global_section global || {
-		echo "Validation of global section failed"
-		return 1;
-	}
-	if [ ${debug} -eq 1 ]; then
-		# Forward stdout of the command to logd
-		procd_set_param stdout 1
-		# Same for stderr
-		procd_set_param stderr 1
-	fi
-	
-	basemac=$(get_interface_mac ${basemacint})
-
-
-	for f in ${interfaces}
-	do
-		local l3=$(get_device_name $f)
-		intf="${intf} ${l3}"
-	done
-	intf=$(echo $intf|sed 's/ /,/g')
-	[ -z "${intf}" ] && \
-		echo "interface list is empty/invalid">/dev/console \
-		return 1
-
-	procd_append_param command -m ${basemac} -i ${intf}
-
-	[ "${debug}" -eq 1 ] && \
-		procd_append_param command -vv
-
-	[ "${mapall}" -eq 1 ] && \
-		procd_append_param command -w
-
-	[ ${port} -ne 8888 ] && \
-		procd_append_param command -p ${port}
-}
-
-configure_network() {
-	ebtables -L FORWARD|grep -iqE "1:80:C2:(0)+:(0)+:13.*-j.*DROP"
-	if [ "$?" -ne 0 ]; then
-		echo "Applying drop rule to drop pkts forwared by kernel to 1905.1 multicast mac"
-		ebtables -A FORWARD -d 01:80:c2:00:00:13 -j DROP
-	fi
-	config_load meshcomms
-	config_foreach configure_meshcomms meshcomms
-}
-
-start_service() {
-	procd_open_instance meshcomms
-	procd_set_param command ${PROG}
-	configure_network
-	procd_set_param respawn
-	procd_close_instance
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers() {
-	procd_add_reload_trigger "network"
-}
--- a/mqtt-ciotc/Makefile
+++ b/mqtt-ciotc/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=Apache-2.0
-
 include $(INCLUDE_DIR)/package.mk

 define Package/mqtt-ciotc
--- a/multiwan/Makefile
+++ b/multiwan/Makefile
@@ -11,8 +11,6 @@ PKG_NAME:=multiwan
 PKG_VERSION:=1.0.22
 PKG_RELEASE:=2

-PKG_LICENSE:=GPLv2
-
 include $(INCLUDE_DIR)/package.mk

 define Package/multiwan
--- a/natalie-dect-h/Makefile
+++ b/natalie-dect-h/Makefile
@@ -16,8 +16,6 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=9e2236989ff58d0db897f938b6b07b535144e0e2
 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
--- a/natalie-dect/Makefile
+++ b/natalie-dect/Makefile
@@ -1,5 +1,8 @@
 #
-# Copyright (C) 2019 IOPSYS Software Solutions AB
+# 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
@@ -11,7 +14,7 @@ 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_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 PKG_NAME:=natalie-dect-open
 else
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -22,8 +25,6 @@ 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
--- a/ndisc/Makefile
+++ b/ndisc/Makefile
@@ -15,9 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.remlab.net/files/ndisc6
 PKG_MD5SUM:=50cb4c19606cf6ff2b7388e71832f579

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
 PKG_INSTALL:=1

 include $(INCLUDE_DIR)/package.mk
--- a/ndt/Makefile
+++ b/ndt/Makefile
@@ -12,9 +12,6 @@ PKG_BUILD_DIR:=${BUILD_DIR}/ndt-$(PKG_VERSION)
 PKG_SOURCE:=ndt-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://software.internet2.edu/sources/ndt

-PKG_LICENSE:=NONSTANDARD_PERMISSIV
-PKG_LICENSE_FILES:=COPYRIGHT
-
 include $(INCLUDE_DIR)/package.mk

 define Package/ndt
--- a/netmode/Makefile
+++ b/netmode/Makefile
@@ -1,10 +1,3 @@
-#
-# Copyright (C) 2019 iopsys
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
 include $(TOPDIR)/rules.mk

 PKG_NAME:=netmode
@@ -18,9 +11,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk

 define Package/netmode
--- a/netmode/files/lib/functions/netmode.sh
+++ b/netmode/files/lib/functions/netmode.sh
@@ -244,16 +244,17 @@ revert_netmode() {

 	ubus call leds set  '{"state" : "allflash"}'
 	logger -s -p user.info -t "netmode" "Could not switch to '$from' mode; going back to '$to' mode" > /dev/console
-	cp -af $CONF_BACKUP_DIR/* /etc/config/
-	sync
 	uci -q set netmode.setup.curmode="$to"
 	uci -q set netmode.setup.repeaterready="$rready"
 	uci commit netmode
+	cp -af $CONF_BACKUP_DIR/* /etc/config/
+	sync
 	rm -rf $CONF_BACKUP_DIR
 	rm -rf $OLD_MODE_FILE

 	logger -s -p user.info -t "netmode" "Restarting network services" > /dev/console
-	/etc/init.d/network restart
+	ubus call network reload
+	wifi reload
 	ubus call router.network reload
 	ubus call leds set  '{"state" : "normal"}'
 }
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=2.0.0
+PKG_VERSION:=1.0.0

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9c7921c8e39acfc31f563bd08220faba1012a834
+PKG_SOURCE_VERSION:=014d7ec63331b3b745e8af53a4be1b52693e2a6f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz

@@ -16,10 +16,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_FIXUP:=autoreconf

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

 define Package/obuspa
@@ -49,10 +45,8 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/obuspa
 	$(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/
+	$(CP) ./files/* $(1)/
 endef

 $(eval $(call BuildPackage,obuspa))
--- a/obuspa/files/etc/config/obuspa
+++ b/obuspa/files/etc/config/obuspa
@@ -1,41 +1,14 @@
-# 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 cert '/etc/obuspa/rootCA.pem'
-	option interface 'wan'
-	option debug 'false'
-
 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'

 config mtp
 	option enable 'true'
 	option protocol 'STOMP'
-	option destination ''
+	option destination 'uspq'

 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"
+	option encryption 'false'

--- a/obuspa/files/etc/init.d/obuspa
+++ b/obuspa/files/etc/init.d/obuspa
@@ -4,211 +4,92 @@ START=99
 USE_PROCD=1

 PROG=/usr/sbin/obuspa
-l3device=""
-certificate=""
-PARAM_FILE="/tmp/obuspa_param_reset.txt"
-conn_num=1
-mtp_num=1
-stomp_num=1
+
+CTRL_PATH="Device.LocalAgent.Controller.1."
+MTP_PATH="Device.LocalAgent.MTP.1."
+CONN_PATH="Device.STOMP.Connection.1."

 log() {
 	echo "${@}"|logger -t obuspa -p debug
 }

 db_set() {
-	if [ -n "${1}" ]; then
-		echo "${1} \"${2}\"">>${PARAM_FILE}
-	else
-		echo >>${PARAM_FILE}
-	fi
-}
-
-validate_obuspa_section()
-{
-	uci_validate_section obuspa obuspa "${1}" \
-		'cert:string:"/etc/obuspa/rootCA.pem"' \
-		'interface:string:wan' \
-		'debug:bool:false'
+	log "DBSET param|${1}| value|${2}|"
+	${PROG} -c dbset ${1} ${2}
 }

 validate_controller_section()
 {
 	uci_validate_section obuspa controller "${1}" \
-		'endpointid:string:"self:usp-controller.com"' \
-		'enable:bool:true' \
-		'AssignedRole:uinteger:1' \
-		'PeriodicNotifInterval:uinteger:86400' \
-		'PeriodicNotifTime:string:"0001-01-01T00:00:00Z"' \
-		'USPRetryMinimumWaitInterval:uinteger:5' \
-		'USPRetryIntervalMultiplier:uinteger:2000' \
-		'ControllerCode:string' \
-		'protocol:or("STOMP","CoAP")' \
-		'CoAPHost:string' \
-		'CoAPPath:string' \
-		'CoAPPort:uinteger'
+		'endpointid:string:"self:usp-controller.com"'
 }

 validate_mtp_section()
 {
 	uci_validate_section obuspa mtp "${1}" \
 		'enable:bool:true' \
-		'protocol:or("STOMP","CoAP")' \
-		'destination:string' \
-		'CoAPPath:string' \
-		'CoAPPort:uinteger'
+		'protocol:string:"STOMP"' \
+		'destination:string:'
 }

 validate_connection_section()
 {
 	uci_validate_section obuspa connection "${1}" \
 		'host:string:"usp-controller.com"' \
-		'username:string:""' \
-		'password:string:""' \
-		'encryption:bool:true' \
-		'enable:bool:true' \
-		'port:uinteger:61613' \
-		'virtualhost:string:"/"' \
-		'EnableHeartbeats:bool:true' \
-		'OutgoingHeartbeat:uinteger:30000' \
-		'IncomingHeartbeat:uinteger:300000' \
-		'ServerRetryInitialInterval:uinteger:60' \
-		'ServerRetryIntervalMultiplier:uinteger:2000' \
-		'ServerRetryMaxInterval:uinteger:30720'
+		'username:string:username' \
+		'password:string:password' \
+		'encryption:bool:true'
 }

 configure_controller() {
-	local endpointid enable AssignedRole PeriodicNotifInterval PeriodicNotifTime USPRetryMinimumWaitInterval
-	local USPRetryIntervalMultiplier ControllerCode protocol CoAPHost CoAPPath CoAPPort
+	local endpointid

 	validate_controller_section "${1}" || {
 		log "Validation of section failed"
 		return 1;
 	}
-	db_set Device.LocalAgent.Controller.${conn_num}.EndpointID "${endpointid}"
-	db_set Device.LocalAgent.Controller.${conn_num}.Alias "cpe-${conn_num}"
-	db_set Device.LocalAgent.Controller.${conn_num}.Enable "true"
-	db_set Device.LocalAgent.Controller.${conn_num}.AssignedRole "Device.LocalAgent.ControllerTrust.Role.${AssignedRole}"
-	db_set Device.LocalAgent.Controller.${conn_num}.PeriodicNotifInterval "${PeriodicNotifInterval}"
-	db_set Device.LocalAgent.Controller.${conn_num}.PeriodicNotifTime "${PeriodicNotifTime}"
-	db_set Device.LocalAgent.Controller.${conn_num}.USPRetryMinimumWaitInterval "${USPRetryMinimumWaitInterval}"
-	db_set Device.LocalAgent.Controller.${conn_num}.USPRetryIntervalMultiplier "${USPRetryIntervalMultiplier}"
-	db_set Device.LocalAgent.Controller.${conn_num}.ControllerCode "${ControllerCode}"
-	db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.Alias "cpe-${conn_num}" 
-	db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.Enable "${enable}"
-	db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.Protocol "${protocol}"
-	if [ "${protocol}"=="STOMP" ]; then
-		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.STOMP.Reference "Device.STOMP.Connection.${conn_num}"
-		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.STOMP.Destination "controller-notify-dest"
-	elif [ "${protocol}"=="CoAP" ]; then
-		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.CoAP.Host "${CoAPHost}"
-		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.CoAP.Path "${CoAPPath}"
-		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.CoAP.Port "${CoAPPort}"
-	else
-		log "Unsupported protocol ${protocol}"
-	fi
-	db_set
-	conn_num=$((conn_num+1))
+	db_set "${CTRL_PATH}EndpointID" ${endpointid}
 }

 configure_mtp() {
-	local protocol enable destination CoAPPath CoAPPort
+	local protocol enable destination

 	validate_mtp_section "${1}" || {
 		log "Validation of section failed"
 		return 1;
 	}
-	db_set Device.LocalAgent.MTP.${mtp_num}.Alias "cpe-${mtp_num}"
-	db_set Device.LocalAgent.MTP.${mtp_num}.Enable "${enable}"
-	db_set Device.LocalAgent.MTP.${mtp_num}.Protocol "${protocol}"
-	if [ "${protocol}"=="STOMP" ]; then
-		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Reference "Device.STOMP.Connection.${mtp_num}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Destination "${destination}"
-	elif [ "${protocol}"=="CoAP" ]; then
-		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Path "${CoAPPath}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Port "${CoAPPort}"
-	else
-		log "Unsupported protocol ${protocol}"
-	fi
-	db_set
-	mtp_num=$((mtp_num+1))
+	db_set "${MTP_PATH}Enable" ${enable}
+	db_set "${MTP_PATH}Protocol" ${protocol}
+	db_set "${MTP_PATH}STOMP.Destination" ${destination}
 }

 configure_connection() {
-	local host username password encryption enable port virtualhost EnableHeartbeats
-	local OutgoingHeartbeat IncomingHeartbeat ServerRetryInitialInterval
-	local ServerRetryIntervalMultiplier ServerRetryMaxInterval
+	local host username password encryption

 	validate_connection_section "${1}" || {
 		log "Validation of section failed"
 		return 1;
 	}
-
-	db_set Device.STOMP.Connection.${stomp_num}.Host "${host}"
-	db_set Device.STOMP.Connection.${stomp_num}.Username "${username}"
-	db_set Device.STOMP.Connection.${stomp_num}.Password "${password}"
-
-	db_set Device.STOMP.Connection.${stomp_num}.Alias "cpe-${stomp_num}"
-	db_set Device.STOMP.Connection.${stomp_num}.Enable "${enable}"
-	db_set Device.STOMP.Connection.${stomp_num}.Port "${port}"
-	db_set Device.STOMP.Connection.${stomp_num}.X_ARRIS-COM_EnableEncryption "${encryption}"
-	db_set Device.STOMP.Connection.${stomp_num}.VirtualHost "${virtualhost}"
-	db_set Device.STOMP.Connection.${stomp_num}.EnableHeartbeats "${EnableHeartbeats}"
-	db_set Device.STOMP.Connection.${stomp_num}.OutgoingHeartbeat "${OutgoingHeartbeat}"
-	db_set Device.STOMP.Connection.${stomp_num}.IncomingHeartbeat "${IncomingHeartbeat}"
-	db_set Device.STOMP.Connection.${stomp_num}.ServerRetryInitialInterval "${ServerRetryInitialInterval}"
-	db_set Device.STOMP.Connection.${stomp_num}.ServerRetryIntervalMultiplier "${ServerRetryIntervalMultiplier}"
-	db_set Device.STOMP.Connection.${stomp_num}.ServerRetryMaxInterval "${ServerRetryMaxInterval}"
-	db_set
-	stomp_num=$((stomp_num+1))
+	db_set "${CONN_PATH}Host" ${host}
+	db_set "${CONN_PATH}Username" ${username}
+	db_set "${CONN_PATH}Password" ${password}
+	db_set "${CONN_PATH}X_ARRIS-COM_EnableEncryption" ${encryption}
 }

-configure_obuspa() {
-	local cert interface debug
-
-	validate_obuspa_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	if [ ${debug} -eq 1 ]; then
-		# Forward stdout of the command to logd
-		procd_set_param stdout 1
-		# Same for stderr
-		procd_set_param stderr 1
-	fi
-
-	# Get wan L3 interface
-	json_load "$(ubus -t 2 call network.interface.${interface} status)"
-	json_get_var l3device l3_device
-	export USP_BOARD_IFNAME=${l3device}
-
-	# Set this variable for root user
-	echo "export USP_BOARD_IFNAME=${l3device}">/root/.profile
-
-	[ -f $cert ] && certificate=$cert
-
-}
 db_init() {
-	[ -f ${PARAM_FILE} ] && rm -f ${PARAM_FILE}
 	[ -f /tmp/usp.db ] && rm -f /tmp/usp.db

 	config_load obuspa
-	config_foreach configure_obuspa obuspa
 	config_foreach configure_controller controller
-	config_foreach configure_connection connection
 	config_foreach configure_mtp mtp
-	db_set Internal.Reboot.Cause "LocalFactoryReset"
+	config_foreach configure_connection connection
 }
-
 start_service() {
-	procd_open_instance obuspa
 	db_init
-	procd_set_param env USP_BOARD_IFNAME=${l3device}
+
+	procd_open_instance
 	procd_set_param command ${PROG}
-	procd_append_param command -p -v 4 -r ${PARAM_FILE}
-	if [ -f "${certificate}" ]; then
-		procd_append_param command -t ${certificate}
-	fi
+	procd_append_param command -p -v 4
 	procd_set_param respawn
 	procd_close_instance
 }
@@ -221,3 +102,4 @@ reload_service() {
 service_triggers() {
 	procd_add_config_trigger "config.change" "obuspa"  /etc/init.d/obuspa restart
 }
+
--- a/opkgd/Makefile
+++ b/opkgd/Makefile
@@ -1,48 +0,0 @@
-#
-# Copyright (C) 2019 IOPSYS
-#
-# 
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=opkgd
-PKG_VERSION:=1.0.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d3da32eca6e50b6be6e846a7f82c8e93c74c45a4
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/opkgd.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/opkgd
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=OPKG ubus backend
-	DEPENDS:=+libuci +libubox +ubus +libuuid
-endef
-
-define Package/opkgd/description
-	Ubus based backend for OPKG which can be used by other applications running on top of it.
-endef
-
-define Build/Prepare
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE
-
-define Package/opkgd/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/opkgd.init $(1)/etc/init.d/opkgd
-	$(INSTALL_DIR) $(1)/etc/opkg
-	$(INSTALL_CONF) ./files/map_du $(1)/etc/opkg/map_du
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/opkgd $(1)/usr/sbin/opkgd
-endef
-
-$(eval $(call BuildPackage,opkgd))
--- a/opkgd/files/map_du
+++ b/opkgd/files/map_du
--- a/opkgd/files/opkgd.init
+++ b/opkgd/files/opkgd.init
@@ -1,20 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=94
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/sbin/opkgd
-
-start_service() {
-	procd_open_instance
-	procd_set_param command ${PROG}
-	procd_set_param respawn
-	procd_close_instance
-}
-
-reload_service() {
-	stop
-	start
-}
-
--- a/owsd/Makefile
+++ b/owsd/Makefile
@@ -10,16 +10,13 @@ PKG_RELEASE:=1

 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=1c6efa76a23b9a8236a8f6d3b43349cf1e23655a
+PKG_SOURCE_VERSION:=f1d6bff1971640006b3137b342fafa1c40cfb835
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 PKG_CONFIG_DEPENDS:=CONFIG_OWSD_USE_DBUS CONFIG_OWSD_USE_UBUS CONFIG_OWSD_USE_DBUS_UBUS CONFIG_OWSD_UPROXYD

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 USE_UBUS-y:=-DWSD_HAVE_UBUS=ON
 USE_DBUS-y:=-DWSD_HAVE_DBUS=ON
 USE_BOTH-y:=${USE_UBUS-y} ${USE_DBUS-y}
--- a/owsd/files/owsd.init
+++ b/owsd/files/owsd.init
@@ -66,8 +66,6 @@ rpcd_acl() {
 }

 handle_owsd_acl() {
-	[ -d /tmp/owsd ] || mkdir /tmp/owsd
-
 	config_load rpcd
 	config_foreach append_users "login"

@@ -79,9 +77,9 @@ handle_owsd_acl() {
 		config_foreach owsd_acl "owsd-listen" "$USR"
 		json_close_array
 	done
-	json_dump > /tmp/owsd/owsd_acl
+	json_dump > /tmp/owsd_acl

-	json_load "$(cat /tmp/owsd/owsd_acl)"
+	json_load "$(cat /tmp/owsd_acl)"
 	config_load rpcd
 	config_foreach rpcd_acl "login"
 	uci commit rpcd
@@ -128,8 +126,8 @@ validate_owsd_global() {

 }

-append_str() {
-	json_add_string "" "$1"
+append_origin() {
+	procd_append_param command -o"$1"
 }

 append_origin_parts() {
@@ -139,9 +137,9 @@ append_origin_parts() {
 	port="$3"

 	if [ "${proto}" = "https" -a "${port}" -eq 443 -o "${proto}" = "http" -a "${port}" -eq 80 ]; then
-		append_str "${proto}://${host}"
+		append_origin "${proto}://${host}"
 	else
-		append_str "${proto}://${host}:${port}"
+		append_origin "${proto}://${host}:${port}"
 	fi
 }

@@ -152,7 +150,6 @@ validate_owsd_iface() {
 		'origin:list(string)' \
 		'whitelist_interface_as_origin:bool:0' \
 		'whitelist_dhcp_domains:bool:0' \
-		'whitelist_all_origins:bool:0' \
 		'ipv6:bool:1' \
 		'ipv6only:bool:0' \
 		'linklocal:bool:0' \
@@ -166,7 +163,7 @@ validate_owsd_iface() {
 }

 parse_owsd_iface() {
-	local port interface whitelist_interface_as_origin whitelist_dhcp_domains whitelist_all_origins ipv6 ipv6only linklocal
+	local port interface whitelist_interface_as_origin whitelist_dhcp_domains ipv6 ipv6only linklocal
 	local cert key ca
 	local restrict_to_user
 	local ubusx_acl
@@ -178,37 +175,24 @@ parse_owsd_iface() {

 	# utility function
 	new_listen_socket() {
-		json_add_int "port" ${port}
+		procd_append_param command -p "${port}"

-		[ -n "${cert}"      ] && json_add_string "cert" "${cert}"
-		[ -n "${key}"       ] && json_add_string "key" "${key}"
-		[ -n "${ca}"        ] && json_add_string "ca" "${ca}"
+		procd_append_param command -L"$1"

-		[ -n "${restrict_to_user}" ] && {
-			json_add_array "restrict_to_user"
-			config_list_foreach "$1" "restrict_to_user" append_str
-			json_close_array
-		}
-		[ -n "$2" ] && json_add_string "interface" "$2"
+		[ -n "${cert}"      ] && procd_append_param command -c"${cert}"
+		[ -n "${key}"       ] && procd_append_param command -k"${key}"
+		[ -n "${ca}"        ] && procd_append_param command -a"${ca}"

-		[ -n "${ubusx_acl}" ] && json_add_string "ubusx_acl" "$ubusx_acl"
+		[ -n "${restrict_to_user}" ] && procd_append_param command -u"${restrict_to_user}"
+
+		[ -n "$2" ] && procd_append_param command -i"$2"
+
+		[ -n "${ubusx_acl}" ] && procd_append_param command -X"${ubusx_acl}"

 	}

-	origin_whitelist_all() {
-		[ "$1" = "*" ] && echo "true"
-	}
-
-	append_whitelists() {
-		config_list_foreach "$1" "origin" append_str
-
-		# uncomment code below when implementing one vhost per origin fix
-		#[ -n "$2" ] && whitelist_all_origins=1
-
-		#if [ "$whitelist_all_origins" -eq 1 ]; then
-		#	whitelist_dhcp_domains=1
-		#	whitelist_interface_as_origin=1
-		#fi
+	append_whitelists () {
+		config_list_foreach "$1" "origin" append_origin

 		if [ "$whitelist_dhcp_domains" -eq 1 ]; then
 			for domain in $DHCP_DOMAINS; do
@@ -228,22 +212,13 @@ parse_owsd_iface() {
 	if [ -n "${interface}" ]; then
 		# 1 listen-socket (vhost) for each IP address on that network's iface

-		whitelist=$(config_list_foreach "$1" "origin" origin_whitelist_all)
-
 		# ipv4 addresses
 		if [ "${ipv6only}" -eq 0 ]; then
 			network_get_ipaddrs ip4addrs "${interface}";
 		fi
-
-		json_add_array "$1"
 		for addr in ${ip4addrs}; do
-			json_add_object "${1}"
 			new_listen_socket "$1" "${addr}"
-			[ -n "$whitelist" -o "$whitelist_all_origins" -eq 1 ] && json_add_boolean "origin_check" false
-			json_add_array "origin"
-			append_whitelists "$1" "$whitelist"
-			json_close_array
-			json_close_object
+			append_whitelists "$1"
 		done

 		# ipv6 addresses
@@ -255,24 +230,16 @@ parse_owsd_iface() {
 				ip6addrs="${ip6addrs} ${linklocaladdrs}"
 			fi
 		fi
-
 		for addr in ${ip6addrs}; do
-			json_add_object "${1}6"
 			new_listen_socket "$1" "${addr}"
 			addr="\\[${addr}]"
-			[ -n "$whitelist" ] && json_add_boolean "origin_check" false
-			json_add_array "origin"
-			append_whitelists "$1" "$whitelist"
-			json_close_array
-			json_add_boolean "ipv6" 1
-			json_close_object
+			append_whitelists "$1"
+			procd_append_param command -66
 		done
-		json_close_array
-
 	else
 		new_listen_socket "$1"
-		if [ "${ipv6}" -eq 1 ]; then json_add_boolean "ipv6only" 1; fi
-		if [ "${ipv6}" -eq 1 -a "${ipv6only}" -eq 1 ]; then json_add_boolean "ipv6only" 1; fi
+		if [ "${ipv6}" -eq 1 ]; then procd_append_param command -6; fi
+		if [ "${ipv6}" -eq 1 -a "${ipv6only}" -eq 1 ]; then procd_append_param command -6; fi

 		append_whitelists "$1"
 	fi
@@ -296,49 +263,41 @@ start_service() {
 		echo "Global validation failed"
 		return 1
 	}
-	json_init
-	json_add_object "global"
-	[ -n "${sock}"       ] && json_add_string "socket" "$sock"
-	[ -n "${www}"        ] && json_add_string "www" "$www"
-	[ -n "${redirect}"   ] && json_add_string "redirect" "$redirect"
-	[ -n "${www_maxage}" ] && json_add_int "www_maxage" "$www_maxage"
-	json_close_object
+
+	[ -n "${sock}"      ] && procd_append_param command -s"${sock}"
+	[ -n "${www}"       ] && procd_append_param command -w"${www}"
+	[ -n "${redirect}"  ] && procd_append_param command -r"${redirect}"
+	[ -n "${www_maxage}" ] && procd_append_param command -t"${www_maxage}"
+
+	#validate_owsd_ubusproxy || {
+	#	echo "Ubusproxy validation failed"
+	#	return 1
+	#}

 	validate_owsd_ubusproxy && {
 		if [ "${enable}" -eq 1 ]; then
-			json_add_object "ubusproxy"
+			procd_append_param command -U

-			[ -n "${peer_cert}" ] && json_add_string "peer_cert" "${peer_cert}"
-			[ -n "${peer_key}"  ] && json_add_string "peer_key" "${peer_key}"
-			[ -n "${peer_ca}"   ] && json_add_string "peer_ca" "${peer_ca}"
+			[ -n "${peer_cert}" ] && procd_append_param command -C"${peer_cert}"
+			[ -n "${peer_key}"  ] && procd_append_param command -K"${peer_key}"
+			[ -n "${peer_ca}"   ] && procd_append_param command -A"${peer_ca}"

 			append_peer () {
-				[ -n "$1"   ] && json_add_string "peer" "$1"
+				[ -n "$1"   ] && procd_append_param command -P"$1"
 			}

 			append_object () {
-				[ -n "$1"   ] && json_add_string "object" "$1"
+				[ -n "$1"   ] && procd_append_param command -U"$1"
 			}

-			json_add_array "peer"
 			config_list_foreach "ubusproxy" "peer" append_peer
-			json_close_array
-			json_add_array "object"
 			config_list_foreach "ubusproxy" "object" append_object
-			json_close_array

-			[ "${prefix}" == "mac" ] && json_add_string "prefix" "mac"
-			json_close_object
+			[ "${prefix}" == "mac" ] && procd_append_param command -F"mac"
 		fi
 	}

-	json_add_object "owsd-listen"
 	config_foreach parse_owsd_iface "owsd-listen"
-	json_close_object
-
-	[ ! -d "/tmp/owsd" ] && mkdir /tmp/owsd
-	json_dump > /tmp/owsd/owsd_cfg.json
-	procd_append_param command -f "/tmp/owsd/owsd_cfg.json"

 #	procd_set_param stderr 1
 	procd_set_param respawn
--- a/paho-mqtt-c/Makefile
+++ b/paho-mqtt-c/Makefile
@@ -16,10 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=edl-v10
-PKG_LICENSE_FILES:=LICENSE
-
-
 include $(INCLUDE_DIR)/package.mk

 define Package/lib-paho-mqtt
--- a/peripheral_manager/Makefile
+++ b/peripheral_manager/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 iopsys
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1

-PKG_SOURCE_VERSION:=ba1026896e221cb60751fe2faab002d241f9db74
+PKG_SOURCE_VERSION:=769430115b6dd984313574c3fa2a6d99c65cd223
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager

@@ -20,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 PKG_BUILD_PARALLEL:=1

--- a/peripheral_manager/files/etc/init.d/peripheral_manager
+++ b/peripheral_manager/files/etc/init.d/peripheral_manager
@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common

-START=12
+START=19
 STOP=91

 USE_PROCD=1
--- a/picolisp/Makefile
+++ b/picolisp/Makefile
@@ -11,9 +11,6 @@ PKG_MD5SUM:=ac19fd6ff4d05dd2b15ea00d1ed591e7

 PKG_BUILD_DEPENDS+= +libopenssl +@OPENSSL_WITH_EC2M

-PKG_LICENSE:=MIT-X11
-PKG_LICENSE_FILES:=COPYING
-
 include $(INCLUDE_DIR)/package.mk

 define Package/picolisp
--- a/port-management/Makefile
+++ b/port-management/Makefile
@@ -4,7 +4,7 @@ PKG_NAME:=port-management
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_LICENSE:=GPL-2.0-only
+
 include $(INCLUDE_DIR)/package.mk

 define Package/port-management
--- a/port-management/files/etc/init.d/port_management
+++ b/port-management/files/etc/init.d/port_management
@@ -73,8 +73,3 @@ service_triggers() {
 	procd_add_reload_trigger ports
 }

-boot() {
-	wan=$(db -q get hw.board.ethernetWanPort)
-	restart_port $wan
-	start
-}
--- a/power-management/Makefile
+++ b/power-management/Makefile
@@ -3,7 +3,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=power-management
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_LICENSE:=GPL-2.0-only

 include $(INCLUDE_DIR)/package.mk

--- a/questd/Makefile
+++ b/questd/Makefile
@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=4.1.1

-PKG_SOURCE_VERSION:=89619c1ae8243812a71cdc0ae31491e74866f4be
+PKG_SOURCE_VERSION:=c1d8ba92f6a8538f7a48960592cfe91c0c057c2b
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd

@@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk

 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
--- a/rulengd/Makefile
+++ b/rulengd/Makefile
@@ -17,8 +17,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
--- a/rulengd/files/etc/init.d/rulengd
+++ b/rulengd/files/etc/init.d/rulengd
@@ -1,7 +1,10 @@
 #!/bin/sh /etc/rc.common
+#
+# Start the rulengd
+#

-START=17
-STOP=11
+START=99
+STOP=01

 USE_PROCD=1
 NAME=rulengd
--- a/samba2/Makefile
+++ b/samba2/Makefile
@@ -17,7 +17,7 @@ PKG_SOURCE_VERSION:=d687d07a137981f4fe78cc289b040e6426c61e29
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_LICENSE:=GPL-2.0-only
+
 include $(INCLUDE_DIR)/package.mk

 define Package/samba2/Default
--- a/samba3/Makefile
+++ b/samba3/Makefile
@@ -18,8 +18,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/samba-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 #PKG_FIXUP:=autoreconf

-PKG_LICENSE:=GPL-2.0-only
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk

--- a/sipcalc/Makefile
+++ b/sipcalc/Makefile
@@ -15,8 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.routemeister.net/projects/sipcalc/files \
 		http://download.google.com/mirror
 PKG_MD5SUM:=8d59e70d21d8f0568e310d342e3e2306
-PKG_LICENSE:=NONSTANDARD_PERMISSIV
-PKG_LICENSE_FILES:=COPYING
+
 include $(INCLUDE_DIR)/package.mk

 define Package/sipcalc
--- a/speedtest-cli/Makefile
+++ b/speedtest-cli/Makefile
@@ -12,8 +12,7 @@ PKG_NAME:=speedtest-cli
 PKG_RELEASE:=1
 PKG_SOURCE:=speedtest_cli.py
 PKG_SOURCE_URL:=https://raw.githubusercontent.com/sivel/speedtest-cli/master
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk

 define Package/speedtest-cli
--- a/topologyd/Makefile
+++ b/topologyd/Makefile
@@ -15,8 +15,7 @@ PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/topologyd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk

 define Package/topologyd
--- a/tptest/Makefile
+++ b/tptest/Makefile
@@ -11,8 +11,7 @@ PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/tptest.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=LGPL-2.1-only
-PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk

 TARGET_LDFLAGS+= \
--- a/tr064/Makefile
+++ b/tr064/Makefile
@@ -11,7 +11,7 @@ PKG_SOURCE_VERSION:=e53d492a09c433718a520987c419cb6a4d4ae8dc
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=LGPL-2.1-only Apache-2.0
+
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_TR064_DEBUG \
 	CONFIG_TR064_DEVEL
--- a/tr098/Config.in
+++ b/tr098/Config.in
@@ -1,11 +0,0 @@
-if PACKAGE_libtr098
-
-config LIBTR098_VENDOR_PREFIX
-    string "TR-098 Vendor Prefix"
-    default "X_IOPSYS_EU_"
-
-config UPNP_TR064
-	bool "Compile with tr064 features"
-	default n
-	
-endif
--- a/tr098/Makefile
+++ b/tr098/Makefile
@@ -1,73 +0,0 @@
-#
-# Copyright (C) 2019 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libtr098
-PKG_VERSION:=1.0-2019-12-11
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/tr-098
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ce93aebda4c14cfc43a7a60d67d4716a576171fd
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libtr098
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace
-endef
-
-define Package/libtr098/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/libtr098/description
- Test description will update later.
-endef
-
-USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
-ifneq ($(USE_LOCAL),)
-define Build/Prepare
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBTR098_VENDOR_PREFIX)\\\"
-
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE -D_AADJ
-
-ifeq ($(CONFIG_UPNP_TR064),y)
-CONFIGURE_ARGS += \
-	--enable-tr064
-endif
-
-define Package/libtr098/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libtr098.so* $(1)/lib/
-	$(INSTALL_DIR) $(1)/etc/tr098
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/tr098
-	$(INSTALL_DIR) $(1)/usr/share/tr098
-	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/tr098
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/libtr098
-	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libtr098/
-	$(CP) $(PKG_BUILD_DIR)/tr098/*.h $(1)/usr/include/libtr098/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libtr098.{a,so*} $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libtr098))
--- a/uboot/Makefile
+++ b/uboot/Makefile
@@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git

 ifdef CONFIG_TARGET_intel_mips
 PKG_SOURCE_URL:=git@dev.iopsys.eu:intel/uboot.git
-PKG_SOURCE_VERSION:=19dde95c2bba420d5ead96b0dd5aea8dc7979ec0
+PKG_SOURCE_VERSION:=819227ec4cf4f2f8f7e8d46a3bee58e329089de6
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
 PKG_SOURCE_VERSION:=670ad7a30f3c6871b6c8a972e19ca2dd78ea8c9b
@@ -24,8 +24,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz

-PKG_LICENSE:=GPL-2.0-or-later
-
 # u-boot for mips_intel do not build in parallel. 
 #PKG_BUILD_PARALLEL:=1

--- a/ubus-mqtt/Makefile
+++ b/ubus-mqtt/Makefile
@@ -16,7 +16,6 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=NONE

 include $(INCLUDE_DIR)/package.mk

--- a/uspd/Makefile
+++ b/uspd/Makefile
@@ -5,16 +5,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=uspd
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.3

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ad23aa1ce58fe769c7cfa57673376400c0556580
+PKG_SOURCE_VERSION:=f033acb40afd9b087587d3cfba292e1d884600d6
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk

@@ -22,7 +20,7 @@ define Package/uspd
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=USP ubus backend
-  DEPENDS:=+libubox +ubus +libbbfdm
+  DEPENDS:=+libubox +ubus +icwmp-curl
 endef

 define Package/uspd/description
--- a/voice-client/Makefile
+++ b/voice-client/Makefile
@@ -8,7 +8,7 @@ PKG_NAME:=voice-client
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_LICENSE:=GPL-2.0-only
+
 include $(INCLUDE_DIR)/package.mk

 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
@@ -29,7 +29,7 @@ define Package/voice-client
  SECTION:=net
  CATEGORY:=Network
  TITLE:=voice-client
-  DEPENDS:=@TARGET_HAS_VOICE
+  DEPENDS:=+asterisk13
 endef

 define Package/voice-client/description
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hemlata Bhatt	939fae5860	Event catch for Led blinking	2019-10-08 15:21:51 +02:00
Hemlata Bhatt	19b1345f98	Telia Eesti-Make tone Configurable adding the tonetypes	2019-09-05 09:49:57 +02:00
Hemlata Bhatt	2aed9a5525	Telia Eesti-Make tone Configurable	2019-09-05 09:47:50 +02:00
Sukru Senli	2f3551e643	voice-client: firewall.sip: do not hardcode rtp ports	2019-08-21 10:08:05 +02:00
Jakob Olsson	29e635516d	questd: update pkg to remove des key from system.info	2019-08-19 10:29:29 +02:00
Sukru Senli	d4c6078f24	icwmp-4.0-2019-08-17	2019-08-19 08:15:43 +02:00
Jakob Olsson	8ad83b1252	questd: update pkg to include intel ssid fix #1073	2019-08-16 12:07:31 +02:00
Jakob Olsson	0e2154bb0d	questd: update pkg hash to include intel port up status	2019-08-16 11:25:37 +02:00
Anjan Chanda	dbc9aa37c7	Update feed [ iopsys ] package [ easy-soc-libs ] ------------------------------------------------------------------------------- * 4c20476 libwifi: remove dependency on unused netlink route ------------------------------------------------------------------------------- commit 4c204761a38a27ff9ff7021c3c34b92d7e3fdb84 Author: Anjan Chanda <anjan.chanda@iopsys.eu> Date: 2019-08-15 11:54:00 +0200 libwifi: remove dependency on unused netlink route Base directory -> / libwifi/wifi.c \| 1 - 1 file changed, 1 deletion(-) -------------------------------------------------------------------------------	2019-08-15 11:56:25 +02:00
Jakob Olsson	e0687449cc	port_management: pass cfg name to set_port_speed #1059 #1060	2019-08-15 11:04:45 +02:00
Jakob Olsson	fc9a912cb5	voice_client: prevent malicious crontab injection through dayns #1008	2019-08-14 10:57:55 +02:00
Jakob Olsson	54d5855ad9	netmode: prevent path traversal in pre and post from netmode.sh #1010	2019-08-09 09:23:35 +02:00
Jakob Olsson	b0054ba9c7	voice_client: ringing: prevent scheduler from creating malicious cronjobs #1008	2019-08-06 10:56:10 +02:00
Oussama Ghorbel	a5a3f56ee7	uboot: update package source revision commit 819227ec4cf4f2f8f7e8d46a3bee58e329089de6 Author: Oussama Ghorbel <oussama.ghorbel@iopsys.eu> Date: Thu Jul 25 14:34:55 2019 +0200 adjust brightness to Genexis recommended values	2019-07-25 14:55:38 +02:00
Oussama Ghorbel	2fc025e8c5	Revert "protect u-boot by password for norrland board" This reverts commit `fc3a0f8169`.	2019-07-25 14:55:38 +02:00
Oussama Ghorbel	44cf5757fc	gryphon-led-module: set brightness level to 15 This is requested by Genexis	2019-07-25 14:55:38 +02:00
Oussama Ghorbel	0cf9177ea3	protect u-boot by password for norrland board b1aea2a7df protect u-boot prompt by sha256 password 860cd65bdb initialize SHA buffer size var in passwd_abort	2019-07-25 14:55:38 +02:00