obuspa: Added forked repo

Description:
 - Changes in patch files moved to forked obuspa repository

dectmngr2/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.3.0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0c029ed2486342e7e7687631b702d5c743f3c41a
+PKG_SOURCE_VERSION:=637aa9ef231f81d195f7a1b67c70af445ade7fee
 PKG_NAME:=dectmngr2
 
 
@@ -42,6 +42,7 @@ define Package/dectmngr2/install
 	$(INSTALL_DIR) $(1)/etc/dect/
 	$(INSTALL_DIR) $(1)/etc/config/
 	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_DIR) $(1)/etc/uci-defaults/
 
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dectmngr2 $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/target.bin $(1)/etc/dect/
@@ -49,6 +50,7 @@ define Package/dectmngr2/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dect $(1)/etc/init.d/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dectmngr-wrapper.sh $(1)/usr/sbin/
 	$(CP) ./files/dect.config $(1)/etc/config/dect
+	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
 endef
 
 $(eval $(call BuildPackage,dectmngr2))

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

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

dslmngr/Makefile

@@ -0,0 +1,78 @@
+#
+# 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:=be5b0d0c0a1c2abd335aaf19f01f63284d8cc285
+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)
+
+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))

easy-qos/Makefile

@@ -0,0 +1,37 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=easy-qos
+PKG_VERSION:=1.0
+PKG_RELEASE:=0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/easy-qos
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Easy QoS
+endef
+
+define Package/easy-qos/description
+	This package contains Easy QoS utitie
+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/
+	$(CP) ./files/etc/init.d/easy_qos.iptables $(1)/etc/init.d/easy_qos
+	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
+	$(CP) ./files/etc/firewall.easyqos $(1)/etc/firewall.easyqos
+endef
+
+$(eval $(call BuildPackage,easy-qos))

easy-qos/files/etc/firewall.easyqos

@@ -0,0 +1 @@
+/etc/init.d/easy_qos reload

easy-qos/files/etc/init.d/easy_qos.ebtables

@@ -0,0 +1,140 @@
+#!/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" ]; 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" ]; 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"
+}
+

easy-qos/files/etc/init.d/easy_qos.iptables

@@ -0,0 +1,186 @@
+#!/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//:/_}"
+	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 OUTPUT|grep -m 1 MARK |sed 's/-A/-D/1')
+	while [ -n "${rule}" ]; do
+		exec_log iptables -t mangle ${rule}
+		rule=$(iptables -t mangle -S OUTPUT|grep -m 1 MARK |sed 's/-A/-D/1')
+	done
+}
+
+check_and_create() {
+	iptables -t mangle -C OUTPUT ${@} 2>/dev/null
+	# Create rule if not exists
+	if [ ${?} -ne 0 ]; then
+		exec_log iptables -t mangle -A OUTPUT ${@}
+	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" ]; 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"
+}
+

easy-qos/files/etc/uci-defaults/60-easyqos-reqs

@@ -0,0 +1,10 @@
+# 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

easy-soc-libs/Config.in

@@ -15,5 +15,9 @@ config LIBDSL_DEBUG
 	bool "Enable xdsl debugging"
 	default n
 
+config LIBDSL_TEST
+	depends on PACKAGE_libdsl
+	bool "Libdsl test program"
+	default n
 endmenu
 endif

easy-soc-libs/Makefile

@@ -8,12 +8,15 @@ PKG_NAME:=easy-soc-libs
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8989476ac5df494064ed94a52634be5c61fff037
+PKG_SOURCE_VERSION:=f6deba973cba01d630fdc40c6e97c384b07e3df5
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 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)
 
 include $(INCLUDE_DIR)/package.mk
@@ -34,43 +37,49 @@ endef
 define Package/libwifi
   $(call Package/easy-soc-libs)
   TITLE:= WiFi library (libwifi)
-endef
-
-define Package/libdsl
-  $(call Package/easy-soc-libs)
-  TITLE:= XDSL library (libdsl)
+  DEPENDS+=+TARGET_intel_mips:libnl +TARGET_intel_mips:libnl-route
 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
+  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
+  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_lantiq_xrx500),y)
-  TARGET_PLATFORM=LANTIQ
-  TARGET_CFLAGS +=-DIOPSYS_LANTIQ
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+  TARGET_PLATFORM=INTEL
+  TARGET_CFLAGS +=-DIOPSYS_INTEL
 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
+endef
+
 subdirs := \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
@@ -78,15 +87,22 @@ subdirs := \
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/openssl \
 	-I$(STAGING_DIR)/usr/include/libnl3
 
 MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
+	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
 	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/libwifi
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
@@ -108,6 +124,12 @@ 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));)
@@ -125,7 +147,11 @@ 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))

endptmngr/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
 PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=a78fe95d5c5a0a320f3b62b9d2faafd07b56e3a7
+PKG_SOURCE_VERSION:=fb453f8c89463c8cd323f15e369c5d69f73bd1e8
 
 
 ifeq ($(CONFIG_ENDPT_OPEN),y)

eventlog/Makefile

@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2009-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_NAME:=eventlog
-PKG_VERSION:=0.2.9
-PKG_RELEASE:=2
-
-PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/eventlog/0.2/
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=76e3d7a0b8f335c12099e9b91191fbf1
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libeventlog
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A new API to format and send structured log messages.
-endef
-
-define Package/eventlog/description
-  A new API to format and send structured log messages. It supports multiple message
-  representations (plain, XML attributes and XML tags) and multiple output methods
-  (local syslogd).
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/eventlog $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevtlog.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/eventlog.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libeventlog/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libevtlog.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libeventlog))

gryphon-led-module/Makefile

@@ -0,0 +1,62 @@
+# 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:=Genexis
+  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)))

gryphon-led-module/src/Makefile

@@ -0,0 +1,26 @@
+# 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)

gryphon-led-module/src/main.c

@@ -0,0 +1,253 @@
+/*
+ * 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");

gryphon-led-module/src/sk9822.c

@@ -0,0 +1,82 @@
+/*
+ * 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;
+}

gryphon-led-module/src/sk9822.h

@@ -0,0 +1,46 @@
+/*
+ * 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_ */

gryphon-led-module/src/sk9822_bitbang.c

@@ -0,0 +1,48 @@
+/*
+ * 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
+}

gryphon-led-module/src/sk9822_bitbang.h

@@ -0,0 +1,28 @@
+/*
+ * 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_ */

ice-client/Makefile

@@ -19,14 +19,14 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=5.2.3
+BASE_PKG_VERSION:=5.3.6
 PKG_RELEASE:=
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=795cf8ce3cc19ff8bbb014c8ac456784c187dcc5
+PKG_SOURCE_VERSION:=94aab1532fef2caf2d65579614fc413252a517eb
 ifeq ($(CONFIG_ICE_OPEN),y)
 TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/

ice-client/files/ice-client.uci_default

@@ -9,6 +9,8 @@ uci -q set passwords.ice=usertype
 uci -q set passwords.ice.password="\$WPAKEY"
 uci -q del_list passwords.ice._access_w=root
 uci -q add_list passwords.ice._access_w=root
+uci -q del_list passwords.ice._access_r=root
+uci -q add_list passwords.ice._access_r=root
 uci -q commit passwords
 
 uci show rpcd | grep username=.*ice.* >/dev/null || {

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2018-12-04
+PKG_VERSION:=4.0-2019-05-06
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f9bbd7fb4a122dd523c2f2eaedec932c8483154f
+PKG_SOURCE_VERSION:=d3aea85146d21db0fc2bd0bcca58dd80d08908b6
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -51,6 +51,20 @@ define Package/icwmp_xmpp
 	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/Default
   SECTION:=utils
   CATEGORY:=Utilities
@@ -203,6 +217,24 @@ define Package/icwmp_xmpp/install
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_xmpp $(1)/etc/config
 endef
 
+define Package/icwmp_udpechoserver/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_udpechoserverd $(1)/usr/sbin/icwmp_udpechoserverd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_udpechoserverd $(1)/etc/init.d/icwmp_udpechoserverd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_udpechoserver $(1)/etc/config
+endef
+
+define Package/icwmp_twamp/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_twampd $(1)/usr/sbin/icwmp_twampd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_twampd $(1)/etc/init.d/icwmp_twampd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_twamp $(1)/etc/config
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libdatamodel
@@ -238,4 +270,6 @@ $(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-zstream))

icwmp/files/etc/hotplug.d/iface/90-icwmp

@@ -75,9 +75,11 @@ handle_icwmp_restart() {
 		"$previpaddr" = "$curipaddr" -a \
 		"$prevgateway" = "$curgateway" -a \
 		"$prevsubnets" = "$cursubnets" -a \
-		"$prevdnsservers" = "$curdnsservers" -a \
-		"$prevopt43url" = "$curopt43url" \
-	] && exit 0
+		"$prevdnsservers" = "$curdnsservers" \
+	] && {
+		[ "$prevopt43url" = "$curopt43url" ] &&	exit 0
+		[ -z "$prevopt43url" ] && exit 0
+	}
 
 	/etc/init.d/icwmpd reload &
 }

ifbt/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Inteno
+# Copyright (C) 2018 iopsys Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=ifbt
 PKG_VERSION:=0.1
 
-PKG_SOURCE_VERSION:=a0572079265293ed99dc4d69fd38528760d29be9
+PKG_SOURCE_VERSION:=0286812ed8036dea758f904694dc416481fba64d
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ifbt.git
 
@@ -18,6 +18,22 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 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

imonitor/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Inteno
+# Copyright (C) 2018 iopsys
 #
 
 include $(TOPDIR)/rules.mk
@@ -15,7 +15,6 @@ 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
 
@@ -24,7 +23,7 @@ include $(INCLUDE_DIR)/cmake.mk
 
 define Package/imonitor
 	CATEGORY:=Utilities
-	TITLE:=Inteno process supervisor
+	TITLE:=iopsysWrt process supervisor
 	DEPENDS:=+ubox +uci +ubus +rpcd +rpcd-mod-file
 endef
 

inbd/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 Inteno
+# Copyright (C) 2016 iopsys
 #
 # 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:=b846ae0ff55284392de2c4d874851b33edd7a6c5
+PKG_SOURCE_VERSION:=665a72a6bb2b5ea5a17ad6248957fe35525b3782
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
 
@@ -34,7 +34,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/inbd
 	CATEGORY:=Utilities
-	TITLE:=Inteno Netlink Bridge Daemon
+	TITLE:=iopsys Netlink Bridge Daemon
 	URL:=
 	DEPENDS:=+libuci +libubus +libblobmsg-json +libnl-genl
 endef

iop/Makefile

@@ -20,7 +20,7 @@ define Package/iop
 endef
 
 define Package/iop/description
-	This package contains Intenos Iop utilities
+	This package contains iopsysWrt SDK utilities
 endef
 
 define Build/Compile

iop/config

@@ -3,11 +3,9 @@ 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
@@ -17,57 +15,35 @@ CONFIG_PACKAGE_crashlog=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=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_netmode=y
-CONFIG_PACKAGE_iperf-mt=y
+CONFIG_PACKAGE_iopupgrade=y
+CONFIG_PACKAGE_ip-full=y
+CONFIG_PACKAGE_iperf3=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=y
+# CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_juci=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-config-backup=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-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-natalie-dect=y
+CONFIG_PACKAGE_juci-mwan3=y
 CONFIG_PACKAGE_juci-netmode=y
 CONFIG_PACKAGE_juci-network-device=y
 CONFIG_PACKAGE_juci-network-dsl=y
@@ -75,24 +51,20 @@ 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-utils=y
-# CONFIG_PACKAGE_kmod-ipt-nathelper is not set
-CONFIG_PACKAGE_kmod-nls-base=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_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
@@ -100,14 +72,10 @@ 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_odhcp6c=y
@@ -116,7 +84,6 @@ 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
@@ -155,7 +122,7 @@ CONFIG_PACKAGE_wifimngr=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
-CONFIG_TARGET_CUSTOMER="INT"
+CONFIG_TARGET_CUSTOMER="IOPSYS"
 CONFIG_TARGET_ROOTFS_TARGZ=y
 # CONFIG_USE_SSTRIP is not set
 CONFIG_USE_STRIP=y
@@ -187,7 +154,6 @@ 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
@@ -201,11 +167,9 @@ 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
@@ -215,7 +179,6 @@ 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
@@ -224,5 +187,6 @@ 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
+LOCAL_MIRROR="http://download.iopsys.eu/iopsys/mirror/"
+

iop/configs/luci.diff

@@ -1,38 +0,0 @@
-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
-

iop/configs/target/intel_mips/config

@@ -1,67 +0,0 @@
-# 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
-####################
-
-# the options below this point is wrong but packages wont compile
-
-# CONFIG_PACKAGE_icwmp-curl is not set
-# CONFIG_PACKAGE_juci-icwmp is not set
-# CONFIG_PACKAGE_libcgroup is not set
-# CONFIG_PACKAGE_libcgroup-daemon is not set
-# CONFIG_PACKAGE_libdatamodel is not set
-
-# CONFIG_TARGET_ROOTFS_INITRAMFS is not set
-# CONFIG_TARGET_ROOTFS_SQUASHFS is not set
-

iop/configs/target/intel_mips/speedport_smart3/config

@@ -1,3 +0,0 @@
-# temporary solution for kernel
-CONFIG_KERNEL_GIT_BRANCH="easy550_anywan_smart3board"
-CONFIG_KERNEL_GIT_COMMIT="58796d57c6da6bba984c781c05222349f7c2b655"

iop/configs/target/iopsys_brcm63xx_arm/config

@@ -1,15 +0,0 @@
-# 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
-

iop/configs/target/iopsys_brcm63xx_arm/dg400/config

@@ -1,4 +0,0 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
-CONFIG_TARGET_NO_DECT=y
-

iop/configs/target/iopsys_brcm63xx_arm/dg400prime/config

@@ -1,4 +0,0 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
-CONFIG_TARGET_NO_DECT=y
-

iop/configs/target/iopsys_brcm63xx_arm/eg400/config

@@ -1,7 +0,0 @@
-CONFIG_BCM_I2C=y
-
-# Disable kernel internal Dect. External Dect can still operate.
-CONFIG_TARGET_NO_DECT=y
-
-CONFIG_TARGET_NO_DSL=y
-

iop/configs/target/iopsys_brcm63xx_arm/f104/config

@@ -1,6 +0,0 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
-CONFIG_TARGET_NO_DECT=y
-
-CONFIG_USE_DSL=y
-CONFIG_TARGET_DSL_GFAST=y

iop/configs/target/iopsys_brcm63xx_arm/f104w/config

@@ -1,6 +0,0 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
-CONFIG_TARGET_NO_DECT=y
-
-CONFIG_USE_DSL=y
-CONFIG_TARGET_DSL_GFAST=y

iop/configs/target/iopsys_brcm63xx_arm/sdx810_rg/config

@@ -1,5 +0,0 @@
-
-# Disable kernel internal Dect. External Dect can still operate.
-CONFIG_TARGET_NO_DECT=y
-
-CONFIG_TARGET_NO_DSL=y

iop/configs/target/iopsys_brcm63xx_mips/cg300/config

@@ -1,3 +0,0 @@
-CONFIG_TARGET_NO_DSL=y
-CONFIG_BCM_I2C=y
-

iop/configs/target/iopsys_brcm63xx_mips/config

@@ -1,15 +0,0 @@
-# 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
-

iop/configs/target/iopsys_brcm63xx_mips/dg200/config

@@ -1,3 +0,0 @@
-CONFIG_BCM_I2C=y
-CONFIG_TARGET_NO_DECT=y
-

iop/configs/target/iopsys_brcm63xx_mips/dg200al/config

@@ -1,3 +0,0 @@
-CONFIG_TARGET_NO_VOICE=y
-CONFIG_BCM_I2C=y
-

iop/configs/target/iopsys_brcm63xx_mips/dg301/config

@@ -1,2 +0,0 @@
-CONFIG_BCM_I2C=y
-

iop/configs/target/iopsys_brcm63xx_mips/dg301al/config

@@ -1,3 +0,0 @@
-CONFIG_TARGET_NO_VOICE=y
-CONFIG_BCM_I2C=y
-

iop/configs/target/iopsys_brcm63xx_mips/eg200/config

@@ -1,5 +0,0 @@
-CONFIG_BCM_I2C=y
-CONFIG_TARGET_NO_DECT=y
-CONFIG_TARGET_NO_DSL=y
-CONFIG_BCM_ENDPOINT_MODULE=y
-

iop/configs/target/iopsys_brcm63xx_mips/eg300/config

@@ -1,3 +0,0 @@
-CONFIG_TARGET_NO_DSL=y
-CONFIG_BCM_I2C=y
-

iop/configs/target/iopsys_brcm63xx_mips/vg50/config

@@ -1,4 +0,0 @@
-CONFIG_TARGET_NO_DHD=y
-CONFIG_TARGET_NO_VOICE=y
-CONFIG_BCM_I2C=y
-

iop/configs/target/iopsys_ramips/config

@@ -1,14 +0,0 @@
-# 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

iop/iop.completion

@@ -34,9 +34,8 @@ _iop()
 
     iopcmds="bootstrap cfe_upgrade cfe_upgrade_latest extract_core \
              feeds_update genconfig generate_tarballs install_key \
-             scp_changes setup_host ssh_install_key ssh_sysupgrade \
-             ssh_sysupgrade_latest ssh_sysupgrade_latest_w status \
-             update_package update_feed_branches"
+             scp_changes setup_host ssh_install_key status \
+             update_package update_feed_branches ssh_upgrade"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 
@@ -76,7 +75,13 @@ _iop()
                 fi
                 return 0
                 ;;
-
+            ssh_upgrade)
+	        if [ "$prev" == "-f" ] ; then
+		    _filedir
+		else
+		    COMPREPLY=( $(compgen -W "-f -t -i -n -x -b" -- ${cur}) )
+		fi
+	         ;;
             *)
                 # No arguments or arguments not supported yet
                 ;;

iop/scripts/feeds_update.sh

@@ -32,13 +32,15 @@ function feeds_update {
     fi
 
     # targets need to be installed explicitly
-    ./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
+    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
 
     # 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
@@ -47,7 +49,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

iop/scripts/genconfig.sh

@@ -7,45 +7,104 @@ function genconfig {
 	export FILEDIR="files/"
 	export THEMEDIR="themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
-	export CONFIGPATH="package/feeds/iopsys/iop/configs"
+	export CONFIGPATH="package/feeds/iopsys/iop"
 	CUSTPATH="customerconfigs"
 	export CUSTCONF="customerconfigs/customers"
 	export VERBOSE=0
 	export DEVELOPER=0
-	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
-
 	target="bogus"
-	masterconfig=1
+	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
+	}
 
 	# 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 speedport_smart3"
-	    local ramips="mt7621"
 
-	    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
+		[ -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
 	    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
@@ -53,6 +112,7 @@ 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
@@ -60,21 +120,15 @@ 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 $ramips; do
-		if [ $p == $profile ]; then
-		    target="ramips"
-		    masterconfig=0
-		    return
-		fi
-	    done
-
-	    for p in $intel_mips; do
+	    for p in $iopsys_intel_mips; do
 		if [ $p == $profile ]; then
 		    target="intel_mips"
+			config_path="$intel_mips/config"
 		    return
 		fi
 	    done
@@ -91,17 +145,12 @@ function genconfig {
 		mediatekAllowed=0
 		wifilifeAllowed=0
 
-		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
+		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
+		git ls-remote git@private.inteno.se:ice-client.git -q -q 2>/dev/null && iceAllowed=1
 	}
 
 	v() {
@@ -110,20 +159,20 @@ function genconfig {
 
 	usage() {
 		echo
-		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer ]"
+		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
 		echo
-		echo -e "  -c|--clean\tRemove all files under ./files and import from config "
-		echo -e "  -v|--verbose\tVerbose"
+		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
+		echo -e "  -v|--verbose\t\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
-		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 "  -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 "  -l|--list [customer]\tList all Customers or all boards for one customer"
-		echo -e "  -a|--list-all\tList all Customers and their board types"
-		echo -e "  -b|--boards\tList all board types"		
+		echo -e "  -a|--list-all\t\tList all Customers and their board types"
+		echo -e "  -b|--boards\t\tList all board types"
 		echo
-		echo "Example ./iop genconfig vg50 TELIA"
-		echo "(if no customerconfig is chosen the Inteno Config will be used)"
+		echo "Example ./iop genconfig dg200 TELIA"
+		echo "(if no customerconfig is chosen, iopsys config will be used)"
 		echo
 		exit 0
 	}
@@ -183,7 +232,7 @@ function genconfig {
 
 	setup_dirs()
 	{
-		if ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null  | grep -qw ${CUSTREPO:22}; then
+		if git ls-remote $CUSTREPO -q 2>/dev/null; then
 			if [ ! -d "$CUSTPATH" ]; then
 				git clone "$CUSTREPO" "$CUSTPATH"
 			elif [ $IMPORT -eq 1 ]; then
@@ -214,62 +263,42 @@ function genconfig {
 	create_and_copy_files()
 	{
 		local BOARDTYPE=$1
-		local CUSTOMER=$2
+		shift
+		local CUSTOMERS=$@
 
-		# Validate seleced board and customer
+		# Validate seleced board and customers
 		set_target $BOARDTYPE
 		if [ $target == "bogus" ]; then
 			echo "Hardware profile does not exist"
 			exit 1
-		elif [ -n "$CUSTOMER" ]; then
-			if [ ! -d "$CUSTCONF/$CUSTOMER/" ]; then
-				echo "Customer profile for '$CUSTOMER' does not exist"
-				exit 1
-			elif [ ! -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/" ]; then
-				echo "'$BOARDTYPE' board profile does not exist for customer '$CUSTOMER'"
-				if [ -f "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
-					echo "Common profile configuration will be used"
-				else
+		elif [ -n "$CUSTOMERS" ]; then
+			for CUSTOMER in $CUSTOMERS; do
+				if [ ! -d "$CUSTCONF/$CUSTOMER/" ]; then
+					echo "Customer profile for '$CUSTOMER' does not exist"
 					exit 1
+				elif [ ! -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/" ]; then
+					echo "'$BOARDTYPE' board profile does not exist for customer '$CUSTOMER'"
+					if [ -f "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
+						echo "Common profile configuration will be used"
+					else
+						exit 1
+					fi
 				fi
-			fi
+			done
 		fi
 
 		# Generate base config
-		# Used only for iopsys targets, not openwrt targets
 		rm -f .config
-		if [ $masterconfig -eq 1 ]; then
-			v "Config $BOARDTYPE selected"
-			v "cp $CONFIGPATH/config .config"
-			cp $CONFIGPATH/config .config
-		fi
+		v "Config $BOARDTYPE selected"
+		v "cp $CONFIGPATH/config .config"
+		cp $CONFIGPATH/config .config
 
-		# Add target (soc/board specific )
-		if [ -f $CONFIGPATH/target/config ]; then
-		    cat $CONFIGPATH/target/config >> .config
+		if [ -f $config_path/config ]; then
+		    cat $config_path/config >> .config
 		fi
-		if [ -f $CONFIGPATH/target/$target/config ]; then
-		    cat $CONFIGPATH/target/$target/config >> .config
+		if [ -f $config_path/$BOARDTYPE/config ]; then
+		    cat $config_path/$BOARDTYPE/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
@@ -285,31 +314,33 @@ function genconfig {
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
 		fi
 
-		echo "$CUSTOMER $BOARDTYPE" > $CURRENT_CONFIG_FILE
+		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
 
 		# Add customerconfig diff if a customer is selected
-		if [ -n "$CUSTOMER" ]; then
-			if [ -d "$CUSTCONF/$CUSTOMER/common/fs" ]; then
-				v "cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR"
-				cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR
-			fi
-			if [ -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/fs" ]; then
-				v "cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR"
-				cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR
-			fi
-			if [ -d "$CUSTCONF/$CUSTOMER/juci-theme" ]; then
-				customer="$(echo $CUSTOMER | tr 'A-Z' 'a-z')"
-				v "cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer"
-				cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer
-			fi
-			if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
-				v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
-				cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
-			fi
-			if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
-				v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
-				cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
-			fi
+		if [ -n "$CUSTOMERS" ]; then
+			for CUSTOMER in $CUSTOMERS; do
+				if [ -d "$CUSTCONF/$CUSTOMER/common/fs" ]; then
+					v "cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR"
+					cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR
+				fi
+				if [ -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/fs" ]; then
+					v "cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR"
+					cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR
+				fi
+				if [ -d "$CUSTCONF/$CUSTOMER/juci-theme" ]; then
+					customer="$(echo $CUSTOMER | tr 'A-Z' 'a-z')"
+					v "cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer"
+					cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer
+				fi
+				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
+					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
+					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
+				fi
+				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
+					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
+					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
+				fi
+			done
 		fi
 
 		# Set target version
@@ -331,7 +362,7 @@ function genconfig {
 			[ $mediatekAllowed -eq 0 ] && echo "CONFIG_MEDIATEK_OPEN=y" >> .config
 			[ $wifilifeAllowed -eq 0 ] && echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		else
-			echo "CONFIG_GITMIRROR_REWRITE=n" >>.config
+			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
 			echo "CONFIG_BCM_OPEN=y" >> .config
 			echo "CONFIG_ICE_OPEN=y" >> .config
 			echo "CONFIG_ENDPT_OPEN=y" >> .config
@@ -340,6 +371,11 @@ function genconfig {
 			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
 
@@ -351,23 +387,19 @@ 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)"
 
-		# 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
+		echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
 
 		# Clean base-file package to force rebuild when changing profile
 		v "$(make package/base-files/clean 2>&1)"
+
+		verify_config
 	}
 
 	####### main #####
@@ -392,6 +424,7 @@ 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;;
@@ -406,10 +439,10 @@ function genconfig {
 			shift;
 		done
 
-		CUSTREPO="${CUSTREPO:-git@private.inteno.se:customerconfigs}"
+		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
 
 		setup_dirs
-		create_and_copy_files "$1" "$2"
+		create_and_copy_files "$@"
 	fi
 }
 

iop/scripts/generate_tarballs.sh

@@ -14,7 +14,7 @@ build_bcmkernel_consumer() {
 	tarfile='out/bcm963xx_*_consumer.tar.gz'
 	[ $(ls -1 $tarfile |wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
 	scp -pv $tarfile $SERVER:$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz
-	ssh $SERVER "[ -f $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz ] && ln -sf $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz $FPATH/bcmopen-$board-$majver.$minver.tar.gz"
+	ssh $SERVER "[ -f $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz ] && ln -sf $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz $FPATH/bcmopen-$board-$majver.$minver-latest"
 	rm -f $tarfile
 	cd "$curdir"
 }

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 "ttyS0::askfirst:/bin/ash --login" >>files/etc/inittab
+    echo "console::askfirst:/bin/cttyhack /bin/ash --login" >>files/etc/inittab
 
     echo Done
 }

iop/scripts/iopupgrade.sh

@@ -0,0 +1,326 @@
+# this is a developer helper script to install firmware on a remote host with SSH
+
+function upd_usage {
+    echo "usage: $0 iopupgrade -t <host> -f <file> [opts] "
+    echo ""
+    echo "   Default host is 192.168.1.1"
+    echo "   Default firmware file is the newest one found"
+    echo "   Default is to not keep configuration"
+    echo "opts:"
+    echo ""
+    echo "	-i	Interactive use, Allows to select firmware file"
+    echo "	-n	Do not do the final reboot of the target board"
+    echo "	-c	Keep configuration"
+    echo "	-x	Force install even if firmware is not for this board"
+    echo "	-b	Force install of bootloader regardless of version installed"
+    echo "	-s	Use sysupgade. old upgrade method, needed for old releases that do not have iopu"
+}
+
+function set_config_string {
+    eval `grep $1 .config`
+}
+
+function upd_ask_ok {
+    echo "Will Continue with the following settings"
+    echo "-----------------------------------------"
+    printf "%20s: %s\n"  "Firmare file" "$upd_fw_base"
+    printf "%20s: %s\n"  "Host ip" "$upd_host"
+    printf "%20s: " "Reboot";               if [ "$upd_noreboot"   == "0" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    printf "%20s: " "Keep config";          if [ "$upd_keepconf"   == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    printf "%20s: " "Force bootloader";     if [ "$upd_forceboot"  == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    printf "%20s: " "Force image upgrade";  if [ "$upd_forceimage" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    printf "%20s: " "Use sysupgrade";       if [ "$upd_sysupgrade" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    echo "-----------------------------------------"
+
+    if [ "$upd_sysupgrade" == "0" ]
+       then
+	   if [ "$upd_keepconf"   == "1" ] ;then echo "keeping config is just a fantasy it's not yet implemented, try sysupgrade";fi
+    fi
+
+    echo -n "Continue? [Y/n/q]:"
+    read answer
+
+    case $answer in
+	n|N)
+	    return 1;;
+	q|Q)
+	    exit 1;;
+	y|Y|*)
+	    return 0;;
+    esac
+}
+
+function upd_select_file {
+
+    dialog --keep-tite --title "To select file use TAB/ARROW to hilight then press SPACEBAR -> RETURN" \
+	   --fselect "bin/targets/$CONFIG_TARGET_BOARD/generic/" \
+	   $((lines -10)) $((cols -5)) \
+	   2> $tempfile
+
+    new_file=$(cat $tempfile)
+    if [ -n "$new_file" ]
+    then
+	upd_fw="$new_file"
+	upd_fw_base=$(basename $upd_fw);
+    fi
+}
+
+function upd_select_target {
+
+    dialog --keep-tite --title "Input the name/ip number of target board" \
+	   --inputbox "Name/IP" \
+	   $((lines -10)) $((cols -5)) \
+	   "$upd_host" \
+	   2> $tempfile
+
+    new_file=$(cat $tempfile)
+    if [ -n "$new_file" ]
+    then
+	upd_host="$new_file"
+    fi
+}
+
+
+function upd_select_reboot {
+    dialog --keep-tite --radiolist "Should the board reboot after download finished" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Reboot" "Restart board after done"       `if [ "$upd_noreboot" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "No reboot" "Continue running old system" `if [ "$upd_noreboot" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
+
+    res=$(cat $tempfile)
+    case $res in
+	"No reboot")
+	    upd_noreboot=1
+	;;
+	"Reboot")
+	    upd_noreboot=0
+	    ;;
+    esac
+}
+
+function upd_select_config {
+    dialog --keep-tite --radiolist "Should the configuration be keept" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Keep" "Keep the config from old system"      `if [ "$upd_keepconf" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "Default" "Use default config for new system" `if [ "$upd_keepconf" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
+
+    res=$(cat $tempfile)
+    case $res in
+	"Keep")
+	    upd_keepconf=1
+	    ;;
+	"Default")
+	    upd_keepconf=0
+	    ;;
+    esac
+}
+
+function upd_select_forceboot {
+    dialog --keep-tite --radiolist "Should the boot loader be updated reagardless of version installed" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Force" "Alwasy update boot loader"                `if [ "$upd_forceboot" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "Version check" "Only upgrade if version is newer" `if [ "$upd_forceboot" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
+
+    res=$(cat $tempfile)
+    case $res in
+	"Force")
+	    upd_forceboot=1
+	    ;;
+	"Version check")
+	    upd_forceboot=0
+	    ;;
+    esac
+}
+
+function upd_select_forceimage {
+    dialog --keep-tite --radiolist "Should the image be stored in flash even if sanity checks would reject it" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Force" "Dissable sanity check and force use of image (dangerous)" `if [ "$upd_forceimage" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "Only compatible" "Normal checks apply"                            `if [ "$upd_forceimage" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
+
+    res=$(cat $tempfile)
+    case $res in
+	"Force")
+	    upd_forceimage=1
+	    ;;
+	"Only compatible")
+	    upd_forceimage=0
+	    ;;
+    esac
+}
+
+function upd_select_sysupgrade {
+    dialog --keep-tite --radiolist "Use the old way to upgrade a board" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "iopu" "Use the iop upgrade methode"          `if [ "$upd_sysupgrade" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "sysupgrade" "Use the old sysupgrade methode" `if [ "$upd_sysupgrade" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
+
+    res=$(cat $tempfile)
+    case $res in
+	"iopu")
+	    upd_sysupgrade=0
+	    ;;
+	"sysupgrade")
+	    upd_sysupgrade=1
+	    ;;
+    esac
+}
+
+function upd_select {
+
+    dialog --keep-tite --ok-label "Select" --cancel-label "Done" --menu "Select Item to change" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Firmare file" "$upd_fw_base"\
+	   "Host ip" "$upd_host" \
+	   "Reboot"               `if [ "$upd_noreboot"   == "0" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   "Keep config"          `if [ "$upd_keepconf"   == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   "Force bootloader"     `if [ "$upd_forceboot"  == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   "Force image upgrade"  `if [ "$upd_forceimage" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   "sysupgrade"           `if [ "$upd_sysupgrade" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   2> $tempfile
+
+
+    case $(cat $tempfile) in
+	"Firmare file")
+	    upd_select_file
+	    ;;
+	"Host ip")
+	    upd_select_target
+	    ;;
+	"Reboot")
+	    upd_select_reboot
+	    ;;
+	"Keep config")
+	    upd_select_config
+	    ;;
+	"Force bootloader")
+	    upd_select_forceboot
+	    ;;
+	"Force image upgrade")
+	    upd_select_forceimage
+	    ;;
+	"sysupgrade")
+	    upd_select_sysupgrade
+	    ;;
+	*)
+	    return
+	;;
+    esac
+    upd_select
+}
+function upd_select_start {
+    lines=$(tput lines)
+    cols=$(tput cols)
+    tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
+    trap "rm -f $tempfile" 0 1 2 5 15
+    upd_select
+
+}
+
+function ssh_upgrade {
+    upd_noreboot=0
+    upd_forceboot=0
+    upd_keepconf=0
+    upd_forceimage=0
+    upd_fw_base=""
+    upd_fw=""
+    upd_host="192.168.1.1"
+    upd_sysupgrade=0
+    do_dialog=0
+
+    while getopts "f:hnxt:iscb" opt; do
+	case $opt in
+	    n)
+		upd_noreboot=1
+		;;
+	    x)
+		upd_forceimage=1
+		;;
+	    b)
+		upd_forceboot=1
+		;;
+	    c)
+		upd_keepconf=1
+		;;
+	    v)
+		verbose=$OPTARG
+		;;
+	    f)
+		upd_fw=$OPTARG
+		;;
+	    t)
+		upd_host=$OPTARG
+		;;
+	    i)
+		do_dialog=1
+		;;
+	    s)
+		upd_sysupgrade=1
+		;;
+	    h)
+		upd_usage
+		exit 1
+		;;
+	    \?)
+		echo "Invalid option: -$OPTARG" >&2
+		exit 1
+		;;
+	esac
+    done
+
+    if [ -n "$upd_fw" ]
+    then
+	upd_fw_base=$(basename $upd_fw);
+    else
+	set_config_string CONFIG_TARGET_BOARD
+	firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t *[0-9].y[3])
+
+	for upd_fw_base in $firmwares
+	do
+	    #echo "firmware $upd_fw"
+	    break
+	done
+	upd_fw="bin/targets/$CONFIG_TARGET_BOARD/generic/$upd_fw_base"
+    fi
+
+    [ $do_dialog -eq 1 ] && upd_select_start
+
+    if ! upd_ask_ok
+    then
+	upd_select_start
+	if ! upd_ask_ok
+	then
+	    exit 1
+	fi
+    fi
+
+    if [ ! -f $upd_fw ]
+    then
+	echo "firmware file $firmware do not exist"
+	exit 1
+    fi
+
+    if [ $upd_sysupgrade -eq 0 ]
+    then
+	extra_args=""
+	[ $upd_noreboot   -eq 1 ] && extra_args="$extra_args -n"
+	[ $upd_forceimage -eq 1 ] && extra_args="$extra_args -x"
+	[ $upd_forceboot  -eq 1 ] && extra_args="$extra_args -b"
+
+	file_size_kb=`du -k "$upd_fw" | cut -f1`
+	cat $upd_fw | pv -s ${file_size_kb}k | ssh root@$upd_host "iopu $extra_args"
+    else
+	scp $upd_fw root@$upd_host:/tmp/ &&
+	    ssh -o ConnectTimeout=60 root@$upd_host "sysupgrade -v $3 /tmp/$upd_fw_base" &&
+	    echo "sysupgrade done!"
+    fi
+}
+
+register_command "ssh_upgrade" "-h <host> -f <file> [opts]  Install firmware on remote host with SSH"
+
+

iop/scripts/ssh_sysupgrade.sh

@@ -1,56 +0,0 @@
-# this is a developer helper script to install firmware on a remote host with SSH
-
-function usage {
-	echo "usage: $0 ssh_sysupgrade <host> <file> [opts]"
-}
-
-function ssh_sysupgrade {
-	if [ -z "$1" ] ; then
-		usage
-		echo "Error: host required"
-		exit 1
-	fi
-	if [ -z "$2" ] ; then
-		usage
-		echo "Error: firmware filename required"
-		exit 1
-	fi
-	if [ ! -e $2 ] ; then
-		usage
-		echo "Error: firmware file does not exist"
-		exit 1
-	fi
-	IMAGE=`basename $2`
-	echo "sysupgrade host: $1 with file $IMAGE"
-	[ "$2" ] && [ -e "$2" ] && scp $2 root@$1:/tmp/ && ssh -o ConnectTimeout=60 root@$1 "sysupgrade -v $3 /tmp/$IMAGE" && echo "sysupgrade done!"
-}
-
-register_command "ssh_sysupgrade" "<host> <file> [opts]  Install firmware on remote host with SSH"
-
-function ssh_sysupgrade_latest {
-	if [ -z "$1" ] ; then
-		echo "usage: $0 ssh_sysupgrade_latest <host> [opts]"
-		echo "Error: host required"
-		exit 1
-	fi
-	{ cd `dirname $0`
-		IMAGE=`ls -Art bin/*/*/*/*.y[23] | tail -n1`
-		[ "$IMAGE" ] && [ -e "$IMAGE" ] && ./iop ssh_sysupgrade $1 $IMAGE $2
-	}
-}
-
-register_command "ssh_sysupgrade_latest" "<host> [opts]  Install latest ubifs firmware on remote host with SSH"
-
-function ssh_sysupgrade_latest_w {
-	if [ -z "$1" ] ; then
-		echo "usage: $0 ssh_sysupgrade_latest_w <host> [opts]"
-		echo "Error: host required"
-		exit 1
-	fi
-	{ cd `dirname $0`
-		IMAGE=`ls -Art bin/*/*.w | tail -n1`
-		[ "$IMAGE" ] && [ -e "$IMAGE" ] && ./iop ssh_sysupgrade $1 $IMAGE $2
-	}
-}
-
-register_command "ssh_sysupgrade_latest_w" "<host> [opts]  Install latest jffs2 firmware on remote host with SSH"

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 feed_inteno feeds.conf  | awk '{print$2}' | cut -d'_' -f3 | tr '\n' ' ')"
+	ifeeds="$(grep -r 'dev.iopsys.eu' feeds.conf | awk '{print$2}' | tr '\n' ' ')"
 
 	for f in $ifeeds; do
-		commith=$(grep feed_inteno_$f feeds.conf | cut -d'^' -f2)
-		cd $ipath/feeds/feed_inteno_$f
+		commith=$(grep $f feeds.conf | cut -d'^' -f2)
+		cd $ipath/feeds/$f
 		git branch -D $release 2>/dev/null
-		echo "feed_inteno_$f: updating release branch $release to commit $commith"
+		echo "$f: updating release branch $release to commit $commith"
 		git checkout $commith
 		git push origin :$release
 		git checkout -b $release
-		git push origin $release
+		git push --set-upstream origin $release
 		cd $ipath
 	done
 

iop/scripts/update_package.sh

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

iopupgrade/Makefile

@@ -0,0 +1,55 @@
+#
+# 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
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=iopupgrade
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
+
+PKG_SOURCE_VERSION:=01f2afd6c831d6f9eb2940c7e7af16f7e4d439c2
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopupgrade
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+# support parallel build
+PKG_BUILD_PARALLEL:=1
+
+#re create configure scripts if not present.
+PKG_FIXUP:=autoreconf
+
+# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
+# this way we don't need to pick out the resulting files from the build dir.
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/iopupgrade
+	CATEGORY:=Utilities
+	TITLE:=Iopsys system upgrade utility
+	URL:=
+#	DEPENDS:=
+endef
+
+define Package/iopupgrade/description
+	Application handling peripheral
+endef
+
+define Package/iopupgrade/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/iopupgrade $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,iopupgrade))
+ 

iopupgrade/files/sbin/iopu

@@ -0,0 +1,278 @@
+#!/bin/sh
+
+###############################################################################
+# Global variables. can be used directly in any function called.
+cur_vol=""	# num,[0/1]	Number used for ubifs root filesystem volume name.
+		# eg: rootfs_0 or rootfs_1, currently used
+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
+# by functions declared in this script
+chroot_cmdline=""	# command line for the iop_chroot command.
+board=""		# string, Board name that is going to be matched
+			# against header of firmware image
+upd_ubi_id=""		# num,	UBI volume number for the volume name
+			# "rootfs_$upd_vol", use to know what volume to run
+			# ubiupdatevol on.
+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
+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.
+upd_forceboot=0		# set this to force upgrade of boot loader
+###############################################################################
+# import external functions
+source /lib/upgrade/iopsys.sh
+[ -f /lib/upgrade/iopupgrade ] && source /lib/upgrade/iopupgrade
+
+# only call function if it exists
+function_call() {
+    if type "$1" 2>/dev/null >/dev/null
+    then
+	$1 $@
+    fi
+}
+
+###############################################################################
+# Cleanup and error handling functions.
+function log {
+    TIME=$(date)
+    [ $log_stdout -eq 1 ] && echo "$@"
+    echo "[$TIME] $@" >>/tmp/upd_log
+}
+
+# we need to handle ctrl-c, segmentation fault, sigpipe and other abnormal
+# terminations. no printing to stdout/stderr allowed in this function or
+# anyhting it calls as stdout/stderr might no longer exist
+function finish {
+
+    if [ "$run_cleanup" == "1" ]
+    then
+
+	function_call upd_cleanup
+	log ""
+    fi
+
+    if [ "$run_mount_cleanup" == "1" ]
+    then
+	log "Cleaning up after mount"
+	umount_newroot
+    fi
+    # always kill the timeout process, will leave the sleep but that is harmless
+    # as long as the kill will nerver be run.
+    kill $TIMEOUT_PID 2>/dev/null
+
+    lock -u /tmp/iopu.lock
+}
+
+function sig_pipe {
+    log_stdout=0  # stdin,stdout,stderr do not exist anymore
+    log "Got sigpipe. Turning of log printing to stdout"
+}
+
+# if a timout happens terminate
+function timeout {
+    finish
+    exit 1
+}
+
+# Not much that can be done if the mount fails but to try again.
+# if after 10 seconds there still is errors abort program.
+# UBIFS has some wierd time intervall after ubiupdatevol where
+# a mount of the newly written data results in a busy error.
+function mount_retry {
+    local tries=0
+
+    while [ $tries -lt 10 ]
+    do
+	if mount $@ 2>/dev/null
+	then
+	    return
+	fi
+	tries=$((tries + 1))
+	sleep 1
+    done
+
+    log "mount failed for command [mount $@] so upgrade failed."
+
+    exit 1
+}
+
+function mount_newroot {
+    run_mount_cleanup=1
+    mkdir -p /tmp/newroot
+    mkdir -p /tmp/newroot_overlay
+
+    mount_retry -t ubifs ubi0:rootfs_$upd_vol /tmp/newroot
+
+    mount_retry -o noatime,lowerdir=/tmp/newroot,upperdir=/tmp/newroot/overlay,workdir=/tmp/newroot/lib/overlay.tmp -t overlay "overlayfs:/tmp/newroot/overlay" /tmp/newroot_overlay
+    mount_retry --bind /tmp/newroot/ /tmp/newroot_overlay/rom
+
+    mount_retry --bind /dev /tmp/newroot_overlay/dev
+    mount_retry --bind /proc /tmp/newroot_overlay/proc
+    mount_retry --bind /sys /tmp/newroot_overlay/sys
+    mount_retry -t tmpfs -o noatime,mode=0755 root /tmp/newroot_overlay/tmp
+
+    mkdir -p /tmp/newroot_overlay/tmp/oldroot
+    mount_retry --bind / /tmp/newroot_overlay/tmp/oldroot
+    mount_retry --bind /tmp /tmp/newroot_overlay/tmp/oldroot/tmp
+}
+
+function umount_newroot {
+    umount /tmp/newroot_overlay/tmp/oldroot/tmp
+    umount /tmp/newroot_overlay/tmp/oldroot
+    umount /tmp/newroot_overlay/tmp
+    umount /tmp/newroot_overlay/sys
+    umount /tmp/newroot_overlay/proc
+    umount /tmp/newroot_overlay/dev
+    umount /tmp/newroot_overlay/rom
+    umount /tmp/newroot_overlay
+    umount /tmp/newroot
+    run_mount_cleanup=0
+}
+
+function usage {
+    echo "usage: $0 iopu [opts] "
+    echo ""
+    echo "opts:"
+    echo ""
+    echo "	-n	Do not do the final reboot of the target board"
+    echo "	-c	Keep configuration"
+    echo "	-x	Force install even if firmware is not for this board"
+    echo "	-b	Force install of bootloader regardless of version installed"
+    echo "	-r	Jump into chroot env of other system"
+}
+
+###############################################################################
+
+# just one instance
+# this check has to be done before we install handler to avoid removing the
+# lock even if it was not available.
+if  ! lock -n /tmp/iopu.lock
+then
+    echo "Another instance of iopu already running"
+    echo "If you are sure this is wrong remove file /tmp/iopu.lock"
+    exit 1
+fi
+
+trap finish EXIT
+trap timeout SIGALRM
+trap sig_pipe SIGPIPE
+
+while getopts "nrxb" opt; do
+    case $opt in
+	n)
+	    upd_noreboot=1
+	    ;;
+	x)
+	    upd_forceimage=1
+	    ;;
+	b)
+	    upd_forceboot=1
+	    ;;
+	r)
+	    upd_vol=$(get_flashbank_next)
+	    mount_newroot
+	    (ENV=/sbin/iopu_chroot_env chroot /tmp/newroot_overlay /bin/sh)
+	    echo ""
+	    umount_newroot
+	    exit 0
+	    ;;
+	h)
+	    upd_usage
+	    exit 1
+	    ;;
+    esac
+done
+
+# put a timeout on this if it takes longer than 120 seconds we should abort
+# and clean up
+(
+sleep 120	# if 2 minutes pass
+kill -ALRM $$	2>/dev/null # send it a SIGALRM signal
+)&
+TIMEOUT_PID=$!
+
+log "Firmware upgrade started"
+
+# Should board name be checked
+if [ $upd_forceimage -eq 0 ]
+then
+   board=$(db get hw.board.iopVerBoard)
+   cmdline_match="board=$board"
+fi
+
+# find out what rootfs volume is active. 
+cur_vol=$(get_flashbank_current)
+upd_vol=$(get_flashbank_next)
+
+# convert volume name "rootfs_$upd_vol" into ubifs volume id
+upd_ubi_id=$(ubinfo -d 0 -N rootfs_$upd_vol | awk "/Volume ID:/ {print \$3}")
+log "installing Root Fileystem into UBI volume rootfs_$upd_vol"
+
+# prepare to match dsl.
+function_call upd_conf_dsl
+
+# prepare to update CFE if it exists
+function_call upd_conf_cfe
+
+# prepare to update kernel if it is stored in MTD/JFFS2 
+function_call upd_conf_kernel
+
+log "now starting writing data to flash with [ iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id ]"
+run_cleanup=1	# When we start to actually write data there might be some
+		# things that need cleanup if we get an error/crash
+iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id
+
+# in case of any error we abort
+if [ $? -ne 0 ]; then
+    log "iopupgrade program Failed"
+    exit 1
+fi
+
+log "Firmware programmed to flash."
+
+
+log "Transfering configuration to new system."
+
+# Force upgrade of boot loader
+[ $upd_forceboot -eq 1 ] && chroot_cmdline="$chroot_cmdline -b"
+
+mount_newroot
+chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline
+umount_newroot
+
+log "Update fully installed."
+run_cleanup=0
+
+# Now make sure that we actually boot the new system on the next reboot
+upd_finnish
+
+# spawn the reboot to a subshell to allow the main program to quit before reset
+# to avoid any hanged network connection like ssh
+if [ $upd_noreboot -eq 0 ]
+then
+    (
+	log_stdout=0	# stdin,stdout,stderr do not exist anymore, we are in a
+			# subshell and then the trap is no longer working.
+	sleep 1
+	log "Rebooting NOW!!!"
+	log ""
+	reboot
+    )&
+    log "Reboot initiated"
+else
+    log "Skipping reboot"
+fi
+
+
+
+
+
+
+

iopupgrade/files/sbin/iopu_chroot

@@ -0,0 +1,61 @@
+#!/bin/sh
+#
+# This program is intended to be run in a chroot environment where the old system
+# is mounted in /tmp/oldroot
+#
+
+
+###############################################################################
+# Global variables. can be used directly in any function called.
+
+
+###############################################################################
+# file local variables. should not be used in imported functions. Can be used
+# by functions declared in this script
+upd_forceboot=0
+log_stdout=1		# set to 0 to prevent the log to also print to stdout
+
+###############################################################################
+# import external functions
+
+source /lib/upgrade/iopsys.sh
+[ -f /lib/upgrade/iopupgrade ] && source /lib/upgrade/iopupgrade
+
+
+# only call function if it exists
+function_call() {
+    if type "$1" 2>/dev/null >/dev/null
+    then
+	$1 $@
+    fi
+}
+# Cleanup and error handling functions.
+function log {
+    TIME=$(date)
+    [ $log_stdout -eq 1 ] && echo "$@"
+    echo "[$TIME] $@" >>/root/upd_log
+}
+
+
+while getopts "hb" opt; do
+    case $opt in
+	h)
+	    upd_usage
+	    exit 1
+	    ;;
+	b)
+	    upd_forceboot=1
+	    ;;
+	\?)
+	    echo "Invalid option: -$OPTARG" >&2
+	    exit 1
+	    ;;
+    esac
+done
+
+# copy old install log over
+cp /tmp/oldroot/tmp/upd_log /root/upd_log
+
+# Upgrade boot loader if needed.
+function_call upd_program_boot
+

iopupgrade/files/sbin/iopu_chroot_env

@@ -0,0 +1,18 @@
+#!/bin/sh
+# this is run when "iopr -r" is executed.
+# intended to just show what environment is actually started.
+
+cat /etc/banner
+
+echo "/tmp/oldroot:"
+echo "	Contains the running root filesystem. It is live so files are in use"
+echo "	Anything copying/reading files from there needs to make sure it is done safely."
+echo ""
+
+Color_Off='\033[0m'       # Text Reset
+Red='\033[0;31m'          # Red
+
+PS1="${Red}chroot_new${Color_Off}:\w\#"
+export PS1
+export Red
+export Color_Off

libjwt/Makefile

@@ -0,0 +1,52 @@
+
+# Copyright (C) 2018 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libjwt
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=866607c7741421c8ac99876e7201eb32d9af1b92
+PKG_SOURCE_URL:=https://github.com/benmcollins/libjwt.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libjwt
+  CATEGORY:=Libraries
+  DEPENDS:=+libopenssl +jansson
+  TITLE:= libjwt
+endef
+
+
+#TARGET_CFLAGS += \
+#	-I$(STAGING_DIR)/usr/include
+#	-I$(STAGING_DIR)/usr/include/libnl3
+
+#MAKE_FLAGS += \
+#	CFLAGS="$(TARGET_CFLAGS)" \
+#	LDFLAGS="$(TARGET_LDFLAGS)" \
+#	FPIC="$(FPIC)" \
+#	PLATFORM="$(TARGET_PLATFORM)" \
+#	subdirs="$(subdirs)"
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/include/jwt.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libjwt/.libs/libjwt.so* $(1)/usr/lib/
+endef
+
+define Package/libjwt/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libjwt/.libs/libjwt.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libjwt))

ltq-nand/Makefile

@@ -0,0 +1,33 @@
+#
+# 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
+
+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))
+

mqtt-ciotc/Makefile

@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2013 Inteno
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=mqtt-ciotc
+PKG_VERSION:=0.1
+
+PKG_SOURCE_VERSION:=00da3fb1f1691d836037dc4d93e38d0835ba46a4
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifilife-testbed.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/mqtt-ciotc
+	CATEGORY:=Utilities
+	DEPENDS:=+libjwt +lib-paho-mqtt +libopenssl +libubox +ubus +libblobmsg-json
+	TITLE:=mqtt google iot clinet
+endef
+
+define Package/mqtt-ciotc/description
+	mqtt google iot client
+endef
+
+define Package/mqtt-ciotc/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mqtt_ciotc $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,mqtt-ciotc))

mqtt-ciotc/files/etc/config/mqtt_ciotc

@@ -0,0 +1,3 @@
+config certs 'certs'
+	option private '/etc/mqtt-ciotc/rsa_private.pem'
+	option root '/etc/mqtt-ciotc/roots.pem'

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 certs private
+	config_get root certs root
+
+	[ -n $private ] && procd_append_param command --private-cert $private
+	[ -n $root ] && procd_append_param command --root-cert $root
+	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"
+}

ndt/Makefile

@@ -0,0 +1,33 @@
+#
+# This is free software, See /COPYRIGHT for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ndt
+PKG_VERSION:=3.6.4
+PKG_RELEASE:=3
+
+PKG_BUILD_DIR:=${BUILD_DIR}/ndt-$(PKG_VERSION)
+PKG_SOURCE:=ndt-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://software.internet2.edu/sources/ndt
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ndt
+	CATEGORY:=Utilities
+	DEPENDS:=+libpthread +zlib
+	TITLE:=Network Testing Tool
+endef
+
+define Build/Compile/Default
+	$(MAKE) -C $(PKG_BUILD_DIR)
+endef
+
+define Package/ndt/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(CP) $(PKG_BUILD_DIR)/src/web100clt $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,ndt))
+

netmode/Makefile

@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=netmode
 PKG_VERSION:=0.2.0
 
-PKG_SOURCE_VERSION:=82fd6c196a3b990e105cef867a69ce52979b27fa
+PKG_SOURCE_VERSION:=9fa23664b3bdd963e4556f5921c9f9be1c9c578f
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/netmoded
 

netmode/files/etc/config/netmode

@@ -4,6 +4,6 @@ config mode 'setup'
         option curmode 'routed'
 
 config tools 'tools'
-	option wificontrol 1
+	option wificontrol 0
 	option arp_discovery 1
 

netmode/files/etc/hotplug.d/iface/01-netmode-handler

@@ -2,6 +2,9 @@
 
 [ "$INTERFACE" != "wan" ] && exit
 
+automode="$(uci -q get netmode.setup.automode)"
+[ "$automode" == "0" ] && exit
+
 . /lib/functions.sh
 . /lib/functions/network.sh
 . /lib/functions/netmode.sh

netmode/files/etc/netmodes/bridged/wireless

@@ -18,7 +18,7 @@ config wifi-device 'wl0'
 	option bandwidth '80'
 	option hwmode 'auto'
 	option channel 'auto'
-	option scantimer '15'
+	option scantimer '60'
 	option wmm '1'
 	option wmm_noack '0'
 	option wmm_apsd '1'
@@ -60,7 +60,7 @@ config wifi-device 'wl1'
 	option bandwidth '20'
 	option hwmode 'auto'
 	option channel 'auto'
-	option scantimer '15'
+	option scantimer '60'
 	option wmm '1'
 	option wmm_noack '0'
 	option wmm_apsd '1'

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/scripts/post/apply_wet_cfg.sh

@@ -0,0 +1,38 @@
+#if wet in wireless config and SSID nad KEY was saved for it, apply to config
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+parse_wet_json()
+{
+	local interface=$1
+	local mode key encryption ssid connect_bssid
+
+	config_get mode $interface mode
+	[ "$mode" = "wet" ] || return
+
+	json_load "$(cat /tmp/netmodecfg)" 2> /dev/null
+	json_get_var ssid ssid
+	json_get_var key key
+	json_get_var encryption encryption
+	json_get_var connect_bssid connect_bssid
+
+	uci -q set wireless.$1.key="$key"
+	uci -q set wireless.$1.encryption="$encryption"
+	uci -q set wireless.$1.ssid="$ssid"
+	uci -q set wireless.$1.connect_bssid="$connect_bssid"
+	uci commit wireless
+}
+
+apply_wet_cfg()
+{
+	[ -f /tmp/netmodecfg ] || return
+
+	config_load wireless
+	config_foreach parse_wet_json "wifi-iface"
+
+	rm /tmp/netmodecfg 2> /dev/null
+}
+
+apply_wet_cfg

netmode/files/etc/netmodes/repeater_mtk_5g_up_dual_down/scripts/pre/save_wet_cfg.sh

@@ -0,0 +1,38 @@
+#if mode wet in wireless config has SSID Key, save them
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+parse_wet_cfg()
+{
+	local interface=$1
+	local mode key encryption ssid connect_bssid
+
+	config_get mode $interface mode
+	[ "$mode" = "wet" ] || return
+
+	config_get ssid $interface ssid
+	config_get key $interface key
+	config_get encryption $interface encryption
+	config_get connect_bssid $interface connect_bssid
+
+	[ -n "$key" ] || return
+	[ -n "$encryption" ] || return
+
+	json_init
+	json_add_string "ssid" "$ssid"
+	json_add_string "key" "$key"
+	json_add_string "encryption" "$encryption"
+	json_add_string "connect_bssid" "$connect_bssid"
+
+	echo "`json_dump`" > /tmp/netmodecfg
+}
+
+save_wet_cfg()
+{
+	config_load wireless
+	config_foreach parse_wet_cfg "wifi-iface"
+}
+
+save_wet_cfg

netmode/files/etc/netmodes/routed_brcm/wireless

@@ -18,7 +18,7 @@ config wifi-device 'wl0'
 	option bandwidth '80'
 	option hwmode 'auto'
 	option channel 'auto'
-	option scantimer '15'
+	option scantimer '60'
 	option wmm '1'
 	option wmm_noack '0'
 	option wmm_apsd '1'
@@ -60,7 +60,7 @@ config wifi-device 'wl1'
 	option bandwidth '20'
 	option hwmode 'auto'
 	option channel 'auto'
-	option scantimer '15'
+	option scantimer '60'
 	option wmm '1'
 	option wmm_noack '0'
 	option wmm_apsd '1'

netmode/files/etc/netmodes/routed_mtk/wireless

@@ -18,6 +18,7 @@ config wifi-device  ra0
 	option hwmode   auto
 	option htmode   HT20
 	option country 'DE'
+	option scantimer '60'
 
 config wifi-iface
 	option device   ra0
@@ -37,6 +38,7 @@ config wifi-device  rai0
 	option htmode   VHT80
 	option country 'DE'
 	option beamforming 1
+	option scantimer '60'
 
 config wifi-iface
 	option device   rai0

netmode/files/lib/functions/netmode.sh

@@ -180,6 +180,7 @@ switch_netmode() {
 	run_netmode_scripts $curmode "pre"
 
 	logger -s -p user.info -t $0 "[netmode] Copying /etc/netmodes/$curmode in /etc/config" >/dev/console
+
 	for file in $(ls /etc/netmodes/$curmode/); do
 		case "$file" in
 			DETAILS|scripts) continue ;;
@@ -188,6 +189,9 @@ switch_netmode() {
 	done
 	sync
 
+	#commit owsd to reload all init.d scripts dependent on its config
+	ubus call uci commit '{"config":"owsd"}'
+
 	local reboot=$(uci -q get netmode.$curmode.reboot)
 
 	if [ "$reboot" != "0" ]; then
@@ -382,7 +386,9 @@ populate_netmodes() {
 			if json_select acl; then
 				_i=1
 				while json_get_var user $_i; do
+					uci del_list netmode.$mode._access_r="$user"
 					uci del_list netmode.$mode._access_w="$user"
+					uci add_list netmode.$mode._access_r="$user"
 					uci add_list netmode.$mode._access_w="$user"
 					_i=$((_i+1))
 				done

obuspa/Makefile

@@ -0,0 +1,52 @@
+#
+# Copyright (C) 2019 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=obuspa
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=e16b48cbebb1b19d2989833b03cc1aeea5ff4171
+PKG_SOURCE_URL:=git@dev.iopsys.eu:fork/obuspa.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/obuspa
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=USP agent
+  DEPENDS:=+libcoap +libopenssl +libcurl +libsqlite3 +libcares +libubox +libubus +libblobmsg-json
+endef
+
+define Package/obuspa/description
+ OB-USP-AGENT is a system daemon providing a User Services Platform (USP) Agent.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-D_GNU_SOURCE
+
+ifneq ($(CONFIG_USE_MUSL),)
+TARGET_CFLAGS += -DUSE_MUSL
+endif
+
+#define Build/Prepare
+#        $(CP) -rf ./obuspa/* $(PKG_BUILD_DIR)/
+#endef
+
+define Package/obuspa/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -0,0 +1,14 @@
+config controller
+	option endpointid 'self::usp-controller.com'
+
+config mtp
+	option enable 'true'
+	option protocol 'STOMP'
+	option destination 'uspq'
+
+config connection
+	option host 'usp-controller.com'
+	option username 'username'
+	option password 'password'
+	option encryption 'false'
+

obuspa/files/etc/init.d/obuspa

@@ -0,0 +1,105 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+USE_PROCD=1
+
+PROG=/usr/sbin/obuspa
+
+CTRL_PATH="Device.LocalAgent.Controller.1."
+MTP_PATH="Device.LocalAgent.MTP.1."
+CONN_PATH="Device.STOMP.Connection.1."
+
+log() {
+	echo "${@}"|logger -t obuspa -p debug
+}
+
+db_set() {
+	log "DBSET param|${1}| value|${2}|"
+	${PROG} -c dbset ${1} ${2}
+}
+
+validate_controller_section()
+{
+	uci_validate_section obuspa controller "${1}" \
+		'endpointid:string:"self:usp-controller.com"'
+}
+
+validate_mtp_section()
+{
+	uci_validate_section obuspa mtp "${1}" \
+		'enable:bool:true' \
+		'protocol:string:"STOMP"' \
+		'destination:string:'
+}
+
+validate_connection_section()
+{
+	uci_validate_section obuspa connection "${1}" \
+		'host:string:"usp-controller.com"' \
+		'username:string:username' \
+		'password:string:password' \
+		'encryption:bool:true'
+}
+
+configure_controller() {
+	local endpointid
+
+	validate_controller_section "${1}" || {
+		log "Validation of section failed"
+		return 1;
+	}
+	db_set "${CTRL_PATH}EndpointID" ${endpointid}
+}
+
+configure_mtp() {
+	local protocol enable destination
+
+	validate_mtp_section "${1}" || {
+		log "Validation of section failed"
+		return 1;
+	}
+	db_set "${MTP_PATH}Enable" ${enable}
+	db_set "${MTP_PATH}Protocol" ${protocol}
+	db_set "${MTP_PATH}STOMP.Destination" ${destination}
+}
+
+configure_connection() {
+	local host username password encryption
+
+	validate_connection_section "${1}" || {
+		log "Validation of section failed"
+		return 1;
+	}
+	db_set "${CONN_PATH}Host" ${host}
+	db_set "${CONN_PATH}Username" ${username}
+	db_set "${CONN_PATH}Password" ${password}
+	db_set "${CONN_PATH}X_ARRIS-COM_EnableEncryption" ${encryption}
+}
+
+db_init() {
+	[ -f /tmp/usp.db ] && rm -f /tmp/usp.db
+
+	config_load obuspa
+	config_foreach configure_controller controller
+	config_foreach configure_mtp mtp
+	config_foreach configure_connection connection
+}
+start_service() {
+	db_init
+
+	procd_open_instance
+	procd_set_param command ${PROG}
+	procd_append_param command -p -v 4
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_config_trigger "config.change" "obuspa"  /etc/init.d/obuspa restart
+}
+

owsd/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Inteno
+# Copyright (C) 2018 iopsys
 #
 
 include $(TOPDIR)/rules.mk
@@ -10,10 +10,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=b3f52463a50d56af80bfd8b3f63960885379f150
+PKG_SOURCE_VERSION:=f0eedeb6fd061edf3784d6bf86fa60b176bf3fe7
 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_CONFIG_DEPENDS:=CONFIG_OWSD_USE_DBUS CONFIG_OWSD_USE_UBUS CONFIG_OWSD_USE_DBUS_UBUS

owsd/files/owsd.init

@@ -308,10 +308,10 @@ start_service() {
 	procd_close_instance
 }
 
-stop_service()
-{
-	service_stop ${PROG}
-}
+#stop_service()
+#{
+#	service_stop ${PROG}
+#}
 
 reload_service() {
         stop

paho-mqtt-c/Makefile

@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2013 Inteno
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=lib-paho-mqtt
+PKG_VERSION:=0.1
+
+PKG_SOURCE_VERSION:=9f715d0862a8e16099b5837c4e53a1bf6a6a0675
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/eclipse/paho.mqtt.c.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lib-paho-mqtt
+	CATEGORY:=Libraries
+	DEPENDS:=+libopenssl
+	TITLE:=package for mqtt stuff
+endef
+
+
+define Package/lib-paho-mqtt/description
+	a library
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/*.h $(1)/usr/include/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/output/*.so* $(1)/usr/lib/
+endef
+
+define	Package/lib-paho-mqtt/install
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/build/output/*.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,lib-paho-mqtt))

peripheral_manager/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=fe43108d986a02d3a14f079d58bfa666c1089471
+PKG_SOURCE_VERSION:=769430115b6dd984313574c3fa2a6d99c65cd223
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager
 

questd/Makefile

@@ -1,14 +1,14 @@
 #
-# Copyright (C) 2013 Inteno
+# Copyright (C) 2013-2019 iopsys
 #
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=3.1.40
+PKG_VERSION:=4.0.1
 
-PKG_SOURCE_VERSION:=7a0a7427d339736e3ee555e816d40c985651632c
+PKG_SOURCE_VERSION:=d19501b6f80ef649b2ffd2f87132df885ce4581f
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 
@@ -27,7 +27,7 @@ else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
 QUESTD_TARGET:=-DIOPSYS_MARVELL
 else ifeq ($(CONFIG_TARGET_intel_mips),y)
 # BUG FIXME the Intel mips target is not handled in questd this is just to get it to compile
-QUESTD_TARGET:=-DIOPSYS_BROADCOM
+QUESTD_TARGET:=-DIOPSYS_INTEL
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
 QUESTD_TARGET:=-DIOPSYS_MEDIATEK
 QUESTD_CFLAGS:=\

rulengd/Makefile

@@ -1,21 +1,20 @@
 #
-# Copyright (C) 2018 Inteno
+# Copyright (C) 2018 iopsys
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rulengd
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.1.0
 PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
-PKG_SOURCE_VERSION:=99881f39232154530ac129dc2109d78963017ad1
+PKG_SOURCE_VERSION:=63569245b62d90d3106cc826f2d2b18f51c0b885
 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
 

samba3/files/samba.init

@@ -11,6 +11,11 @@ useradd()
 	local password
 	config_get user $1 user
 	config_get password $1 password
+
+        filter="0A;5C 6E"
+        [ "$(hex_filter "$user" "$filter" 1)" = "" ] || return
+        [ "$(hex_filter "$password" "$filter" 1)" = "" ] || return
+
 	if ! $(grep -rq "^$user:" /etc/passwd) ; then
 		echo "adding user $user"
 		adduser $user -s /bin/false -D -H -h /mnt/$user -g "samba,pass=$password" && smbpasswd $user $password
@@ -51,6 +56,46 @@ purgepasswd()
 	done
 }
 
+hex_filter() {
+	local string=$1
+	local hex_chars=$2
+	local wc_max=$3
+	local wc_tot=0
+
+	if [ -z "$string" -o -z "$hex_chars" -o -z "$wc_max" ]
+	then
+		return;
+	fi
+
+	dump=$(echo "$string" | hexdump -v -e '32/1 "%02X ""\n"')
+
+	IFS=';'
+	for i in $hex_chars;
+	do
+		local filtered
+
+		IFS=' '
+		filtered=${dump//$i/}
+
+		set -- $i
+		divider=$#
+
+		set -- $dump
+		start=$#
+
+		set -- $filtered
+		end=$#
+
+		wc=$((start-end))
+		wc=$((wc/divider))
+
+		[ $wc -eq 0 ] || wc_tot=$((wc_tot+wc))
+		IFS=';'
+	done
+
+	[ $wc_tot -gt $wc_max ] && echo "corrupt"
+}
+
 smb_header() {
 	local interface
 	config_get interface $1 interface
@@ -80,11 +125,12 @@ smb_header() {
 	config_get description $1 description "Samba on ${hostname:-OpenWrt}"
 	config_get charset     $1 charset     "UTF-8"
 
-	name=`echo -e "$name" | head -1`
-	workgroup=`echo -e "$workgroup" | head -1`
-	description=`echo -e "$description" | head -1`
-	interfaces=`echo -e "$interfaces" | head -1`
-	charset=`echo -e "$charset" | head -1`
+	filter="0A;5C 6E"
+	[ "$(hex_filter "$name" "$filter" 1)" = "" ] || exit
+	[ "$(hex_filter "$workgroup" "$filter" 1)" = "" ] || exit
+	[ "$(hex_filter "$description" "$filter" 1)" = "" ] || exit
+	[ "$(hex_filter "$interfaces" "$filter" 1)" = "" ] || exit
+	[ "$(hex_filter "$charset" "$filter" 1)" = "" ] || exit
 
 	mkdir -p /var/etc
 	sed -e "s#|NAME|#$name#g" \
@@ -144,13 +190,22 @@ smb_add_share() {
 	path=$(readlink -f $path)
 	[ "${path:0:4}" == "/mnt" ] || path="/mnt/"
 
-	echo -e "\n[$name]\n\tpath = ${path%%\\n*}" >> /var/etc/smb.conf
-	[ -n "$users" ] && echo -e "\tvalid users = $users" | head -1 >> /var/etc/smb.conf
-	[ -n "$read_only" ] && echo -e "\tread only = $read_only" | head -1 >> /var/etc/smb.conf
-	[ -n "$guest_ok" ] && echo -e "\tguest ok = $guest_ok" | head -1 >> /var/etc/smb.conf
-	[ -n "$create_mask" ] && echo -e "\tcreate mask = $create_mask" | head -1 >> /var/etc/smb.conf
-	[ -n "$dir_mask" ] && echo -e "\tdirectory mask = $dir_mask" | head -1 >> /var/etc/smb.conf
-	[ -n "$browseable" ] && echo -e "\tbrowseable = $browseable" | head -1 >> /var/etc/smb.conf
+	filter="0A;5C 6E"
+	[ "$(hex_filter "$name" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$users" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$read_only" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$guest_ok" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$create_mask" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$dir_mask" "$filter" 1)" = "" ] || return
+	[ "$(hex_filter "$browseable" "$filter" 1)" = "" ] || return
+
+	echo -e "\n[$name]\n\tpath = $path" >> /var/etc/smb.conf
+	[ -n "$users" ] && echo -e "\tvalid users = $users" >> /var/etc/smb.conf
+	[ -n "$read_only" ] && echo -e "\tread only = $read_only" >> /var/etc/smb.conf
+	[ -n "$guest_ok" ] && echo -e "\tguest ok = $guest_ok" >> /var/etc/smb.conf
+	[ -n "$create_mask" ] && echo -e "\tcreate mask = $create_mask" >> /var/etc/smb.conf
+	[ -n "$dir_mask" ] && echo -e "\tdirectory mask = $dir_mask" >> /var/etc/smb.conf
+	[ -n "$browseable" ] && echo -e "\tbrowseable = $browseable" >> /var/etc/smb.conf
 }
 
 start_service() {

syslog-ng3/Makefile

@@ -1,72 +0,0 @@
-#
-# Copyright (C) 2006-2011 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:=syslog-ng
-PKG_VERSION:=3.0.5
-PKG_RELEASE:=5
-
-PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$(PKG_VERSION)/source/
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=28f0d9ff2243b330e8cd6311ef9b2f12
-
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_IPV6 \
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/syslog-ng3
-  SECTION:=admin
-  CATEGORY:=Administration
-  DEPENDS:=+libpcre +glib2 +libeventlog +libopenssl +libwrap +libpthread +librt +zlib +libdbi
-  TITLE:=A powerful syslog daemon
-  URL:=http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/
-endef
-
-define Package/syslog-ng3/description
-  syslog-ng reads and logs messages to the system console, log
-  files, other machines and/or users as specified by its
-  configuration file.
-endef
-
-define Package/syslog-ng3/conffiles
-/etc/syslog-ng.conf
-endef
-
-define Build/Configure
-	$(SED) 's,-I/usr/include,,' $(PKG_BUILD_DIR)/configure
-	$(Build/Configure/Default)
-endef
-
-CONFIGURE_ARGS +=  \
-	$(call autoconf_bool,CONFIG_IPV6,ipv6) \
-	--disable-dependency-tracking \
-	--enable-tcp-wrapper \
-	--disable-glibtest \
-	--disable-spoof-source \
-	--disable-sql \
-	--enable-prce \
-	--disable-linux-caps \
-
-TARGET_CPPFLAGS += \
-	-I$(STAGING_DIR)/usr/include/eventlog
-
-CONFIGURE_VARS += \
-	LIBDBI_CFLAGS="-I$(STAGING_DIR)/usr/include"
-
-define Package/syslog-ng3/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/syslog-ng $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/syslog-ng.init $(1)/etc/init.d/syslog-ng
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DATA) ./files/syslog-ng.conf $(1)/etc
-endef
-
-$(eval $(call BuildPackage,syslog-ng3))

syslog-ng3/files/syslog-ng.conf

@@ -1,37 +0,0 @@
-@version:3.0
-
-options {
-	chain_hostnames(no);
-	create_dirs(yes);
-	flush_lines(0);
-	keep_hostname(yes);
-	log_fifo_size(256);
-	log_msg_size(1024);
-	stats_freq(0);
-	flush_lines(0);
-	use_fqdn(no);
-};
-
-source src {
-	internal();
-	unix-stream("/dev/log");
-};
-
-source net {
-	udp(ip(0.0.0.0) port(514));
-};
-
-source kernel {
-        file("/proc/kmsg" program_override("kernel"));
-};
-
-destination messages {
-	file("/var/log/messages");
-};
-
-log {
-	source(src);
-	source(net);
-        source(kernel);
-	destination(messages);
-};

syslog-ng3/files/syslog-ng.init

@@ -1,19 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006-2011 OpenWrt.org
-
-START=50
-
-SERVICE_USE_PID=1
-
-start() {
-	[ -f /etc/syslog-ng.conf ] || return 1
-	service_start /usr/sbin/syslog-ng
-}
-
-stop() {
-	service_stop /usr/sbin/syslog-ng
-}
-
-reload() {
-	service_reload /usr/sbin/syslog-ng
-}

syslog-ng3/patches/001-fix-libconv_so_2-not-found-error

@@ -1,12 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -7357,6 +7357,9 @@ dynamic_threads () {
- 	esac
- }
- 
-+GLIB_LIBS="-Wl,-rpath-link=$STAGING_DIR/usr/lib/libiconv-full/lib $GLIB_LIBS"
-+LIBS="-Wl,-rpath-link=$STAGING_DIR/usr/lib/libiconv-full/lib $LIBS"
-+
- case "$ostype" in
- 	FreeBSD)
- 		GLIB_LIBS="$GLIB_LIBS -lintl"

topologyd/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Inteno
+# Copyright (C) 2018 iopsys
 #
 
 include $(TOPDIR)/rules.mk
@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=topologyd
 PKG_VERSION:=0.1
 
-PKG_SOURCE_VERSION:=b520fe65d2469ff52cc70328fce753f67cf998e5
+PKG_SOURCE_VERSION:=23b812bb512189487484182ab736e957d54da9f3
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/topologyd.git
 

topologyd/files/etc/init.d/topologyd

@@ -17,7 +17,7 @@ start_service() {
 	fi
 
 	procd_set_param respawn
-	procd_set_param stdout 1
+#	procd_set_param stdout 1
 	procd_set_param stderr 1
 	procd_close_instance
 }

uboot/Makefile

@@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 
 ifdef CONFIG_TARGET_intel_mips
 PKG_SOURCE_URL:=git@dev.iopsys.eu:intel/uboot.git
-PKG_SOURCE_VERSION:=b3bc3af5831f14d9cd4d983522bc45a1fd9fa26c
+PKG_SOURCE_VERSION:=15e223e20e5680bc446e84b4d8b5bce06b45fb1b
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
 PKG_SOURCE_VERSION:=3ef2ba866a99205496e0ce01935c89a1778d9b85
@@ -59,21 +59,30 @@ define uboot/grx500
   TITLE:=U-Boot for the grx
   UBOOT_IMG:=u-boot-nand.bin
   DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=5
+  PKG_RELEASE:=10
 endef
 
+# obsolete: no longer supported
 define uboot/grx500_speedport_smart3
   TITLE:=U-Boot for the Speedport Smart3
   UBOOT_IMG:=u-boot-nand.bin
   DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=5
+  PKG_RELEASE:=7
+endef
+
+define uboot/grx500_norrland
+  TITLE:=U-Boot for Norrland Board
+  UBOOT_IMG:=u-boot-nand.bin
+  DEPENDS:=@TARGET_intel_mips
+  PKG_RELEASE:=11
 endef
 
 UBOOTS := \
 	ex400 \
 	sdx810_ap \
 	grx500 \
-	grx500_speedport_smart3
+	grx500_speedport_smart3 \
+	grx500_norrland
 
 define Package/uboot/template
 define Package/uboot-$(1)
@@ -95,13 +104,14 @@ ifdef BUILD_VARIANT
 $(eval $(call uboot/$(BUILD_VARIANT)))
 UBOOT_CONFIG:=$(if $(CONFIG),$(CONFIG),$(BUILD_VARIANT))
 UBOOT_IMAGE:=$(if $(IMAGE),$(IMAGE),openwrt-$(BOARD)-$(BUILD_VARIANT)-u-boot.bin)
+UBOOT_IOPSYS_VERSION:=$(PKG_RELEASE)
 endif
 
 define Build/Configure
 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		$(UBOOT_CONFIG)_config
 
-	$(SED) "s,CONFIG_INTENO_MAJOR=\"0\",CONFIG_INTENO_MAJOR=\"$(PKG_RELEASE)\"," $(PKG_BUILD_DIR)/.config
+	$(SED) "s,CONFIG_INTENO_MAJOR=\"0\",CONFIG_INTENO_MAJOR=\"$(UBOOT_IOPSYS_VERSION)\"," $(PKG_BUILD_DIR)/.config
 
 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		oldconfig
@@ -114,8 +124,13 @@ define Build/Compile
 		CROSS_COMPILE=$(TARGET_CROSS) env
 endef
 
+# don't install /etc/init.d/uboot for intel-mips as it's not needed
 define Package/uboot/install/default
-	$(CP) ./files/* $$(1)/
+	$(INSTALL_DIR) $$(1)/lib/upgrade
+	$(CP) ./files/uboot-upgrade $$(1)/lib/upgrade/
+	$(if $(CONFIG_TARGET_intel_mips), ,$(INSTALL_DIR) $$(1)/etc/init.d)
+	$(if $(CONFIG_TARGET_intel_mips), ,$(CP) ./files/uboot $$(1)/etc/init.d/)
+
 	$(INSTALL_DIR) $(BIN_DIR)/$(TARGET)
 	$(INSTALL_DIR) $$(1)/boot
 	$(CP) \

uboot/files/uboot

@@ -0,0 +1,8 @@
+#!/bin/sh /etc/rc.common
+
+START=50
+
+start() {
+	. /lib/upgrade/uboot-upgrade
+	uboot_upgrade /boot/uboot.img
+}

uboot/files/uboot-upgrade

@@ -1,10 +1,6 @@
-#!/bin/sh /etc/rc.common
-
-START=50
 
 . /usr/share/libubox/jshn.sh
 
-
 sanity_check_env(){
 
     # make sure iboot is used to start board, but only if verify_boot != 1
@@ -26,25 +22,35 @@ sanity_check_env(){
     fw_setenv baudrate 115200
 }
 
-uboot_upgrade(){
+do_uboot_upgrade(){
     local u_ver
     echo "doing upgrade of u-boot old version $cur_Major.$cur_Minor new version $Major.$Minor"
     mtd erase /dev/mtd0
-    mtd write /boot/uboot.img /dev/mtd0
+    mtd write $1 /dev/mtd0
     u_ver=$(strings  /dev/mtd0 | grep 938f0820-2ffb-11e7-bbc9-2f21351ee6fb)
     [ -n "$u_ver" ] && fw_setenv uboot_inteno_version "$u_ver"
     sanity_check_env
 }
 
 
-start() {
+# Return:
+# 0: update is successfull
+# 1: update is not needed
+# 2: error occured
+uboot_upgrade() {
+    [ ! -f $1 ] && return 2
+
     iver=$(fw_printenv -n uboot_inteno_version 2>/dev/null)
 
+    # Fixup improper json string for major and minor key.
+    # this adds the missing "
+    iver=$(echo $iver | sed -e 's/{Major:/{"Major":/' | sed -e 's/,Minor:/,"Minor":/')
+    
     if [ -z "$iver" ]
     then
 	# if this variable is not set by u-boot the u-boot version is too old.
-	uboot_upgrade
-	return
+	do_uboot_upgrade $1
+	return 0
     fi
 
     # read in current version into Major Minor variables
@@ -59,7 +65,7 @@ start() {
     cur_Minor=$Minor
 
     # read in new uboot version into Major Minor variables
-    json_load $(strings /boot/uboot.img | grep 938f0820-2ffb-11e7-bbc9-2f21351ee6fb |sed -e 's/938f0820-2ffb-11e7-bbc9-2f21351ee6fb: //')
+    json_load $(strings $1 | grep 938f0820-2ffb-11e7-bbc9-2f21351ee6fb |sed -e 's/938f0820-2ffb-11e7-bbc9-2f21351ee6fb: //')
     json_get_vars Major Minor
 
 #    echo "Major $Major"
@@ -67,14 +73,15 @@ start() {
     
     if [ $Major -gt $cur_Major ]
     then
-	uboot_upgrade
-	return
+	do_uboot_upgrade $1
+	return 0
     fi
 
     if [ $Major -eq $cur_Major -a $Minor -gt $cur_Minor ]
     then
-	uboot_upgrade
-	return
+	do_uboot_upgrade $1
+	return 0
     fi
-}
 
+    return 1
+}

uspd/Makefile

@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2019 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=uspd
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=e9aa8a42f1da90b44fbd6bca3f4131a24fe79efb
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/uspd
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=USP ubus backend
+  DEPENDS:=+libubox +ubus +icwmp-curl
+endef
+
+define Package/uspd/description
+ Ubus based backend for TR-369/USP which can be used by other USP agents
+ running on top of it.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-D_GNU_SOURCE
+
+#define Build/Prepare
+#        $(CP) -rf ./uspd/* $(PKG_BUILD_DIR)/
+#endef
+
+define Package/uspd/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/uspd.init $(1)/etc/init.d/uspd
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uspd $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,uspd))

uspd/files/uspd.init

@@ -0,0 +1,19 @@
+#!/bin/sh /etc/rc.common
+
+START=94
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/uspd
+
+start_service() {
+	procd_open_instance
+	procd_set_param command ${PROG}
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}

voice-client/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 Inteno
+# Copyright (C) 2014 iopsys
 #
 
 include $(TOPDIR)/rules.mk
@@ -11,6 +11,19 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+VOICE_LIB:=broadcom.sh
+else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
+VOICE_LIB:=broadcom.sh
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+VOICE_LIB:=intel.sh
+else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+VOICE_LIB:=broadcom.sh
+else
+$(info (UNEXPECTED CONFIG TARGET))
+VOICE_LIB:=broadcom.sh
+endif
+
 define Package/voice-client
   SUBMENU:=Telephony
   SECTION:=net
@@ -32,7 +45,26 @@ define Build/Compile
 endef
 
 define Package/voice-client/install
-	$(CP) ./files/* $(1)/
+	$(CP) ./files/etc $(1)/
+	$(CP) ./files/sbin $(1)/
+	$(CP) ./files/usr $(1)/
+	mkdir -p $(1)/lib/voice
+	$(CP) ./files/lib/cw.sh $(1)/lib/.
+	$(CP) ./files/lib/voice/$(VOICE_LIB) $(1)/lib/voice/voicelib.sh
+
+ifeq ($(CONFIG_TARGET_intel_mips),y)
+	sed -i \
+	-e 's/brcm/tapi/g' \
+	-e 's/BRCM/TAPI/g' \
+	-e 's/broadcom/intel/g' \
+	$(1)/etc/config/voice_client \
+	$(1)/etc/asterisk_templates/*
+	sed -i \
+	-e '/echo_cancel/d' \
+	-e "/config.*tel_advanced.*TEL/a \        option 'echo_cancel' '1'" \
+	$(1)/etc/config/voice_client
+
+endif
 endef
 
 $(eval $(call BuildPackage,voice-client))

voice-client/files/etc/asterisk_templates/acl.conf.TEMPLATE

@@ -0,0 +1,80 @@
+;
+; Named Access Control Lists (ACLs)
+;
+; A convenient way to share acl definitions
+;
+; This configuration file is read on startup
+;
+; CLI Commands
+; -----------------------------------------------------------
+;   acl show                         Show all named ACLs configured
+;   acl show <name>                  Show contents of a particular named ACL
+;   reload acl                       Reload configuration file
+;
+; Any configuration that uses ACLs which has been made to be able to use named
+; ACLs will specify a named ACL with the 'acl' option in its configuration in
+; a similar fashion to the usual 'permit' and 'deny' options. Example:
+; acl=my_named_acl
+;
+; Multiple named ACLs can be applied by either comma separating the arguments or
+; just by adding additional ACL lines. Example:
+; acl=my_named_acl
+; acl=my_named_acl2
+;
+; or
+;
+; acl=my_named_acl,my_named_acl2
+;
+; ACLs specified by name are evaluated independently from the ACL specified via
+; permit/deny. In order for an address to pass a given ACL, it must pass both
+; the ACL specified by permit/deny for a given item as well as any named ACLs
+; that were specified.
+;
+;[example_named_acl1]
+;deny=0.0.0.0/0.0.0.0
+;permit=209.16.236.0
+;permit=209.16.236.1
+;
+;[example_named_acl2]
+;permit=0.0.0.0/0.0.0.0
+;deny=10.24.20.171
+;deny=10.24.20.103
+;deny=209.16.236.1
+;
+; example_named_acl1 above shows an example of whitelisting. When whitelisting, the
+; named ACLs should follow a deny that blocks everything (like deny=0.0.0.0/0.0.0.0)
+; The following example explains how combining the ACLs works:
+; <in another configuration>
+; [example_item_with_acl]
+; acl=example_named_acl1
+; acl=example_named_acl2
+;
+; Suppose 209.16.236.0 tries to communicate and the ACL for that example is applied to it...
+; First, example_named_acl1 is evaluated. The address is allowed by that ACL.
+; Next, example_named_acl2 is evaluated. The address isn't blocked by example_named_acl2
+; either, so it passes.
+;
+; Suppose instead 209.16.236.1 tries to communicate and the same ACL is applied.
+; First, example_named_acl1 is evaluated and the address is allowed.
+; However, it is blocked by example_named_acl2, so the address is blocked from the combined
+; ACL.
+;
+; Similarly, the permits/denies in specific configurations that make up an ACL definition
+; are also treated as a separate ACL for evaluation. So if we change the example above to:
+; <in another configuration>
+; [example_item_with_acl]
+; acl=example_named_acl1
+; acl=example_named_acl2
+; deny=209.16.236.0
+;
+; Then 209.16.236.0 will be rejected by the non-named component of the combined ACL even
+; though it passes the two named components.
+;
+;
+; Named ACLs can use ipv6 addresses just like normal ACLs.
+;[ipv6_example_1]
+;deny = ::
+;permit = ::1/128
+;
+;[ipv6_example_2]
+;permit = fe80::21d:bad:fad:2323