update init.d and add config script

update hash
hash update
2025-12-25 19:44:30 +08:00 · 2019-01-18 15:06:42 +01:00 · 2019-01-18 12:24:58 +01:00 · 2019-01-18 12:24:58 +01:00 · 2019-01-18 12:24:58 +01:00 · 2019-01-18 12:24:58 +01:00
200 changed files with 2658 additions and 5010 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_VERSION:=1.2.0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2c8990fd5275d469e8ab6c7a99e17fe0a56052ea
+PKG_SOURCE_VERSION:=0c029ed2486342e7e7687631b702d5c743f3c41a
 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
@@ -1,81 +0,0 @@
-#
-# 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:=dslmngr
-PKG_VERSION:=1.0.0
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7522faab4142fe2c0ac8cbf71bb0cc5bd49f0750
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
-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
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-  TARGET_PLATFORM=BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-  TARGET_PLATFORM=BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-  TARGET_PLATFORM=MEDIATEK
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-  TARGET_PLATFORM=MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-  TARGET_PLATFORM=INTEL
-else
-  $(info Unexpected CONFIG_TARGET)
-endif
-
-export TARGET_PLATFORM
-
-define Package/dslmngr
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +easy-soc-libs
-endef
-
-define Package/dslmngr/description
- This package can be used to configure and provide status about
- the XDSL subsystem through UBUS.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	FPIC="$(FPIC)"
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -r --exclude=.* ~/git/dslmngr/ $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Build/Compile
-	+$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
-endef
-
-define Package/dslmngr/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,dslmngr))
--- a/easy-qos/Makefile
+++ b/easy-qos/Makefile
@@ -1,51 +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-qos
-PKG_VERSION:=1.1
-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
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./files/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Compile
-endef
-
-define Package/easy-qos/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(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
-
-$(eval $(call BuildPackage,easy-qos))
--- a/easy-qos/files/etc/firewall.easyqos
+++ b/easy-qos/files/etc/firewall.easyqos
@@ -1 +0,0 @@
-/etc/init.d/easy_qos reload
--- 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
@@ -1,140 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-USE_PROCD=1
-
-log() {
-	echo "${@}"|logger -t easy_qos.ebtable -p debug
-}
-
-exec_log() {
-	${@}
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-	fi
-}
-
-get_priority() {
-	local prio=$(echo $1|tr [A-Z] [a-z]);
-	case "${prio}" in
-		"lowest")
-			echo 0;;
-		"low")
-			echo 1;;
-		"besteffort")
-			echo 2;;
-		"normal")
-			echo 3;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 5;;
-		"high")
-			echo 6;;
-		"highest")
-			echo 7;;
-	esac
-}
-
-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() {
-	local rule=$(ebtables -t broute -L BROUTING|grep -m 1 mark)
-	while [ -n "${rule}" ]; do
-		exec_log ebtables -t broute -D BROUTING ${rule}
-		rule=$(ebtables -t broute -L BROUTING|grep -m 1 mark)
-	done
-}
-
-create_rule() {
-	local protocol=$1; shift
-	local mac=$1; shift
-	local mark="0x$1"; shift
-	local forward_port=$1;
-	local cmd="";
-	local protocol_number
-
-	cmd="-j mark --mark-or ${mark}";
-	if [ -n "${forward_port}" ]; then
-		cmd="--ip-destination-port ${forward_port} ${cmd}";
-	fi
-	
-	case "${protocol}" in
-		"tcp")
-			protocol_number=6;;
-		"udp")
-			protocol_number=17;;
-		"dccp")
-			protocol_number=33;;
-		"sctp")
-			protocol_number=132;;
-		*)
-			log "Protocol ${protocol} not supported in ebtables"
-			return;;
-	esac
-			
-	cmd="--ip-proto ${protocol_number} $cmd"
-	cmd="-p ip $cmd"
-
-	cmd="-s ${mac} $cmd"
-	exec_log ebtables -t broute -A BROUTING ${cmd}
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num protocol
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	protocol=$(echo ${proto}|tr [A-Z] [a-z])
-	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
-				create_rule tcp ${macaddr} ${prio_num} ${p}
-				create_rule udp ${macaddr} ${prio_num} ${p}
-			else
-				create_rule ${protocol} ${macaddr} ${prio_num} ${p}
-			fi
-		done
-		# Create rule for all ports if port is not mentioned in uci
-		if [ -z "${port}" ]; then
-			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
-				create_rule tcp ${macaddr} ${prio_num}
-				create_rule udp ${macaddr} ${prio_num}
-			else
-				create_rule ${protocol} ${macaddr} ${prio_num}
-			fi
-		fi
-	fi
-}
-
-reload_service() {
-	# Do not apply rules if ebtables is not present in system
-	[ -x /usr/sbin/ebtables ] || return;
-
-	clear_existing_rules
-	config_load easy_qos
-	config_foreach manage_rule rule
-}
-
-start_service() {
-	reload_service
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos"
-}
-
--- a/easy-qos/files/etc/init.d/easy_qos.iptables
+++ b/easy-qos/files/etc/init.d/easy_qos.iptables
@@ -1,186 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-. /usr/share/libubox/jshn.sh
-
-START=99
-USE_PROCD=1
-
-CLIENT_LIST="/tmp/easy_qos_client.list"
-
-log() {
-	echo "${@}"|logger -t easy_qos -p debug
-}
-
-exec_log() {
-	${@}
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-	fi
-}
-
-get_priority() {
-	local prio=$(echo $1|tr [A-Z] [a-z]);
-	case "${prio}" in
-		"lowest")
-			echo 0;;
-		"low")
-			echo 1;;
-		"besteffort")
-			echo 2;;
-		"normal")
-			echo 3;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 5;;
-		"high")
-			echo 6;;
-		"highest")
-			echo 7;;
-	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
-
-#	json_add_array "clients"
-	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"
-}
-
-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() {
-	local rule=$(iptables -t mangle -S PREROUTING | 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')
-	done
-}
-
-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_rule() {
-	local proto=$1; shift
-	local src_ip=$1; shift
-	local mark="0x$1/0x$1"; shift
-	local ports=$1;
-	local cmd="";
-
-	cmd="-j MARK --set-xmark ${mark}";
-	if [ -n "${ports}" ]; then
-		cmd="--match multiport --dports ${ports} ${cmd}";
-	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} 
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num ip port_list
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	prio_num=$(get_priority ${priority})
-	ip=$(get_ipaddress ${macaddr})
-	port_list=$(echo ${port}|sed 's/ /,/g')
-
-	if [ -n "${ip}" -a -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
-			create_rule tcp ${ip} ${prio_num} ${port_list}
-			create_rule udp ${ip} ${prio_num} ${port_list}
-		else
-			create_rule ${proto} ${ip} ${prio_num} ${port_list}
-		fi
-	fi
-}
-
-reload_service() {
-	clear_existing_rules
-	map_client_entries
-	config_load easy_qos
-	config_foreach manage_rule rule
-	clean_client_entries
-}
-
-start_service() {
-	reload_service
-	echo "Easy QoS installed">/dev/console;
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos"
-}
-
--- a/easy-qos/files/etc/uci-defaults/60-easyqos-reqs
+++ b/easy-qos/files/etc/uci-defaults/60-easyqos-reqs
@@ -1,10 +0,0 @@
-# Add firewall include
-uci -q batch <<-EOT
-        delete firewall.easyqos
-        set firewall.easyqos=include
-        set firewall.easyqos.path=/etc/firewall.easyqos
-        set firewall.easyqos.reload=1
-	uci del_list firewall.easyqos._access_w="root"
-	uci add_list firewall.easyqos._access_w="root"
-        commit firewall
-EOT
--- 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/Config.in
+++ b/easy-soc-libs/Config.in
@@ -15,9 +15,5 @@ config LIBDSL_DEBUG
 	bool "Enable xdsl debugging"
 	default n

-config LIBDSL_TEST
-	depends on PACKAGE_libdsl
-	bool "Libdsl test program"
-	default n
 endmenu
 endif
--- a/easy-soc-libs/Makefile
+++ b/easy-soc-libs/Makefile
@@ -1,29 +1,21 @@
 #
-# 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.0
 PKG_RELEASE:=1

-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0accbd7266b2742ad8921edd5dab974fc384a49a
+PKG_SOURCE_VERSION:=7f884592aa42cc627542589d5b77cf4a50567536
 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,94 +31,67 @@ 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
+endef
+
+define Package/libdsl
+  $(call Package/easy-soc-libs)
+  TITLE:= XDSL library (libdsl)
 endef

 define Package/libethernet
  $(call Package/easy-soc-libs)
  TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+TARGET_iopsys_ramips:swconfig
+  DEPENDS:=+TARGET_iopsys_ramips:swconfig
 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
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
  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
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
  TARGET_PLATFORM=MEDIATEK
  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
 else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
  TARGET_PLATFORM=MARVELL
  TARGET_CFLAGS +=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-  TARGET_PLATFORM=INTEL
-  TARGET_CFLAGS +=-DIOPSYS_INTEL
+else ifeq ($(CONFIG_TARGET_lantiq_xrx500),y)
+  TARGET_PLATFORM=LANTIQ
+  TARGET_CFLAGS +=-DIOPSYS_LANTIQ
 else
-  $(info Unexpected CONFIG_TARGET)
+  $(info (UNEXPECTED CONFIG TARGET))
 endif

-export TARGET_PLATFORM
-
 ifdef CONFIG_IOP_LLA_LIBS_DEBUG
  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
 endif

-define Package/libdsl
-  $(call Package/easy-soc-libs)
-  TITLE:= XDSL library (libdsl)
-  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi +TARGET_intel_mips:kmod-ppa-drv
-endef
-
 subdirs := \
 	$(if $(CONFIG_PACKAGE_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 \
-	-I$(STAGING_DIR)/usr/include/openssl \
 	-I$(STAGING_DIR)/usr/include/libnl3

 MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
+	CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	FPIC="$(FPIC)" \
 	PLATFORM="$(TARGET_PLATFORM)" \
 	subdirs="$(subdirs)"

-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -r --exclude=.* ~/git/easy-soc-libs/ $(PKG_BUILD_DIR)/
-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
@@ -143,25 +108,14 @@ define Build/InstallDev/libethernet
 	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
 endef

-define Build/Compile
-	$(call Build/Compile/Default)
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(MAKE) -C "$(PKG_BUILD_DIR)/libdsl/test" $(MAKE_FLAGS)
-endif
-endef

 define Build/InstallDev
 	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
 endef

-define Package/libeasy/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy.so* $(1)/usr/lib/
-endef
-
 define Package/libwifi/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
 endef

 define Package/libethernet/install
@@ -171,14 +125,9 @@ endef

 define Package/libdsl/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(CP) $(PKG_BUILD_DIR)/libdsl/test/libdsl_test $(1)/usr/bin/
-endif
 endef

 $(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:=a78fe95d5c5a0a320f3b62b9d2faafd07b56e3a7
+

 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
@@ -1,62 +0,0 @@
-# Copyright (c) 2017 Genexis B.V.
-#
-# 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 $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=gryphon-led-kernel-module
-PKG_RELEASE:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/$(PKG_NAME)
-  SUBMENU:=LED modules
-  TITLE:=LED driver for Gryphon
-  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_URL:=
-endef
-
-define KernelPackage/$(PKG_NAME)/description
-  This package contains the LED driver for Gryphon devices.
-endef
-
-EXTRA_KCONFIG:= CONFIG_RGB_LED=m
-
-MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)/kdevlinks/
-	$(CP) -s `pwd`/src/* $(PKG_BUILD_DIR)/kdevlinks/
-	$(CP) src/* $(PKG_BUILD_DIR)
-endef
-
-define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		SUBDIRS="$(PKG_BUILD_DIR)" \
-		EXTRA_CFLAGS="-DKERNEL_MODULE $(BUILDFLAGS) -I$(LINUX_DIR)/include -include generated/autoconf.h $(MODULE_INCLUDE)" \
-		modules
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-endef
-
-$(eval $(call KernelPackage,$(PKG_NAME)))
--- a/gryphon-led-module/src/Makefile
+++ b/gryphon-led-module/src/Makefile
@@ -1,26 +0,0 @@
-# Copyright (c) 2017 Genexis B.V.
-#
-# 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
-
-MODULE_NAME  = gryphon-led-kernel-module
-
-obj-m  := $(MODULE_NAME).o
-
-GENEXIS_FILES= \
-	main.o \
-	sk9822.o \
-	sk9822_bitbang.o
-
-$(MODULE_NAME)-objs := $(GENEXIS_FILES)
--- a/gryphon-led-module/src/main.c
+++ b/gryphon-led-module/src/main.c
@@ -1,253 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * 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
- */
-
-#define DEBUG 1
-
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/printk.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/platform_device.h>
-#include <linux/gpio/consumer.h>
-#include <linux/of.h>
-#include <linux/version.h>
-
-#include "sk9822.h"
-
-#define DRIVER_NAME			"canyon_led"
-#define DRIVER_AUTHOR		"Genexis B.V."
-#define DRIVER_DESC			"Canyon LED driver for SK9822"
-#define DRIVER_VERSION	"1"
-
-/**
- * sysfs interfaces
- */
-
-static ssize_t get_led_color(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	/* [ln] todo: dummy implementation */
-	int len;
-
-	len = sprintf(buf, "%d\n", 123);
-	if (len <= 0) {
-		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
-	}
-
-	return len;
-}
-
-/**
- * @brief Set complete LED strip to a specific color
- * @retval count number of bytes written
- * @retval -EMSGSIZE if the message is too big
- * @retval -EIO for all other errors (e.g. leds cannot be configured)
- */
-static ssize_t set_led_color(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t count)
-{
-	int ret = 0;
-	size_t buflen = count;
-	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
-
-	if (IS_ERR(sk9822)) {
-		printk(KERN_ERR "Platform get drvdata returned NULL\n");
-		return -EIO;
-	}
-
-	/* strip newline */
-	if ((count > 0) && (buf[count-1] == '\n')) {
-		buflen--;
-	}
-
-	if (buflen != 6) { // RRGGBB\0
-		return -EMSGSIZE;
-	}
-
-	// Update the LED array here
-	ret = sk9822_set_color_str(sk9822, buf);
-	if (ret != 0) {
-		printk(KERN_ERR "Failed to set led color\n");
-		return -EIO;
-	}
-
-	// Now push to the HW
-	ret = sk9822_update(sk9822);
-	if (ret != 0) {
-		printk(KERN_ERR "Failed to update led\n");
-		return -EIO;
-	}
-
-	return count;
-}
-static DEVICE_ATTR(led_color, S_IRUGO | S_IWUSR, get_led_color, set_led_color);
-
-static struct attribute *sk9822_dev_attrs[] = {
-	 &dev_attr_led_color.attr,
-	 NULL
-};
-
-static struct attribute_group sk9822_dev_attr_group = {
-	.name = "sk9822",
-	.attrs = sk9822_dev_attrs,
-};
-
-/**
- * device prope and removal
- */
-
-static int canyon_led_probe(struct platform_device *pdev)
-{
-	int ret;
-	struct sk9822_leds *leds;
-
-	leds = devm_kzalloc(&pdev->dev, sizeof(*leds), GFP_KERNEL);
-	if (!leds) {
-		return -ENOMEM;
-	}
-	leds->dev = &pdev->dev;
-	leds->led_brightness = SK9822_DEFAULT_BRIGHTNESS;
-
-	ret = of_property_read_u16(pdev->dev.of_node, "led-count", &leds->led_count);
-	if (ret < 0) {
-		dev_warn(&pdev->dev, "Could not read led-count property\n");
-		leds->led_count = SK9822_DEFAULT_NUM_LEDS;
-	}
-
-	leds->led_colors = devm_kzalloc(&pdev->dev,
-			(sizeof(cRGB) * leds->led_count), GFP_KERNEL);
-	if (!leds->led_colors) {
-		return -ENOMEM;
-	}
-
-
-	platform_set_drvdata(pdev, leds);
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 16, 0)
-	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
-	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0, GPIOD_OUT_HIGH);
-#else
-	dev_warn(&pdev->dev, "Kernel version Not supported\n");
-	exit(1);
-#endif
-
-	gpiod_direction_output(leds->clock_gpio, 1);
-	if (IS_ERR(leds->clock_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
-				PTR_ERR(leds->clock_gpio));
-		leds->clock_gpio = NULL;
-		return PTR_ERR(leds->clock_gpio);
-	} else {
-		printk(KERN_INFO "Got clock gpio\n");
-		gpiod_set_value(leds->clock_gpio, 0);
-	}
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 16, 0)
-	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
-	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1, GPIOD_OUT_HIGH);
-#else
-	dev_warn(&pdev->dev, "Kernel version Not supported\n");
-	exit(1);
-#endif
-
-	gpiod_direction_output(leds->data_gpio, 1);
-	if (IS_ERR(leds->data_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
-				PTR_ERR(leds->data_gpio));
-		leds->data_gpio = NULL;
-		return PTR_ERR(leds->data_gpio);
-	} else {
-		printk(KERN_INFO "Got data gpio\n");
-		gpiod_set_value(leds->data_gpio, 0);
-	}
-
-	printk(KERN_INFO "Attempt to set filefs stuff\n");
-	ret = sysfs_create_group(&pdev->dev.kobj, &sk9822_dev_attr_group);
-	if (ret) {
-		dev_err(&pdev->dev, "sysfs creation failed\n");
-		return ret;
-	}
-
-#if 0
-	printk(KERN_INFO "Flash LEDs to verify they work\n");
-	sk9822_set_color_str(leds, "00FF00");
-	sk9822_update(leds);
-	msleep(200);
-	sk9822_set_color_str(leds, "000000");
-	sk9822_update(leds);
-#endif
-
-	printk(KERN_INFO "canyon led successfully probed\n");
-
-	return 0;
-}
-
-static int canyon_led_remove(struct platform_device *pdev)
-{
-	struct sk9822_leds *leds;
-
-	sysfs_remove_group(&pdev->dev.kobj, &sk9822_dev_attr_group);
-
-	leds = platform_get_drvdata(pdev);
-	if (IS_ERR(leds)) {
-		printk(KERN_ERR "Platform get drvdata returned NULL\n");
-		return -1;
-	}
-
-	if (leds->clock_gpio) {
-		gpiod_put(leds->clock_gpio);
-	}
-
-	if (leds->data_gpio) {
-		gpiod_put(leds->data_gpio);
-	}
-
-	printk(KERN_NOTICE "Bye, bye\n");
-
-	return 0;
-}
-
-/**
- * platform driver metadata
- */
-
-static const struct of_device_id canyon_led_of_ids[] = {
-	{ .compatible = "canyon,led" },
-	{ }
-};
-
-static struct platform_driver canyon_led = {
-	.probe = &canyon_led_probe,
-	.remove = &canyon_led_remove,
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-		.of_match_table = canyon_led_of_ids,
-	},
-};
-
-MODULE_DEVICE_TABLE(of, canyon_led_of_ids);
-module_platform_driver(canyon_led);
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_VERSION(DRIVER_VERSION);
-MODULE_LICENSE("GPL");
--- a/gryphon-led-module/src/sk9822.c
+++ b/gryphon-led-module/src/sk9822.c
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * 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 <linux/kernel.h>
-#include <linux/types.h>
-
-#include "sk9822.h"
-#include "sk9822_bitbang.h"
-
-cRGB __hexs_to_rgb(const char *hex)
-{
-	cRGB rgb;
-	int r, g, b;
-
-	sscanf(hex, "%02x%02x%02x", &r, &g, &b);
-	// This needs sanity checking
-	rgb.r = r;
-	rgb.g = g;
-	rgb.b = b;
-	return rgb;
-}
-
-/**
- * @brief update the color over the given device struct to the provided HEX color
- */
-int sk9822_set_color_str(struct sk9822_leds *sk9822, const char *hex)
-{
-	int i;
-	cRGB color = __hexs_to_rgb(hex);
-
-	for (i = 0; i < sk9822->led_count; i++) {
-		sk9822->led_colors[i] = color;
-	}
-
-	return 0;
-}
-
-/**
- * @brief write device struct to the device
- */
-int sk9822_update(struct sk9822_leds *sk9822)
-{
-	uint16_t i;
-	uint16_t led_count = sk9822->led_count;
-
-	// Start Frame
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-
-	for (i = 0; i < led_count; i++) {
-		cRGB *p = &sk9822->led_colors[i];
-		sk9822_bb_write(sk9822, 0xe0+sk9822->led_brightness);  // Maximum global brightness
-		sk9822_bb_write(sk9822, p->b);
-		sk9822_bb_write(sk9822, p->g);
-		sk9822_bb_write(sk9822, p->r);
-	}
-
-	// End frame
-	sk9822_bb_write(sk9822, 0xff);
-	sk9822_bb_write(sk9822, 0xff);
-	sk9822_bb_write(sk9822, 0xff);
-	sk9822_bb_write(sk9822, 0xff);
-
-	return 0;
-}
--- a/gryphon-led-module/src/sk9822.h
+++ b/gryphon-led-module/src/sk9822.h
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * 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
- */
-
-#ifndef SK9822_H_
-#define SK9822_H_
-
-#include <linux/types.h>
-
-#define SK9822_DEFAULT_NUM_LEDS 32 // U16, used if DT param fails
-#define SK9822_DEFAULT_BRIGHTNESS 15  // 5-bit brightness, 0-31
-
-typedef struct {
-	uint8_t b;
-	uint8_t g;
-	uint8_t r;
-} cRGB;   // BGR (SK9822 Standard)
-
-struct sk9822_leds {
-	struct device *dev;
-	struct gpio_desc *clock_gpio;
-	struct gpio_desc *data_gpio;
-
-	cRGB *led_colors;
-	uint8_t led_brightness;
-	uint16_t led_count;
-};
-
-int sk9822_set_color_str(struct sk9822_leds *sk9822, const char *hex);
-int sk9822_update(struct sk9822_leds *sk9822);
-
-#endif /* SK9822_H_ */
--- a/gryphon-led-module/src/sk9822_bitbang.c
+++ b/gryphon-led-module/src/sk9822_bitbang.c
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * 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 <linux/gpio/consumer.h>
-#include <linux/delay.h>
-#include <linux/types.h>
-
-#include "sk9822.h"
-
-/**
- * @brief Bitbang write operation CLOCK+DATA
- *
- * Assumed state before call: CLOCK- Low, DATA- High
- */
-void sk9822_bb_write(struct sk9822_leds *sk9822, uint8_t c)
-{
-	uint8_t i;
-
-	for (i = 0; i < 8 ; i++) {
-		if (!(c&0x80)) {
-			gpiod_set_value(sk9822->data_gpio, 0); // set data low
-		} else {
-			gpiod_set_value(sk9822->data_gpio, 1); // set data high
-		}
-
-		gpiod_set_value(sk9822->clock_gpio, 1); // set clock high, data sampled here
-		c <<= 1;
-		udelay(1); // stretch clock
-		gpiod_set_value(sk9822->clock_gpio, 0); // set clock low
-	}
-
-	// State after call: SCK Low, Data high
-}
--- a/gryphon-led-module/src/sk9822_bitbang.h
+++ b/gryphon-led-module/src/sk9822_bitbang.h
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * 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
- */
-
-#ifndef _SK9822_BB_H_
-#define _SK9822_BB_H_
-
-#include <linux/types.h>
-
-#include "sk9822.h"
-
-void sk9822_bb_write(struct sk9822_leds *sk9822, uint8_t c);
-
-#endif /* _SK9822_BB_H_ */
--- 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,72 @@
+#!/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 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-01-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:=88edf3d3c6d6d115425f312e36cbb731cd8fe863
 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,32 @@ 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
-endef
-
-define Package/icwmp_twamp
-  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 xmpp feature
+	DEPENDS:=+libuci +libubox +libexpat +libstrophe
 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 +80,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 +91,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 +117,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 +158,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 +185,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
@@ -208,35 +201,18 @@ define Package/icwmp_xmpp/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_xmppd $(1)/etc/init.d/icwmp_xmppd
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_xmpp $(1)/etc/config
-	$(CP) ./xmpp-files/* $(1)/
 endef

-define Package/icwmp_udpechoserver/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_udpechoserverd $(1)/usr/sbin/icwmp_udpechoserverd
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_udpechoserverd $(1)/etc/init.d/icwmp_udpechoserverd
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_udpechoserver $(1)/etc/config
+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_twamp/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_twampd $(1)/usr/sbin/icwmp_twampd
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_twampd $(1)/etc/init.d/icwmp_twampd
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_twamp $(1)/etc/config
-endef
-
-define Package/icwmp_bulkdata/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_bulkdatad $(1)/usr/sbin/icwmp_bulkdatad
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_bulkdatad $(1)/etc/init.d/icwmp_bulkdatad
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_bulkdata $(1)/etc/config
-endef

 define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
@@ -257,11 +233,9 @@ 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/icwmp/xmpp-files/etc/hotplug.d/iface/91-icwmp_xmpp
+++ b/icwmp/xmpp-files/etc/hotplug.d/iface/91-icwmp_xmpp
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-[ -f /etc/config/cwmp_xmpp ] || exit 0
-
-[ "$ACTION" == "ifup" ] || exit 0
-[ "$INTERFACE" == "loopback" ] && exit 0
-
-local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
-[ -n "$defwan" -a "$(uci -q get network.$defwan)" == "interface" -a "$defwan" != "$INTERFACE" ] && exit 0
-
-local islan="$(uci -q get network.$INTERFACE.is_lan)"
-[ "$islan" == "1" ] && exit 0
-
-local proto="$(uci -q get network.$INTERFACE.proto)"
-[ "$proto" == "none" ] && exit 0
-
-local ifname="$(uci -q get network.$INTERFACE.ifname)"
-[ "${ifname:0:1}" == "@" ] && exit 0
-
-/etc/init.d/icwmp_xmppd reload &
-
--- 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
@@ -1,14 +1,14 @@
 #
-# Copyright (C) 2018 iopsys Software Solutions AB
+# Copyright (C) 2013 Inteno
 #

 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:=a0572079265293ed99dc4d69fd38528760d29be9
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ifbt.git

@@ -16,27 +16,8 @@ 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)
-TARGET_PLATFORM:=-DIOPSYS_BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-TARGET_PLATFORM:=-DIOPSYS_BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-TARGET_PLATFORM:=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-TARGET_PLATFORM:=-DIOPSYS_INTEL
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-TARGET_PLATFORM:=-DIOPSYS_MEDIATEK
-else
-$(info (UNEXPECTED CONFIG TARGET))
-endif
-
-export TARGET_PLATFORM
-
 define Package/ifbt
 	CATEGORY:=Utilities
 	DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c  +libwifi +libjson-c
--- 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
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 iopsys
+# Copyright (C) 2018 Inteno
 #

 include $(TOPDIR)/rules.mk
@@ -15,18 +15,16 @@ PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
 PKG_SOURCE_VERSION:=532f4900862bcb45d8cd4bf37555fabda81750b6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
+PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1

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

 define Package/imonitor
 	CATEGORY:=Utilities
-	TITLE:=iopsysWrt process supervisor
+	TITLE:=Inteno process supervisor
 	DEPENDS:=+ubox +uci +ubus +rpcd +rpcd-mod-file
 endef

--- a/inbd/Makefile
+++ b/inbd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 iopsys
+# Copyright (C) 2016 Inteno
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -12,7 +12,7 @@ PKG_NAME:=inbd
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1

-PKG_SOURCE_VERSION:=53ca7f58edb87976b5897ccaf487bb0cbbf39d07
+PKG_SOURCE_VERSION:=b846ae0ff55284392de2c4d874851b33edd7a6c5
 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

@@ -37,7 +34,7 @@ include $(INCLUDE_DIR)/package.mk

 define Package/inbd
 	CATEGORY:=Utilities
-	TITLE:=iopsys Netlink Bridge Daemon
+	TITLE:=Inteno Netlink Bridge Daemon
 	URL:=
 	DEPENDS:=+libuci +libubus +libblobmsg-json +libnl-genl
 endef
--- 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

@@ -21,7 +20,7 @@ define Package/iop
 endef

 define Package/iop/description
-	This package contains iopsysWrt SDK utilities
+	This package contains Intenos Iop utilities
 endef

 define Build/Compile
--- a/iop/configs/config
+++ b/iop/configs/config
@@ -3,9 +3,11 @@ CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
 CONFIG_DEVEL=y
+# CONFIG_LOCALMIRROR is not set
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
+CONFIG_PACKAGE_6tunnel=y
 CONFIG_PACKAGE_alsa-lib=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
@@ -14,38 +16,58 @@ 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_gdbserver=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
+CONFIG_PACKAGE_ice-client=y
+CONFIG_PACKAGE_ice-client-camerawatch=m
+CONFIG_PACKAGE_ice-client-fileme=m
+CONFIG_PACKAGE_ice-client-gigaset=m
+CONFIG_PACKAGE_ice-client-guest=m
+CONFIG_PACKAGE_ice-client-iperf=m
+CONFIG_PACKAGE_ice-client-logreader=m
+CONFIG_PACKAGE_ice-client-monitor=m
+CONFIG_PACKAGE_ice-client-netrounds=m
+CONFIG_PACKAGE_ice-client-rshell=m
+CONFIG_PACKAGE_ice-client-texec=m
 CONFIG_PACKAGE_icwmp-curl=y
 CONFIG_PACKAGE_ifbt=y
 CONFIG_PACKAGE_imonitor=y
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_iopupgrade=y
-CONFIG_PACKAGE_ip-full=y
-CONFIG_PACKAGE_iperf3=y
+CONFIG_PACKAGE_netmode=y
+CONFIG_PACKAGE_iperf-mt=y
 CONFIG_PACKAGE_ipset=y
 CONFIG_PACKAGE_iptables=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
+CONFIG_PACKAGE_iup=y
 # CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_juci=y
-CONFIG_PACKAGE_juci-config-backup=y
+CONFIG_PACKAGE_juci-broadcom-iptv=y
+CONFIG_PACKAGE_juci-broadcom-pwrmgmt=y
+CONFIG_PACKAGE_juci-wifilife=y
+CONFIG_PACKAGE_juci-wireless=y
 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-ice-client=y
 CONFIG_PACKAGE_juci-icwmp=y
 CONFIG_PACKAGE_juci-igmpinfo=y
+CONFIG_PACKAGE_juci-config-backup=y
+CONFIG_PACKAGE_juci-mwan3=y
+CONFIG_PACKAGE_juci-iup=y
+# CONFIG_PACKAGE_juci-qos is not set
+CONFIG_PACKAGE_juci-voice-client=y
+CONFIG_PACKAGE_juci-macdb=y
 CONFIG_PACKAGE_juci-minidlna=y
 CONFIG_PACKAGE_juci-mod-status=y
 CONFIG_PACKAGE_juci-mod-system=y
-CONFIG_PACKAGE_juci-mwan3=y
+CONFIG_PACKAGE_juci-natalie-dect=y
 CONFIG_PACKAGE_juci-netmode=y
 CONFIG_PACKAGE_juci-network-device=y
 CONFIG_PACKAGE_juci-network-dsl=y
@@ -53,20 +75,24 @@ CONFIG_PACKAGE_juci-network-netifd=y
 CONFIG_PACKAGE_juci-network-port=y
 CONFIG_PACKAGE_juci-openvpn=y
 CONFIG_PACKAGE_juci-owsd=y
+CONFIG_PACKAGE_juci-printer=y
 CONFIG_PACKAGE_juci-realtime-graphs=y
 CONFIG_PACKAGE_juci-samba=y
+CONFIG_PACKAGE_juci-simple-gui=y
 CONFIG_PACKAGE_juci-snmpd=y
 CONFIG_PACKAGE_juci-sysupgrade=y
+CONFIG_PACKAGE_juci-theme-iopsys=y
+CONFIG_PACKAGE_juci-ubus-core=y
 CONFIG_PACKAGE_juci-upnp=y
 CONFIG_PACKAGE_juci-usb=y
-CONFIG_PACKAGE_juci-voice-client=y
-CONFIG_PACKAGE_juci-wifilife=y
-CONFIG_PACKAGE_juci-wireless=y
-CONFIG_PACKAGE_juci-theme-iopsys=y
+CONFIG_PACKAGE_juci-utils=y
+# CONFIG_PACKAGE_kmod-ipt-nathelper is not set
+CONFIG_PACKAGE_kmod-nls-base=y
 CONFIG_PACKAGE_kmod-siit=y
 CONFIG_PACKAGE_libcgroup-daemon=y
 CONFIG_PACKAGE_libcgroup=y
 # CONFIG_PACKAGE_libcgroup-utils is not set
+CONFIG_PACKAGE_ldd=y
 CONFIG_PACKAGE_libdaemon=y
 CONFIG_PACKAGE_libffmpeg-mini=y
 CONFIG_PACKAGE_libgmp=y
@@ -74,19 +100,23 @@ CONFIG_PACKAGE_libreadline=y
 CONFIG_PACKAGE_loop-detector=m
 CONFIG_PACKAGE_minidlna=y
 CONFIG_PACKAGE_miniupnpd=y
+CONFIG_PACKAGE_mtd-utils=y
+CONFIG_PACKAGE_mtd-utils-deubinize=y
+CONFIG_PACKAGE_mtd-utils-imagewrite=y
+CONFIG_PACKAGE_mtd-utils-mkfs.jffs2=y
+CONFIG_PACKAGE_mtd-utils-nanddump=y
 CONFIG_PACKAGE_mwan3=y
 CONFIG_PACKAGE_nand-utils=y
 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
 CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
+# CONFIG_PACKAGE_p910nd is not set
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_power-management=y
@@ -117,18 +147,15 @@ 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
-CONFIG_TARGET_CUSTOMER="IOPSYS"
+CONFIG_TARGET_CUSTOMER="INT"
 CONFIG_TARGET_ROOTFS_TARGZ=y
 # CONFIG_USE_SSTRIP is not set
 CONFIG_USE_STRIP=y
@@ -160,6 +187,7 @@ CONFIG_BUSYBOX_CONFIG_MICROCOM=y
 # CONFIG_BUSYBOX_CONFIG_RMMOD is not set
 CONFIG_BUSYBOX_CONFIG_STTY=y
 CONFIG_BUSYBOX_CONFIG_TFTP=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_2_4_MODULES is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -173,9 +201,11 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
 # CONFIG_BUSYBOX_CONFIG_FEATURE_NOLOGIN is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_SECURETTY=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY is not set
 # CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
@@ -185,6 +215,7 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
 # CONFIG_BUSYBOX_CONFIG_PAM is not set
 # CONFIG_BUSYBOX_CONFIG_TFTP_DEBUG is not set
 # CONFIG_BUSYBOX_CONFIG_NTPD is not set
+# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
 CONFIG_LIBCURL_CRYPTO_AUTH=y
 # CONFIG_LIBCURL_MBEDTLS is not set
 CONFIG_LIBCURL_OPENSSL=y
@@ -193,6 +224,7 @@ CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_SIGNED_PACKAGES is not set
 CONFIG_KERNEL_DEVTMPFS=y
 CONFIG_KERNEL_DEVTMPFS_MOUNT=y
+CONFIG_PACKAGE_ip-full=y
 # CONFIG_BUSYBOX_CONFIG_IP is not set
-CONFIG_LOCALMIRROR="http://download.iopsys.eu/iopsys/mirror/"
+CONFIG_PACKAGE_iopupgrade=y

--- a/iop/configs/luci.diff
+++ b/iop/configs/luci.diff
@@ -0,0 +1,38 @@
+CONFIG_PACKAGE_luci=y
+CONFIG_PACKAGE_luci-mod-admin-core=y
+CONFIG_PACKAGE_luci-mod-admin-full=y
+CONFIG_PACKAGE_luci-app-ddns=y
+CONFIG_PACKAGE_luci-app-dslstats=y
+CONFIG_PACKAGE_luci-app-firewall=y
+CONFIG_PACKAGE_luci-app-iup=y
+CONFIG_PACKAGE_luci-app-mcpd=y
+CONFIG_PACKAGE_luci-app-minidlna=y
+CONFIG_PACKAGE_luci-app-multiwan=y
+CONFIG_PACKAGE_luci-app-p910nd=y
+CONFIG_PACKAGE_luci-app-parental-control=y
+CONFIG_PACKAGE_luci-app-port-management=y
+CONFIG_PACKAGE_luci-app-power-mgmt=y
+CONFIG_PACKAGE_luci-app-samba=y
+CONFIG_PACKAGE_luci-app-sfp=y
+CONFIG_PACKAGE_luci-app-snmp=y
+CONFIG_PACKAGE_luci-app-speedtest=y
+CONFIG_PACKAGE_luci-app-upnp=y
+CONFIG_PACKAGE_luci-app-voice=y
+CONFIG_PACKAGE_luci-theme-base=y
+CONFIG_PACKAGE_luci-theme-bootstrap=y
+CONFIG_PACKAGE_luci-i18n-english=y
+CONFIG_PACKAGE_luci-proto-3g=y
+CONFIG_PACKAGE_luci-proto-4g=y
+CONFIG_PACKAGE_luci-proto-core=y
+CONFIG_PACKAGE_luci-proto-ipv6=y
+CONFIG_PACKAGE_luci-proto-ppp=y
+CONFIG_PACKAGE_luci-sgi-cgi=y
+CONFIG_PACKAGE_luci-lib-core=y
+CONFIG_PACKAGE_luci-lib-core_source=y
+CONFIG_PACKAGE_luci-lib-ipkg=y
+CONFIG_PACKAGE_luci-lib-json=y
+CONFIG_PACKAGE_luci-lib-nixio=y
+CONFIG_PACKAGE_luci-lib-nixio_notls=y
+CONFIG_PACKAGE_luci-lib-sys=y
+CONFIG_PACKAGE_luci-lib-web=y
+
--- a/iop/configs/target/intel_mips/config
+++ b/iop/configs/target/intel_mips/config
@@ -0,0 +1,97 @@
+# CONFIG_BUSYBOX_CONFIG_BRCTL is not set
+CONFIG_GCC_VERSION="6.3.0"
+CONFIG_TOOLCHAINOPTS=y
+# CONFIG_BINUTILS_USE_VERSION_2_27 is not set
+CONFIG_BINUTILS_USE_VERSION_2_28=y
+# CONFIG_BINUTILS_USE_VERSION_2_29_1 is not set
+# CONFIG_GCC_USE_GRAPHITE is not set
+# CONFIG_GCC_USE_VERSION_5 is not set
+CONFIG_GCC_USE_VERSION_6=y
+# CONFIG_GCC_USE_VERSION_7 is not set
+# CONFIG_LIBC_USE_GLIBC is not set
+CONFIG_LIBC_USE_MUSL=y
+
+
+# CONFIG_PACKAGE_ppp-mod-pppoa is not set
+
+#################### switch related
+CONFIG_PACKAGE_switch_cli_ugw8=y
+
+#################### ppa related
+#CONFIG_PACKAGE_ppacmd=y
+# CONFIG_PACKAGE_kmod-ppa-drv-gre is not set
+# CONFIG_PACKAGE_kmod-ppa-drv-grx500-eth-bond is not set
+# CONFIG_PACKAGE_kmod-ppa-drv-grx500-mpe is not set
+# CONFIG_PACKAGE_kmod-ppa-drv-mpe-ip97 is not set
+CONFIG_PACKAGE_mcast-pa=y
+
+#################### DSL related
+CONFIG_PACKAGE_dsl-cpe-control-vrx=y
+CONFIG_dsl-cpe-mei-vrx_DEVICE_VR11=y
+CONFIG_dsl-cpe-mei-vrx_IRQ_POLLING_ACTIVE=y
+CONFIG_PACKAGE_kmod-dsl-cpe-mei-vrx=y
+CONFIG_PACKAGE_ifxos=y
+CONFIG_PACKAGE_kmod-directconnect-dp=y
+CONFIG_PACKAGE_kmod-vrx518_tc_drv=y
+CONFIG_PACKAGE_vrx518_aca_fw=y
+CONFIG_PACKAGE_vrx518_ppe_fw=y
+CONFIG_dsl-cpe-api-vrx_MODEL_DEBUG=y
+CONFIG_dsl-cpe-control-vrx_DTI=y
+CONFIG_dsl-cpe-control-vrx_MODEL_DEBUG=y
+# yes intel dsl script need this.
+CONFIG_BUSYBOX_CONFIG_USLEEP=y
+#################### DSL related end
+
+#################### WIFI related
+CONFIG_PACKAGE_kmod-lantiq-wlan-wave-support_5_x=y
+CONFIG_PACKAGE_ltq-wlan-wave_5_x=y
+CONFIG_FEATURE_LTQ_WAVE_500_PCIE=y
+# CONFIG_FEATURE_LTQ_WAVE_500 is not set
+CONFIG_FEATURE_LTQ_WAVE_AR10_SUPPORT=y
+# CONFIG_FEATURE_LTQ_WAVE_STA is not set
+# CONFIG_FEATURE_LTQ_WAVE_DEBUG_TFTP_BINS is not set
+# CONFIG_FEATURE_LTQ_WAVE_FGPA_DUMMY_PHY is not set
+CONFIG_FEATURE_LTQ_WAVE_500B=y
+# WifiLife not yet available for Intel
+CONFIG_PACKAGE_juci-wifilife=n
+CONFIG_PACKAGE_wifilife=n
+####################
+
+#################### VoIP related
+CONFIG_PACKAGE_ltq-voice-tapi=y
+CONFIG_PACKAGE_ltq-voice-vmmc-xrx500=y
+CONFIG_PACKAGE_asterisk13=y
+CONFIG_PACKAGE_asterisk13-app-confbridge=y
+CONFIG_PACKAGE_asterisk13-app-playtones=y
+CONFIG_PACKAGE_asterisk13-app-read=y
+CONFIG_PACKAGE_asterisk13-app-record=y
+CONFIG_PACKAGE_asterisk13-app-system=y
+CONFIG_PACKAGE_asterisk13-bridge-builtin-features=y
+CONFIG_PACKAGE_asterisk13-bridge-simple=y
+CONFIG_PACKAGE_asterisk13-bridge-softmix=y
+CONFIG_PACKAGE_asterisk13-cdr=y
+CONFIG_PACKAGE_asterisk13-cdr-csv=y
+CONFIG_PACKAGE_asterisk13-chan-lantiq=y
+CONFIG_PACKAGE_asterisk13-chan-sip=y
+CONFIG_PACKAGE_asterisk13-format-g726=y
+CONFIG_PACKAGE_asterisk13-format-g729=y
+CONFIG_PACKAGE_asterisk13-format-gsm=y
+CONFIG_PACKAGE_asterisk13-format-sln=y
+CONFIG_PACKAGE_asterisk13-func-channel=y
+CONFIG_PACKAGE_asterisk13-func-db=y
+CONFIG_PACKAGE_asterisk13-func-shell=y
+CONFIG_PACKAGE_asterisk13-pbx-spool=y
+CONFIG_PACKAGE_asterisk13-res-musiconhold=y
+CONFIG_PACKAGE_asterisk13-res-rtp-asterisk=y
+CONFIG_PACKAGE_asterisk13-sounds=y
+CONFIG_PACKAGE_voice-client=y
+#################### VoIP related end
+
+# the options below this point is wrong but packages wont compile
+
+# CONFIG_PACKAGE_libcgroup is not set
+# CONFIG_PACKAGE_libcgroup-daemon is not set
+
+# CONFIG_TARGET_ROOTFS_INITRAMFS is not set
+# CONFIG_TARGET_ROOTFS_SQUASHFS is not set
+
--- a/iop/configs/target/intel_mips/easy550/config
+++ b/iop/configs/target/intel_mips/easy550/config
@@ -0,0 +1,2 @@
+CONFIG_LTQ_VOICE_VMMC_WITH_SLIC100=n
+CONFIG_LTQ_VOICE_VMMC_WITH_SLIC200=y
--- a/iop/configs/target/intel_mips/speedport_smart3/config
+++ b/iop/configs/target/intel_mips/speedport_smart3/config
@@ -0,0 +1,3 @@
+# temporary solution for kernel
+CONFIG_KERNEL_GIT_BRANCH="speedport_smart3"
+CONFIG_KERNEL_GIT_COMMIT="fef58dd6628c4b8b9c921fae473874fcda6361bf"
--- a/iop/configs/target/iopsys_brcm63xx_arm/config
+++ b/iop/configs/target/iopsys_brcm63xx_arm/config
@@ -0,0 +1,15 @@
+# CONFIG_PACKAGE_libcgroup-daemon is not set
+# CONFIG_PACKAGE_libcgroup is not set
+
+# CONFIG_PACKAGE_juci-broadcom-wl is not set
+# CONFIG_PACKAGE_juci-minisnmpd is not set
+# CONFIG_PACKAGE_juci-router-openwrt is not set
+# CONFIG_PACKAGE_speedsvc is not set
+
+# CONFIG_juci_broadcom_wl is not set
+# CONFIG_juci_minisnmpd is not set
+# CONFIG_juci_router_openwrt is not set
+
+# CONFIG_PACKAGE_brcminfo is not set
+CONFIG_PACKAGE_brcm_fw_tool=y
+
--- a/iop/configs/target/iopsys_brcm63xx_arm/dg400/config
+++ b/iop/configs/target/iopsys_brcm63xx_arm/dg400/config
@@ -0,0 +1,4 @@
+
+# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_TARGET_NO_DECT=y
+
--- a/iop/configs/target/iopsys_brcm63xx_arm/dg400prime/config
+++ b/iop/configs/target/iopsys_brcm63xx_arm/dg400prime/config
@@ -0,0 +1,4 @@
+
+# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_TARGET_NO_DECT=y
+
--- a/iop/configs/target/iopsys_brcm63xx_arm/eg400/config
+++ b/iop/configs/target/iopsys_brcm63xx_arm/eg400/config
@@ -0,0 +1,7 @@
+CONFIG_BCM_I2C=y
+
+# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_TARGET_NO_DECT=y
+
+CONFIG_TARGET_NO_DSL=y
+
--- a/iop/configs/target/iopsys_brcm63xx_arm/f104/config
+++ b/iop/configs/target/iopsys_brcm63xx_arm/f104/config
@@ -0,0 +1,6 @@
+
+# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_TARGET_NO_DECT=y
+
+CONFIG_USE_DSL=y
+CONFIG_TARGET_DSL_GFAST=y
--- a/iop/configs/target/iopsys_brcm63xx_arm/f104w/config
+++ b/iop/configs/target/iopsys_brcm63xx_arm/f104w/config
@@ -0,0 +1,6 @@
+
+# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_TARGET_NO_DECT=y
+
+CONFIG_USE_DSL=y
+CONFIG_TARGET_DSL_GFAST=y
--- a/iop/configs/target/iopsys_brcm63xx_arm/sdx810_rg/config
+++ b/iop/configs/target/iopsys_brcm63xx_arm/sdx810_rg/config
@@ -0,0 +1,5 @@
+
+# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_TARGET_NO_DECT=y
+
+CONFIG_TARGET_NO_DSL=y
--- a/iop/configs/target/iopsys_brcm63xx_mips/cg300/config
+++ b/iop/configs/target/iopsys_brcm63xx_mips/cg300/config
@@ -0,0 +1,3 @@
+CONFIG_TARGET_NO_DSL=y
+CONFIG_BCM_I2C=y
+
--- a/iop/configs/target/iopsys_brcm63xx_mips/config
+++ b/iop/configs/target/iopsys_brcm63xx_mips/config
@@ -0,0 +1,15 @@
+# CONFIG_PACKAGE_libcgroup-daemon is not set
+# CONFIG_PACKAGE_libcgroup is not set
+
+# CONFIG_PACKAGE_juci-broadcom-wl is not set
+# CONFIG_PACKAGE_juci-minisnmpd is not set
+# CONFIG_PACKAGE_juci-router-openwrt is not set
+# CONFIG_PACKAGE_speedsvc is not set
+
+# CONFIG_juci_broadcom_wl is not set
+# CONFIG_juci_minisnmpd is not set
+# CONFIG_juci_router_openwrt is not set
+
+# CONFIG_PACKAGE_brcminfo is not set
+CONFIG_PACKAGE_brcm_fw_tool=y
+
--- a/iop/configs/target/iopsys_brcm63xx_mips/dg200/config
+++ b/iop/configs/target/iopsys_brcm63xx_mips/dg200/config
@@ -0,0 +1,3 @@
+CONFIG_BCM_I2C=y
+CONFIG_TARGET_NO_DECT=y
+
--- a/iop/configs/target/iopsys_brcm63xx_mips/dg200al/config
+++ b/iop/configs/target/iopsys_brcm63xx_mips/dg200al/config
@@ -0,0 +1,3 @@
+CONFIG_TARGET_NO_VOICE=y
+CONFIG_BCM_I2C=y
+
--- a/iop/configs/target/iopsys_brcm63xx_mips/dg301/config
+++ b/iop/configs/target/iopsys_brcm63xx_mips/dg301/config
@@ -0,0 +1,2 @@
+CONFIG_BCM_I2C=y
+
--- a/iop/configs/target/iopsys_brcm63xx_mips/dg301al/config
+++ b/iop/configs/target/iopsys_brcm63xx_mips/dg301al/config
@@ -0,0 +1,3 @@
+CONFIG_TARGET_NO_VOICE=y
+CONFIG_BCM_I2C=y
+
--- a/iop/configs/target/iopsys_brcm63xx_mips/eg200/config
+++ b/iop/configs/target/iopsys_brcm63xx_mips/eg200/config
@@ -0,0 +1,5 @@
+CONFIG_BCM_I2C=y
+CONFIG_TARGET_NO_DECT=y
+CONFIG_TARGET_NO_DSL=y
+CONFIG_BCM_ENDPOINT_MODULE=y
+
--- a/iop/configs/target/iopsys_brcm63xx_mips/eg300/config
+++ b/iop/configs/target/iopsys_brcm63xx_mips/eg300/config
@@ -0,0 +1,3 @@
+CONFIG_TARGET_NO_DSL=y
+CONFIG_BCM_I2C=y
+
--- a/iop/configs/target/iopsys_brcm63xx_mips/vg50/config
+++ b/iop/configs/target/iopsys_brcm63xx_mips/vg50/config
@@ -0,0 +1,4 @@
+CONFIG_TARGET_NO_DHD=y
+CONFIG_TARGET_NO_VOICE=y
+CONFIG_BCM_I2C=y
+
--- a/iop/configs/target/iopsys_ramips/config
+++ b/iop/configs/target/iopsys_ramips/config
@@ -0,0 +1,14 @@
+# CONFIG_PACKAGE_libcgroup-daemon is not set
+# CONFIG_PACKAGE_libcgroup is not set
+# CONFIG_PACKAGE_power-management is not set
+# CONFIG_PACKAGE_qos-scripts is not set
+# CONFIG_PACKAGE_mtd-utils-deubinize is not set
+# CONFIG_PACKAGE_mtd-utils-imagewrite is not set
+# CONFIG_PACKAGE_mtd-utils-mkfs.jffs2 is not set
+# CONFIG_PACKAGE_mtd-utils-nanddump is not set
+CONFIG_PACKAGE_mtd-utils-nandwrite=y
+CONFIG_PACKAGE_mtk-bndstrg=y
+CONFIG_PACKAGE_igmpproxy=y
+CONFIG_PACKAGE_kmod-nf-nathelper=y
+CONFIG_PACKAGE_kmod-nf-nathelper-extra=y
+# CONFIG_PACKAGE_endptmngr is not set
--- a/iop/scripts/feeds_update.sh
+++ b/iop/scripts/feeds_update.sh
@@ -32,15 +32,13 @@ function feeds_update {
    fi

    # targets need to be installed explicitly
-    targets="iopsys-brcm63xx-mips iopsys-brcm63xx-arm iopsys-ramips intel_mips"
-    for target in $targets
-    do
-	rm -f target/linux/$target
-	./scripts/feeds install -p targets $target
-    done
+    ./scripts/feeds install -p targets iopsys-brcm63xx-mips
+    ./scripts/feeds install -p targets iopsys-brcm63xx-arm
+    ./scripts/feeds install -p targets iopsys-ramips
+    ./scripts/feeds install -p intel_targets intel_mips

    # install all packages
-    ./scripts/feeds install -a
+    ./scripts/feeds install -a 

    # remove broken symlinks ( for packages that are no longer in the feed )
    find -L package/feeds -maxdepth 2 -type l -delete
@@ -49,7 +47,7 @@ function feeds_update {
    make defconfig

    # record when we last run this script
-    touch tmp/.iop_bootstrap
+    touch tmp/.iop_bootstrap 

    # always return true
    exit 0
--- a/iop/scripts/genconfig.sh
+++ b/iop/scripts/genconfig.sh
@@ -7,104 +7,45 @@ function genconfig {
 	export FILEDIR="files/"
 	export THEMEDIR="themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
-	export CONFIGPATH="package/feeds/iopsys/iop"
+	export CONFIGPATH="package/feeds/iopsys/iop/configs"
 	CUSTPATH="customerconfigs"
 	export CUSTCONF="customerconfigs/customers"
 	export VERBOSE=0
 	export DEVELOPER=0
+	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
+
 	target="bogus"
-	config_path=""
-	brcm63xx_mips="target/linux/iopsys-brcm63xx-mips"
-	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
-	ramips="target/linux/iopsys-ramips"
-	intel_mips="target/linux/intel_mips"
-
-	Red='\033[0;31m'          # Red
-	Color_Off='\033[0m'       # Text Reset
-	Yellow='\033[0;33m'       # Yellow
-
-	function find_last {
-	    egrep "^[ #]*${1}[ =]" $2 | tail -n1
-	}
-
-	function is_new {
-	    for opt in $conf_warned
-	    do
-		if [ "$opt" == "$1" ]
-		then
-		    return 1
-		fi
-	    done
-	    # option not found return true
-	    return 0
-	}
-
-	function verify_config {
-	    IFS=$'\n'
-	    org=$(<.genconfig.config)
-	    unset IFS
-	    local num
-	    local conf_opt
-	    local conf_org
-	    local conf_new
-
-	    #echo "lines to check $tot_lines"
-	    num=0
-	    for line in $org
-	    do
-		conf_opt=$(echo $line | grep CONFIG_ | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
-		if [ -n "${conf_opt}" ]
-		then
-		    conf_org=$(find_last ${conf_opt} .genconfig.config)
-		    conf_new=$(find_last ${conf_opt} .config)
-		    if [ "$conf_org" != "$conf_new" ]
-		    then
-			if is_new $conf_opt
-			then
-			    echo -e "config option [${Red}$conf_opt${Color_Off}] is not set correctly in .config"
-			    echo -e "got value [${Yellow}$conf_new${Color_Off}] but wanted [${Yellow}$conf_org${Color_Off}]"
-			    echo "This is a real problem somebody needs to investigate"
-			    echo ""
-			    conf_warned="$conf_warned $conf_opt"
-			fi
-		    else
-			true
-			# for debug to see all options
-			#echo -e "wanted [$conf_org] got [$conf_new]"
-		    fi
-		fi
-		num=$((num+1))
-	    done
-	}
+	masterconfig=1

 	# Takes a board name and returns the target name in global var $target
 	set_target() {
 	    local profile=$1

+	    local iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02 eg200"
+	    local iopsys_brcm63xx_arm="dg400 eg400 sdx810_rg f104w f104 dg400prime dg400primeb 963138REF_P502"
+	    local iopsys_ramips="ex400 sdx810_ap"
+	    local intel_mips="easy550 easy350 norrland speedport_smart3"
+	    local ramips="mt7621"

-		[ -e $brcm63xx_mips/genconfig ] &&
-			iopsys_brcm63xx_mips=$(cd $brcm63xx_mips; ./genconfig)
-		[ -e $brcm63xx_arm/genconfig ] &&
-			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
-		[ -e $ramips/genconfig ] &&
-			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $intel_mips/genconfig ] &&
-			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
-
-	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips; do
-				echo "$list based boards:"
-				for b in ${!list}; do
-					echo -e "\t$b"
-				done
-			done
-			return
+	    if [ "$profile" == "LIST" ]
+	    then
+		for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips intel_mips
+		do
+		    echo "$list based boards:"
+		    for b in ${!list}
+		    do
+			echo -e "\t$b"
+		    done
+		done
+		return
 	    fi
+	    
+	    
+	    local targets

 	    for p in $iopsys_brcm63xx_mips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_mips"
-			config_path="$brcm63xx_mips/config"
 		    return
 		fi
 	    done
@@ -112,7 +53,6 @@ function genconfig {
 	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_arm"
-			config_path="$brcm63xx_arm/config"
 		    return
 		fi
 	    done
@@ -120,15 +60,21 @@ function genconfig {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			config_path="$ramips/config"
 		    return
 		fi
 	    done

-	    for p in $iopsys_intel_mips; do
+	    for p in $ramips; do
+		if [ $p == $profile ]; then
+		    target="ramips"
+		    masterconfig=0
+		    return
+		fi
+	    done
+
+	    for p in $intel_mips; do
 		if [ $p == $profile ]; then
 		    target="intel_mips"
-			config_path="$intel_mips/config"
 		    return
 		fi
 	    done
@@ -139,16 +85,23 @@ function genconfig {
 		DEVELOPER=1

 		bcmAllowed=0
+		iceAllowed=0
 		endptAllowed=0
 		natalieAllowed=0
 		mediatekAllowed=0
 		wifilifeAllowed=0

-		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
-		git ls-remote git@dev.iopsys.eu:mediatek/linux.git -q 2>/dev/null && mediatekAllowed=1
-		git ls-remote git@dev.iopsys.eu:dialog/natalie-dect-12.26.git -q 2>/dev/null && natalieAllowed=1
-		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
-		git ls-remote git@dev.iopsys.eu:iopsys/wifilife.git -q 2>/dev/null && wifilifeAllowed=1
+		allowedRepos="$(ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null | grep -w 'R\|W' | awk '{print$NF}')"
+		for repo in $allowedRepos; do
+			case $repo in
+			bcmkernel) bcmAllowed=1 ;;
+			ice-client) iceAllowed=1 ;;
+			endptcfg) endptAllowed=1 ;;
+			natalie-dect*) natalieAllowed=1 ;;
+			linux) mediatekAllowed=1 ;;
+			wifilife) wifilifeAllowed=1 ;;
+			esac
+		done
 	}

 	v() {
@@ -159,18 +112,18 @@ function genconfig {
 		echo
 		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
 		echo
-		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -v|--verbose\t\tVerbose"
+		echo -e "  -c|--clean\tRemove all files under ./files and import from config "
+		echo -e "  -v|--verbose\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
-		echo -e "  -s|--override\t\tEnable 'Package source tree override'"
-		echo -e "  -S|--brcmsingle\tForce build of bcmkernel to use only one thread"
-		echo -e "  -h|--help\t\tShow this message"
+		echo -e "  -p|--profile\tSet profile (if exists) default juci"
+		echo -e "  -s|--override\tEnable 'Package source tree override'"
+		echo -e "  -h|--help\tShow this message"
 		echo -e "  -l|--list [customer]\tList all Customers or all boards for one customer"
-		echo -e "  -a|--list-all\t\tList all Customers and their board types"
-		echo -e "  -b|--boards\t\tList all board types"
+		echo -e "  -a|--list-all\tList all Customers and their board types"
+		echo -e "  -b|--boards\tList all board types"		
 		echo
-		echo "Example ./iop genconfig dg200 TELIA"
-		echo "(if no customerconfig is chosen, iopsys config will be used)"
+		echo "Example ./iop genconfig vg50 TELIA"
+		echo "(if no customerconfig is chosen the Inteno Config will be used)"
 		echo
 		exit 0
 	}
@@ -230,7 +183,7 @@ function genconfig {

 	setup_dirs()
 	{
-		if git ls-remote $CUSTREPO -q 2>/dev/null; then
+		if ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null  | grep -qw ${CUSTREPO:22}; then
 			if [ ! -d "$CUSTPATH" ]; then
 				git clone "$CUSTREPO" "$CUSTPATH"
 			elif [ $IMPORT -eq 1 ]; then
@@ -286,17 +239,40 @@ function genconfig {
 		fi

 		# Generate base config
+		# Used only for iopsys targets, not openwrt targets
 		rm -f .config
-		v "Config $BOARDTYPE selected"
-		v "cp $CONFIGPATH/config .config"
-		cp $CONFIGPATH/config .config
+		if [ $masterconfig -eq 1 ]; then
+			v "Config $BOARDTYPE selected"
+			v "cp $CONFIGPATH/config .config"
+			cp $CONFIGPATH/config .config
+		fi

-		if [ -f $config_path/config ]; then
-		    cat $config_path/config >> .config
+		# Add target (soc/board specific )
+		if [ -f $CONFIGPATH/target/config ]; then
+		    cat $CONFIGPATH/target/config >> .config
 		fi
-		if [ -f $config_path/$BOARDTYPE/config ]; then
-		    cat $config_path/$BOARDTYPE/config >> .config
+		if [ -f $CONFIGPATH/target/$target/config ]; then
+		    cat $CONFIGPATH/target/$target/config >> .config
 		fi
+		if [ -f $CONFIGPATH/target/$target/$BOARDTYPE/config ]; then
+		    cat $CONFIGPATH/target/$target/$BOARDTYPE/config >> .config
+		fi
+
+		# Apply profile diff to master config if selected
+		if [ -n "$PROFILE" ]; then
+			if [ -e "$CONFIGPATH/$PROFILE.diff" ]; then
+				cat $CONFIGPATH/$PROFILE.diff >> .config
+			elif [ "$PROFILE" == "juci" ]; then
+				v "Default profile (juci) is selected."
+			else
+				echo "ERROR: profile $PROFILE does not exist!"
+				exit 1
+			fi
+		else
+			v "No profile selected! Using default."
+		fi
+
+		# Set target and profile

 		#special handling for intel_mips which use TARGET_DEVICES
 		if [ "$target" = "intel_mips" ]; then
@@ -354,24 +330,21 @@ 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
 			[ $wifilifeAllowed -eq 0 ] && echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		else
-			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
+			echo "CONFIG_GITMIRROR_REWRITE=n" >>.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
 			echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		fi

-		if [ -n "$BRCM_MAX_JOBS" ]
-		then
-		    echo "CONFIG_BRCM_MAX_JOBS=\"1\"" >>.config
-		fi
-
 		# Force regeneration of themes
 		touch package/feeds/juci/juci/Makefile

@@ -383,19 +356,23 @@ function genconfig {
 		# currently boardparms.c and boardparms_voice.c is the only place that is depending on inteno boardid name
 		# so just touch that file.
 		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
-
-		# Store generated config
-		cp .config .genconfig.config
-
+				
 		# Set default values based on selected parameters
 		v "$(make defconfig 2>&1)"

-		echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
+		# Temporary fixup for juci/luci profile
+		if [ "$PROFILE" == "luci" ]; then
+			sed -i '/CONFIG_DEFAULT_juci/d' .config
+			sed -i '/CONFIG_PACKAGE_juci/d' .config
+			sed -i '/CONFIG_PACKAGE_uhttpd/d' .config
+		fi
+
+		if [ $masterconfig -eq 1 ]; then
+			echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
+		fi

 		# Clean base-file package to force rebuild when changing profile
 		v "$(make package/base-files/clean 2>&1)"
-
-		verify_config
 	}

 	####### main #####
@@ -420,7 +397,6 @@ function genconfig {
 			-p|--profile) export PROFILE="$2"; shift;;
 			-r|--repo) export CUSTREPO="$2"; shift;;
 			-s|--override) export SRCTREEOVERR=1;;
-			-S|--brcmsingel) export BRCM_MAX_JOBS=1;;
 			-h|--help) usage;;
 			-l|--list) list_customers 0 $2;;
 			-a|--list-all)list_customers 1;;
@@ -435,7 +411,7 @@ function genconfig {
 			shift;
 		done

-		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
+		CUSTREPO="${CUSTREPO:-git@private.inteno.se:customerconfigs}"

 		setup_dirs
 		create_and_copy_files "$@"
--- 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/install_key.sh
+++ b/iop/scripts/install_key.sh
@@ -10,7 +10,7 @@ function install_key {
    echo "::sysinit:/etc/init.d/rcS S boot" >files/etc/inittab
    echo "::shutdown:/etc/init.d/rcS K shutdown" >>files/etc/inittab
    echo "tty/0::askfirst:/bin/ash --login" >>files/etc/inittab
-    echo "console::askfirst:/bin/cttyhack /bin/ash --login" >>files/etc/inittab
+    echo "ttyS0::askfirst:/bin/ash --login" >>files/etc/inittab

    echo Done
 }
--- 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/iop/scripts/update_feed_branches.sh
+++ b/iop/scripts/update_feed_branches.sh
@@ -36,17 +36,17 @@ function update_feed_branches {
 		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo"
 	fi

-	ifeeds="$(grep -r 'dev.iopsys.eu' feeds.conf | awk '{print$2}' | tr '\n' ' ')"
+	ifeeds="$(grep -r feed_inteno feeds.conf  | awk '{print$2}' | cut -d'_' -f3 | tr '\n' ' ')"

 	for f in $ifeeds; do
-		commith=$(grep $f feeds.conf | cut -d'^' -f2)
-		cd $ipath/feeds/$f
+		commith=$(grep feed_inteno_$f feeds.conf | cut -d'^' -f2)
+		cd $ipath/feeds/feed_inteno_$f
 		git branch -D $release 2>/dev/null
-		echo "$f: updating release branch $release to commit $commith"
+		echo "feed_inteno_$f: updating release branch $release to commit $commith"
 		git checkout $commith
 		git push origin :$release
 		git checkout -b $release
-		git push --set-upstream origin $release
+		git push origin $release
 		cd $ipath
 	done

--- a/iop/scripts/update_package.sh
+++ b/iop/scripts/update_package.sh
@@ -496,7 +496,6 @@ check_feeds()
    for feed in `echo $feeds`
    do
 		feed_hash=$(feeds_hash $feed)
-		[ -n "$feed_hash" ] || continue
 		if [ -d feeds/$feed ]; then
 			in_git=$(cd feeds/$feed; git rev-parse HEAD)

--- 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.
@@ -12,7 +12,7 @@ PKG_NAME:=iopupgrade
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1

-PKG_SOURCE_VERSION:=01f2afd6c831d6f9eb2940c7e7af16f7e4d439c2
+PKG_SOURCE_VERSION:=9b5ed4bc9f7ac5064414cf5feb510ffd95df6ec4
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopupgrade

@@ -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
@@ -7,7 +7,6 @@ cur_vol=""	# num,[0/1]	Number used for ubifs root filesystem volume name.
 upd_vol=""	# num,[0/1]	Number used for ubifs root filesystem volume name.
 		# eg: rootfs_0 or rootfs_1, the one we want to update
 cmdline=""	# command line settings.
-cmdline_match="" # Headers to match to the image

 ###############################################################################
 # file local variables. should not be used in imported functions. Can be used
@@ -21,6 +20,7 @@ upd_ubi_id=""		# num,	UBI volume number for the volume name
 run_cleanup=0		# if set the cleanup should be run otherwise we skip it.
 run_mount_cleanup=0	# set if we should run umount in cleanup
 upd_kernel=0		# set to 1 if system has the kernel in own mtd partition
+upd_cfe=0		# set to 1 if system is using cfe as bootloader.
 log_stdout=1		# set to 0 to prevent the log to also print to stdout
 upd_noreboot=0		# set to 1 if we should not reboot after programming
 upd_forceimage=0	# set this to force upgrade even if image is for wrong board.
@@ -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
@@ -204,7 +204,9 @@ log "Firmware upgrade started"
 if [ $upd_forceimage -eq 0 ]
 then
   board=$(db get hw.board.iopVerBoard)
-   cmdline_match="board=$board"
+   cmdline="$cmdline -b $board"
+else
+    cmdline="$cmdline -q"
 fi

 # find out what rootfs volume is active. 
@@ -215,19 +217,16 @@ upd_vol=$(get_flashbank_next)
 upd_ubi_id=$(ubinfo -d 0 -N rootfs_$upd_vol | awk "/Volume ID:/ {print \$3}")
 log "installing Root Fileystem into UBI volume rootfs_$upd_vol"

-# prepare to match dsl.
-function_call upd_conf_dsl
-
 # prepare to update CFE if it exists
 function_call upd_conf_cfe

 # prepare to update kernel if it is stored in MTD/JFFS2 
 function_call upd_conf_kernel

-log "now starting writing data to flash with [ iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id ]"
+log "now starting writing data to flash with [ iopupgrade $cmdline -u ubi0_$upd_ubi_id ]"
 run_cleanup=1	# When we start to actually write data there might be some
 		# things that need cleanup if we get an error/crash
-iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id
+iopupgrade $cmdline -u ubi0_$upd_ubi_id

 # in case of any error we abort
 if [ $? -ne 0 ]; then
--- 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
@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2008-2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ltq-nand
-PKG_VERSION:=1.0
-
-PKG_SOURCE:=v$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand/archive/
-#PKG_SOURCE_PROTO:=git
-#PKG_SOURCE_URL:=https://github.com/merbanan/ltq-nand/releases/download/v$(PKG_VERSION)/
-#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
-
-
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR)
-endef
-
-define Host/Install
-	$(CP) \
-		$(HOST_BUILD_DIR)/ltq-nand \
-		$(STAGING_DIR_HOST)/bin/
-endef
-
-$(eval $(call HostBuild))
-
--- 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
@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mqtt-ciotc
 PKG_VERSION:=0.1

-PKG_SOURCE_VERSION:=00da3fb1f1691d836037dc4d93e38d0835ba46a4
+PKG_SOURCE_VERSION:=eda5bc711c215cbfe50ddd0e8725b69d4a3cff4f
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifilife-testbed.git

@@ -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
@@ -31,7 +29,6 @@ define Package/mqtt-ciotc/description
 endef

 define Package/mqtt-ciotc/install
-	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mqtt_ciotc $(1)/sbin/
 endef
--- a/mqtt-ciotc/files/etc/config/mqtt-ciotc
+++ b/mqtt-ciotc/files/etc/config/mqtt-ciotc
@@ -0,0 +1,3 @@
+config mqtt-ciotc mqtt-ciotc
+	option private-cert '/etc/mqtt-ciotc/rsa_private.pem'
+	option root-cert '/etc/mqtt-ciotc/roots.pem'
--- a/mqtt-ciotc/files/etc/config/mqtt_ciotc
+++ b/mqtt-ciotc/files/etc/config/mqtt_ciotc
@@ -1,3 +0,0 @@
-config certs 'certs'
-	option private '/etc/mqtt-ciotc/rsa_private.pem'
-	option root '/etc/mqtt-ciotc/roots.pem'
--- a/mqtt-ciotc/files/etc/init.d/mqtt-ciotc
+++ b/mqtt-ciotc/files/etc/init.d/mqtt-ciotc
@@ -0,0 +1,35 @@
+#!/bin/sh /etc/rc.common
+
+START=96
+STOP=10
+PROG=/sbin/mqtt-ciotc
+
+USE_PROCD=1
+
+start_service() {
+	procd_open_instance
+	procd_set_param command ${PROG}
+	config_load mqtt-ciotc
+	config_get private-cert mqtt-ciotc private-cert
+	config_get root-cert mqtt-ciotc root-cert
+
+	[ -n $private-cert ] && procd_append_param command --private-cert $private-cert
+	[ -n $root-cert ] && procd_append_param command --root-cert $root-cert
+	procd_set_param respawn
+	procd_close_instance
+}
+
+stop_service()
+{
+	service_stop ${PROG}
+}
+
+reload_service() {
+#	procd_send_signal wifilife # use SIGHUP
+	stop
+	start
+}
+
+service_triggers() {
+        procd_add_reload_trigger "mqtt-ciotc"
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jakob Olsson	9d0b02adef	update init.d and add config script	2019-01-18 15:06:42 +01:00
Jakob Olsson	45b5f2c09e	update hash	2019-01-18 12:24:58 +01:00
Jakob Olsson	1a118e9aaf	hash update	2019-01-18 12:24:58 +01:00
Jakob Olsson	909515b4bb	update hash	2019-01-18 12:24:58 +01:00
Jakob Olsson	8b6b1b5ac5	add init.d script	2019-01-18 12:24:58 +01:00
Jakob Olsson	9b64ae9348	correct git path	2019-01-18 12:24:58 +01:00
Jakob Olsson	87be8345a0	update repo, hash and path	2019-01-18 12:24:58 +01:00
Jakob Olsson	e3d39bb8a4	update package dependencies	2019-01-18 12:24:58 +01:00
Jakob Olsson	2353a0a0f2	mqtt-ciotc: remove copy paste excess	2019-01-18 12:24:58 +01:00
Jakob Olsson	1b55cee8e0	jwt: include all shared lib files, use correct jansson dependency	2019-01-18 12:24:58 +01:00
Jakob Olsson	8925f9625b	paho: include all shared lib and header files, remove redundant lines	2019-01-18 12:24:58 +01:00
Jakob Olsson	fa10a9536f	package for the example file	2019-01-18 12:24:58 +01:00
Jakob Olsson	43eb8b4962	paho-mqtt-c package	2019-01-18 12:24:58 +01:00
Jakob Olsson	e40f3cd4f5	libjwt new version	2019-01-18 12:24:58 +01:00
Jakob Olsson	0cec084471	add libjwt makefile	2019-01-18 12:24:58 +01:00