json-editor: update pkg to include warning fixes

after the software is upgraded a new symlink needs to be created'
to the certificate that ICWMP uses for encrypted traffic

ated/Makefile

@@ -1,9 +1,16 @@
-#
-# Copyright (C) 2016 inteno
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
+/* 
+ * Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
+ *
+ *
+ * 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.
+ */
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -14,12 +21,15 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_VERSION:=f614cba983d827d5185c60a6a5a35530621d44d2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/ated
+PKG_SOURCE_URL:=https://dev.iopsys.eu/mediatek/ated.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 #PKG_BUILD_PARALLEL:=1
 

bashdb/Makefile

@@ -13,6 +13,9 @@ PKG_MD5SUM:=b72c17870bfab2fd791b1f6de4d79f9e
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)

bbf/Config_bbfdm.in

@@ -0,0 +1,27 @@
+if PACKAGE_libbbfdm
+
+config LIBBBFDM_VENDOR_PREFIX
+    string "Vendor Prefix"
+    default "X_IOPSYS_EU_"
+
+config BBF_TR181
+	bool "Compile with tr181 device features"
+	default y
+
+config BBF_TR104
+	bool "Compile with tr104 voice features"
+	default y
+
+config BBF_TR143
+	bool "Compile with tr143 diagnostics features"
+	default y
+
+config BBF_TR157
+	bool "Compile with tr157 bulkdata collector features"
+	default y
+	
+config BBF_TR064
+	bool "Compile with tr064 features"
+	default n
+
+endif

bbf/Makefile

@@ -0,0 +1,87 @@
+#
+# Copyright (C) 2019 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libbbfdm
+PKG_VERSION:=1.0-2019-10-01
+PKG_FIXUP:=autoreconf
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=b3bae9df19df35075ac52f53758288d8e0573790
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libbbfdm
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library for broadband-forum data model
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace
+endef
+
+define Package/libbbfdm/config
+	source "$(SOURCE)/Config_bbfdm.in"
+endef
+
+define Package/libbbfdm/description
+ Test description will update later.
+endef
+
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBBBFDM_VENDOR_PREFIX)\\\"
+
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE -D_AADJ
+
+ifeq ($(CONFIG_BBF_TR181),y)
+CONFIGURE_ARGS += \
+	--enable-tr181
+endif
+
+ifeq ($(CONFIG_BBF_TR104),y)
+CONFIGURE_ARGS += \
+	--enable-tr104
+endif
+
+ifeq ($(CONFIG_BBF_TR143),y)
+CONFIGURE_ARGS += \
+	--enable-tr143
+endif
+
+ifeq ($(CONFIG_BBF_TR157),y)
+CONFIGURE_ARGS += \
+	--enable-tr157
+endif
+
+ifeq ($(CONFIG_BBF_TR064),y)
+CONFIGURE_ARGS += \
+	--enable-tr064
+endif
+
+define Package/libbbfdm/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
+	$(INSTALL_DIR) $(1)/etc/bbfdm
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/bbfdm
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm
+	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/bbfdm
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
+	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
+	$(CP) $(PKG_BUILD_DIR)/dmtree/tr181/*.h $(1)/usr/include/libbbfdm/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libbbfdm))

bbk_cli/Makefile

@@ -0,0 +1,42 @@
+#
+# Copright (C) 2018 The Internet Foundation In Sweden
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bbk_cli
+PKG_SOURCE_VERSION:=7b810a696c78b746185c11282bdbe3fb7f8c5d4b
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/dotse/bbk.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/bbk_cli
+	CATEGORY:=Utilities
+	DEPENDS:=+libpthread +libstdcpp
+	TITLE:=Bredbandskollen CLI - A bandwidth measurement tool
+endef
+
+define Package/bbk_cli/description
+	To measure connection speed in an environment that is missing a web browser, 
+	for example, in a server, you can use our command line interface bbk_cli, 
+	which is available for some of the most common operating systems.
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR)/src/cli CROSS_COMPILE="$(TARGET_CROSS)"
+endef
+
+define Package/bbk_cli/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/cli/cli $(1)/sbin/bbk_cli
+endef
+
+$(eval $(call BuildPackage,bbk_cli))

bbk_cli/patches/0001-add-openwrt-cross-compile-support.patch

@@ -0,0 +1,25 @@
+diff --git a/src/framework/engine.h b/src/framework/engine.h
+index 57a48ad..9e1bc36 100644
+--- a/src/framework/engine.h
++++ b/src/framework/engine.h
+@@ -10,6 +10,7 @@
+ #include <map>
+ #include <vector>
+ #include <string>
++#include <sys/select.h>
+ 
+ #include "logger.h"
+ 
+diff --git a/src/framework/mk.inc b/src/framework/mk.inc
+index 793e211..13275be 100644
+--- a/src/framework/mk.inc
++++ b/src/framework/mk.inc
+@@ -7,7 +7,7 @@ OS:=$(shell uname)
+ CXXFLAGS += -O2 -W -Wall -I$(DIRLEVEL)
+ 
+ ifeq ($(OS),Linux)
+-CXX = g++
++CXX = $(CROSS_COMPILE)g++
+ endif
+ 
+ ifeq ($(OS),Darwin)

bootchart2/Makefile

@@ -18,6 +18,9 @@ PKG_SOURCE_VERSION:=3ab81137cafe25c2ca4bc3a5f322a63646f9ce8d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/bootchart2

catv/Makefile

@@ -1,9 +1,19 @@
+#
+# Copyright (C) 2018 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=catv
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/catv

crashlog/Makefile

@@ -1,9 +1,18 @@
+#
+# Copyright (C) 2019 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=crashlog
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
 
 include $(INCLUDE_DIR)/package.mk
 

dectmngr2/Makefile

@@ -1,19 +1,20 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2019 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=1.2.0
-PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
+PKG_VERSION:=1.3.0
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=877fcbd58d0ead82dbbc4c65f0ad7f8c938fcf74
+PKG_SOURCE_VERSION:=2c8990fd5275d469e8ab6c7a99e17fe0a56052ea
 PKG_NAME:=dectmngr2
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
 
 RSTRIP:=true
 export BUILD_DIR
@@ -29,7 +30,7 @@ define Package/dectmngr2
   CATEGORY:=Utilities
   TITLE:=Dectmngr2
   URL:=
-  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus
+  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent
 endef
 
 define Package/dectmngr2/description
@@ -42,6 +43,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 +51,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,81 @@
+#
+# Copyright (C) 2018 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dslmngr
+PKG_VERSION:=1.0.0
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=7522faab4142fe2c0ac8cbf71bb0cc5bd49f0750
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
+
+include $(INCLUDE_DIR)/package.mk
+
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+  TARGET_PLATFORM=BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+  TARGET_PLATFORM=BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+  TARGET_PLATFORM=MEDIATEK
+else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
+  TARGET_PLATFORM=MARVELL
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+  TARGET_PLATFORM=INTEL
+else
+  $(info Unexpected CONFIG_TARGET)
+endif
+
+export TARGET_PLATFORM
+
+define Package/dslmngr
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=XDSL status and configration utility
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +easy-soc-libs
+endef
+
+define Package/dslmngr/description
+ This package can be used to configure and provide status about
+ the XDSL subsystem through UBUS.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)"
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	rsync -r --exclude=.* ~/git/dslmngr/ $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Build/Compile
+	+$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
+endef
+
+define Package/dslmngr/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,dslmngr))

easy-qos/Makefile

@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2019 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# 
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=easy-qos
+PKG_VERSION:=1.1
+PKG_RELEASE:=0
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=none
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/easy-qos
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Easy QoS
+  DEPENDS:=@(TARGET_intel_mips||TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_brcm63xx_mips)
+endef
+
+define Package/easy-qos/description
+	This package contains Easy QoS utility
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./files/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+endef
+
+define Package/easy-qos/install
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(CP) ./files/etc/config/easy_qos $(1)/etc/config/
+ifeq ($(CONFIG_TARGET_intel_mips),y)
+	$(CP) ./files/etc/init.d/easy_qos.classcfg $(1)/etc/init.d/easy_qos
+else
+	$(CP) ./files/etc/init.d/easy_qos.iptables $(1)/etc/init.d/easy_qos
+endif
+	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
+	$(CP) ./files/etc/firewall.easyqos $(1)/etc/firewall.easyqos
+endef
+
+$(eval $(call BuildPackage,easy-qos))

easy-qos/files/etc/firewall.easyqos

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

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

@@ -0,0 +1,165 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+USE_PROCD=1
+
+RULE_LIST="/tmp/easy_qos_rule.list"
+BRIDGE_INTF=""
+
+[ -f /etc/profile.d/intel.sh ] && {
+	. /etc/profile.d/intel.sh
+	sh /etc/profile.d/intel.sh
+}
+
+log() {
+	echo "${@}"|logger -t easy_qos_class -p debug
+}
+
+exec_log() {
+	${@} |grep -i successful
+	if [ "${?}" -ne 0 ]; then
+		log "Failed to create ${@}";
+		return 1
+	fi
+	return 0
+}
+
+get_priority() {
+	local prio=$(echo $1|tr [A-Z] [a-z]);
+	case "${prio}" in
+		"lowest")
+			echo 8;;
+		"low")
+			echo 7;;
+		"besteffort")
+			echo 6;;
+		"normal")
+			echo 5;;
+		"video")
+			echo 4;;
+		"medium")
+			echo 3;;
+		"high")
+			echo 2;;
+		"highest")
+			echo 1;;
+	esac
+}
+
+is_lan_bridge() {
+	local _section=$1
+	local _type
+	local _is_lan
+
+	config_get _type "$section" "type"
+	config_get _is_lan "$section" "is_lan"
+
+	if [ "${_type}" == "bridge" -a "${_is_lan}" == "1" ]; then
+		BRIDGE_INTF="br-${_section}"
+	fi
+}
+
+get_bridge_interface() {
+	config_load network
+	config_foreach is_lan_bridge interface
+}
+
+validate_rule_section()
+{
+	uci_validate_section easy_qos rule "${1}" \
+		'priority:string:none' \
+		'macaddr:string:none' \
+		'proto:string:none' \
+		'port:list(uinteger):none' \
+		'comment:string:none'
+}
+
+# Clear existing rules before applying new rules
+clear_existing_rules() {
+	# execute the delete rules written onto a file then delete the file
+	[ -f ${RULE_LIST} ] || return 0
+
+	while read line
+	do
+		log "Deleting old classification rules"
+		exec_log classcfg -D ${line} -i ${BRIDGE_INTF}
+	done <${RULE_LIST}
+	sync
+
+	[ -f ${RULE_LIST} ] && rm ${RULE_LIST}
+}
+
+# classcfg -M local_dhcp -i lo -p udp --dport 67:67 --dport 68:68 -j mark --mark 1
+create_rule() {
+	local proto=$1; shift
+	local mac_addr=$1; shift
+	local mark=$1; shift
+	local ports=$1;
+	local cmd="";
+	# Rule name is uniqe, so we take hash of all the input as rule_name
+	local rule_name="$(echo ${mac_addr}${proto}${mark}${ports} |md5sum |head -c 30)"
+
+	cmd="-j mark --mark ${mark}";
+
+	if [ "${mac_addr}" != "none" ]; then
+		cmd="--smac ${mac_addr} ${cmd}";
+	fi
+	if [ "${ports}" != "none" ]; then
+		IFS=","
+		for port in ${ports};
+		do
+			cmd="--dport ${port}:${port} ${cmd}";
+		done
+		IFS=' '
+	fi
+	if [ "${proto}" != "none" ]; then
+		cmd="-p ${proto} $cmd"
+	fi
+	cmd="-i ${BRIDGE_INTF} $cmd"
+	cmd="-A ${rule_name} $cmd"
+
+	# Store the rule_names for cleanup on reload
+	exec_log classcfg ${cmd} 
+	[ $? -eq 0 ] && \
+		echo ${rule_name}  >> ${RULE_LIST}
+}
+
+manage_rule() {
+	local cfg="$1"
+	local priority macaddr proto port comment prio_num port_list
+
+	validate_rule_section "${1}" || {
+		log "Validation of section failed"
+		return 1;
+	}
+
+	prio_num=$(get_priority ${priority})
+	port_list=$(echo ${port}|sed 's/ /,/g')
+
+	if [ -n "${prio_num}" ]; then
+		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
+			create_rule tcp ${macaddr} ${prio_num} ${port_list}
+			create_rule udp ${macaddr} ${prio_num} ${port_list}
+		else
+			create_rule ${proto} ${macaddr} ${prio_num} ${port_list}
+		fi
+	fi
+}
+
+reload_service() {
+	get_bridge_interface
+	clear_existing_rules
+	config_load easy_qos
+	config_foreach manage_rule rule
+}
+
+start_service() {
+	[ -x /opt/intel/usr/sbin/classcfg ] || exit 0
+	reload_service
+	log "Easy QoS class installed"
+}
+
+service_triggers() {
+	procd_add_reload_trigger "easy_qos" "network"
+}
+

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" -o "${protocol}" == "tcpudp" ]; then
+				create_rule tcp ${macaddr} ${prio_num} ${p}
+				create_rule udp ${macaddr} ${prio_num} ${p}
+			else
+				create_rule ${protocol} ${macaddr} ${prio_num} ${p}
+			fi
+		done
+		# Create rule for all ports if port is not mentioned in uci
+		if [ -z "${port}" ]; then
+			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
+				create_rule tcp ${macaddr} ${prio_num}
+				create_rule udp ${macaddr} ${prio_num}
+			else
+				create_rule ${protocol} ${macaddr} ${prio_num}
+			fi
+		fi
+	fi
+}
+
+reload_service() {
+	# Do not apply rules if ebtables is not present in system
+	[ -x /usr/sbin/ebtables ] || return;
+
+	clear_existing_rules
+	config_load easy_qos
+	config_foreach manage_rule rule
+}
+
+start_service() {
+	reload_service
+}
+
+service_triggers() {
+	procd_add_reload_trigger "easy_qos"
+}
+

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//:/_}" 2 > /dev/null
+	json_get_var ip ip
+
+	echo "$ip"
+}
+
+validate_rule_section()
+{
+	uci_validate_section easy_qos rule "${1}" \
+		'priority:string' \
+		'macaddr:string' \
+		'proto:string:none' \
+		'port:list(uinteger)' \
+		'comment:string:none'
+}
+
+# Clear existing rules before applying new rules
+clear_existing_rules() {
+	local rule=$(iptables -t mangle -S 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" -o "${proto}" == "tcpudp" ]; then
+			create_rule tcp ${ip} ${prio_num} ${port_list}
+			create_rule udp ${ip} ${prio_num} ${port_list}
+		else
+			create_rule ${proto} ${ip} ${prio_num} ${port_list}
+		fi
+	fi
+}
+
+reload_service() {
+	clear_existing_rules
+	map_client_entries
+	config_load easy_qos
+	config_foreach manage_rule rule
+	clean_client_entries
+}
+
+start_service() {
+	reload_service
+	echo "Easy QoS installed">/dev/console;
+}
+
+service_triggers() {
+	procd_add_reload_trigger "easy_qos"
+}
+

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.deprecated/Config.in

@@ -0,0 +1,10 @@
+if (PACKAGE_libwifix)
+menu "configurations"
+
+config LIBWIFIX_DEBUG
+	depends on PACKAGE_libwifix
+	bool "Enable wifi debugging"
+	default n
+
+endmenu
+endif

easy-soc-libs.deprecated/Makefile

@@ -0,0 +1,108 @@
+#
+# Copyright (C) 2019 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# 
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=easy-soc-libs.deprecated
+PKG_VERSION:=1.0.1
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=b88afddd2f4cb216bfcd190f9096c138299c28e2
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/easy-soc-libs.deprecated
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=IOPSYS easy SoC libraries (deprecated)
+  SUBMENU:=IOPSYS easy SoC libraries (deprecated)
+  DEPENDS:=+libopenssl
+  MENU:=1
+endef
+
+define Package/libwifix/config
+  source "$(SOURCE)/Config.in"
+endef
+
+define Package/libwifix
+  $(call Package/easy-soc-libs.deprecated)
+  TITLE:= WiFi library for wifix (deprecated)
+  DEPENDS+=+libnl +libnl-route
+endef
+
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+  TARGET_PLATFORM=BROADCOM
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
+  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+  TARGET_PLATFORM=BROADCOM
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
+else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+  TARGET_PLATFORM=MEDIATEK
+  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
+else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
+  TARGET_PLATFORM=MARVELL
+  TARGET_CFLAGS +=-DIOPSYS_MARVELL
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+  TARGET_PLATFORM=INTEL
+  TARGET_CFLAGS +=-DIOPSYS_INTEL
+else
+  $(info Unexpected CONFIG_TARGET)
+endif
+
+export TARGET_PLATFORM
+
+ifdef CONFIG_LIBWIFIX_DEBUG
+  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
+endif
+
+subdirs := \
+	$(if $(CONFIG_PACKAGE_libwifix),libwifix)
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/openssl \
+	-I$(STAGING_DIR)/usr/include/libnl3
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)" \
+	PLATFORM="$(TARGET_PLATFORM)" \
+	subdirs="$(subdirs)"
+
+define Build/InstallDev/libwifix
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifix/wifi.h $(1)/usr/include/wifix.h
+	$(CP) $(PKG_BUILD_DIR)/libwifix/libwifi*.so* $(1)/usr/lib/
+endef
+
+define Build/Compile
+	$(call Build/Compile/Default)
+endef
+
+define Build/InstallDev
+	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
+endef
+
+define Package/libwifix/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifix/libwifi*.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libwifix))

easy-soc-libs/Config.in

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

easy-soc-libs/Makefile

@@ -1,73 +1,90 @@
 #
-# Copyright (C) 2018 Iopsys
+# Copyright (C) 2019 iopsys Software Solutions AB
 #
+# This is free software, licensed under the GNU General Public License v2.
+# 
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=iop-lla-libs
-PKG_VERSION:=1.0.0
+PKG_NAME:=easy-soc-libs
+PKG_VERSION:=2.4.0
+PKG_RELEASE:=1
 
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9013a57cb78f7346e3636d1ff101a74c321cd4c3
-PKG_SOURCE_URL:=http://public.inteno.se:/iop-lla-libs
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
+PKG_SOURCE_VERSION:=30f5527ae724d54537c803127e11992d1a5ae154
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+endif
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk
 
-define Package/iop-lla-libs
+define Package/easy-soc-libs
   SECTION:=libs
   CATEGORY:=Libraries
-  SUBMENU:=IOPSYS low level libraries
+  TITLE:=IOPSYS easy SoC libraries
+  SUBMENU:=IOPSYS easy SoC libraries
   DEPENDS:=+libopenssl
+  MENU:=1
+endef
+
+define Package/libwifi/config
+  source "$(SOURCE)/Config.in"
 endef
 
 define Package/libwifi
-  $(call Package/iop-lla-libs)
+  $(call Package/easy-soc-libs)
   TITLE:= WiFi library (libwifi)
-endef
-
-define Package/libdsl
-  $(call Package/iop-lla-libs)
-  TITLE:= XDSL library (libdsl)
+  DEPENDS+=+libnl +libnl-route
 endef
 
 define Package/libethernet
-  $(call Package/iop-lla-libs)
+  $(call Package/easy-soc-libs)
   TITLE:= Ethernet library (libethernet)
-DEPENDS:=+TARGET_iopsys_ramips:swconfig
-endef
-
-define Package/iop-lla-libs/config
-  source "$(SOURCE)/Config.in"
+  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 +TARGET_intel_mips:kmod-ppa-drv
+endef
+
 subdirs := \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
@@ -75,21 +92,27 @@ 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
-	echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX $(1)"
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
 endef
 
 define Build/InstallDev/libdsl
@@ -106,6 +129,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));)
@@ -113,7 +142,7 @@ endef
 
 define Package/libwifi/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
 endef
 
 define Package/libethernet/install
@@ -123,7 +152,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

@@ -1,27 +1,30 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# 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_RELEASE:=1
 PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=0cb8accbac3355b97a17064ec7da010a2c42db7b
+PKG_SOURCE_VERSION:=631e61b7ab5d86f2f4c86756a117badff9fb0f2c
 
 
 ifeq ($(CONFIG_ENDPT_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
+PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
 PKG_NAME:=endptmngr-open
 else
-PKG_SOURCE_URL:=git@private.inteno.se:endptmngr
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/endptmngr
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_NAME:=endptmngr
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 endif
 
 RSTRIP:=true

endptmngr/files/dect.config

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

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))

fatrace/Makefile

@@ -1,7 +1,7 @@
 #
 # Copyright (C) 2006-2010 OpenWrt.org
 #
-# This is free software, licensed under the GNU General Public License v2.
+# This is free software, licensed under the GNU General Public License v3.
 # See /LICENSE for more information.
 #
 
@@ -20,6 +20,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPL-3.0
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 #PKG_BUILD_PARALLEL:=1
 

gigaset-elements/.gitignore

@@ -1,3 +0,0 @@
-
-git-src
-

gigaset-elements/Makefile

@@ -1,65 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gigaset-elements
-
-PKG_VERSION:=2.4.2
-# PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_GIGASET_ELEMENTS_SRC_URL ?= git@public.inteno.se:gigaset-elements.git
-PKG_GIGASET_ELEMENTS_VERSION ?= v$(PKG_VERSION)
-
-PKG_SOURCE_URL:=$(PKG_GIGASET_ELEMENTS_SRC_URL)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=aa906b37062b6d7937a9c0f8e7b62b32afe4bdeb
-
-
-PKG_MAINTAINER:=Magier Marcin, Figlarek Piotr
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-
-include $(INCLUDE_DIR)/package.mk
-
-######################################################
-
-define Package/gigaset-elements
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libjson-c +libcurl +libpthread
-  TITLE:=Gigaset elements
-endef
-
-######################################################
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-endef
-
-
-
-define Package/gigaset-elements/install
-	$(CP) -r $(PKG_BUILD_DIR)/sysroot_common/* $(1)/
-	$(CP) -r $(PKG_BUILD_DIR)/sysroot_$(CONFIG_ARCH)/* $(1)/
-endef
-
-
-
-define Package/gigaset-elements/preinst
-#!/bin/sh
-mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/cert
-mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/fw
-endef
-
-
-define Package/gigaset-elements/postrm
-#!/bin/sh
-rm -rf $${IPKG_INSTROOT}/usr/gigaset/data
-rm -rf /usr/share/gigaset
-endef
-
-
-######################################################
-
-$(eval $(call BuildPackage,gigaset-elements))
-

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:=GPLv2
+  PKG_LICENSE_URL:=
+endef
+
+define KernelPackage/$(PKG_NAME)/description
+  This package contains the LED driver for Gryphon devices.
+endef
+
+EXTRA_KCONFIG:= CONFIG_RGB_LED=m
+
+MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)/kdevlinks/
+	$(CP) -s `pwd`/src/* $(PKG_BUILD_DIR)/kdevlinks/
+	$(CP) src/* $(PKG_BUILD_DIR)
+endef
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH="$(LINUX_KARCH)" \
+		SUBDIRS="$(PKG_BUILD_DIR)" \
+		EXTRA_CFLAGS="-DKERNEL_MODULE $(BUILDFLAGS) -I$(LINUX_DIR)/include -include generated/autoconf.h $(MODULE_INCLUDE)" \
+		modules
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+endef
+
+$(eval $(call KernelPackage,$(PKG_NAME)))

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/files/ice-client.uci_default

@@ -1,67 +0,0 @@
-#!/bin/sh
-
-grep -rq "^ice:" /etc/passwd || {
-	adduser -D -H -s /bin/false ice
-}
-
-uci -q delete passwords.ice
-uci -q set passwords.ice=usertype
-uci -q set passwords.ice.password="\$WPAKEY"
-uci -q add_list passwords.ice._access_r=root
-uci -q commit passwords
-
-uci show rpcd | grep username=.*ice.* >/dev/null || {
-cat >> /etc/config/rpcd << EOF
-
-config login
-	option username 'ice'
-	option password '\$p\$ice'
-	list _access_r 'none'
-	list write 'user-user'
-	list write 'juci-broadcom-dsl'
-	list write 'juci-broadcom-dsl-admin'
-	list write 'juci-broadcom-ethernet'
-	list write 'juci-broadcom-iptv'
-	list write 'juci-broadcom-vlan'
-	list write 'juci-broadcom-vlan-admin'
-	list write 'juci-wireless'
-	list write 'juci-wireless-admin'
-	list write 'juci-catv'
-	list write 'juci-ddns'
-	list write 'juci-diagnostics'
-	list write 'juci-dnsmasq-dhcp'
-	list write 'juci-dropbear'
-	list write 'juci-ethernet'
-	list write 'juci-event'
-	list write 'juci-firewall-fw3'
-	list write 'juci-iconnect'
-	list write 'juci-igmpinfo'
-	list write 'juci-inteno-backup'
-	list write 'juci-inteno-multiwan'
-	list write 'juci-inteno-provisioning'
-	list write 'juci-inteno-qos'
-	list write 'juci-inteno-voice-client'
-	list write 'juci-minidlna'
-	list write 'juci-mod-status'
-	list write 'juci-mod-system'
-	list write 'juci-natalie-dect'
-	list write 'juci-netmode'
-	list write 'juci-network-netifd'
-	list write 'juci-owsd'
-	list write 'juci-printer'
-	list write 'juci-realtime-graphs'
-	list write 'juci-samba'
-	list write 'juci-sfp'
-	list write 'juci-snmpd'
-	list write 'juci-sysupgrade'
-	list write 'juci-uhttpd'
-	list write 'juci-upnp'
-	list write 'juci-usb'
-	list write 'core'
-	list write 'unauthenticated'
-
-EOF
-}
-
-exit 0
-

icgroupd/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 Inteno Broadband AB
+# Copyright (C) 2019 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.

icwmp/Config_cwmp.in

@@ -19,17 +19,9 @@ config CWMP_DEBUG
 	bool "Compile with debug options"
 	default y
 
-config XMPP_ENABLE
-	bool "enable xmpp feature"
-	default n
-
 config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
-
-config LIBDATAMODEL_VENDOR_PREFIX
-    string "Vendor Prefix"
-    default "X_Inteno_SE_"
     
 endif
 

icwmp/Config_datamodel.in

@@ -1,7 +0,0 @@
-if PACKAGE_libdatamodel
-
-config UPNP_TR064
-	bool "Compile with tr064 features"
-	default n
-
-endif

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 OpenWrt.org
+# Copyright (C) 2019 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,15 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2018-09-03
+PKG_VERSION:=4.0-2019-10-01
 PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fe324dbae2c8dbcfb55555dee9b3700280151aa1
+PKG_SOURCE_VERSION:=ed781436f96f2dc3cf58b35adc640c6f9f6783d1
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=COPYING
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
@@ -30,13 +32,6 @@ CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libdatamodel
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
-endef
-
 define Package/icwmp_stun
 	SECTION:=utils
 	CATEGORY:=Utilities
@@ -51,11 +46,32 @@ 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_bulkdata
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=TR-069 BulkData Collection
+ DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm
+endef
+
 define Package/icwmp/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +libexpat +libstrophe +curl +libtrace +libdatamodel
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libbbfdm +(PACKAGE_libtr098):libtr098
 endef
 
 define Package/icwmp/description
@@ -80,10 +96,6 @@ define Package/icwmp-zstream/config
 	source "$(SOURCE)/Config_cwmp.in"
 endef
 
-define Package/libdatamodel/config
-	source "$(SOURCE)/Config_datamodel.in"
-endef
-
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
 ifneq ($(USE_LOCAL),)
 define Build/Prepare
@@ -95,8 +107,6 @@ ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
 TARGET_CFLAGS += -DEX400
 endif
 
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBDATAMODEL_VENDOR_PREFIX)\\\"
-
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 
@@ -117,16 +127,6 @@ CONFIGURE_ARGS += \
 	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubus-include-path=$(STAGING_DIR)/usr/include
 	
-ifeq ($(CONFIG_UPNP_TR064),y)
-CONFIGURE_ARGS += \
-	--enable-upnptr064
-endif
-	
-ifeq ($(CONFIG_XMPP_ENABLE),y)
-CONFIGURE_ARGS += \
-	--enable-xmpp
-endif
-	
 ifeq ($(BUILD_VARIANT),zstream)
 CONFIGURE_ARGS += \
 	--enable-http=zstream \
@@ -158,18 +158,23 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-define Package/libdatamodel/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib/
-endef
+ifeq ($(CONFIG_PACKAGE_libtr098),y)
+CONFIGURE_ARGS += \
+	--enable-tr098
+endif
+
+CONFIGURE_ARGS += \
+	--enable-tr181
 
 define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/icwmpd $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin
+ifeq ($(CONFIG_PACKAGE_libtr098),y)
+	$(CP) $(PKG_BUILD_DIR)/bin/icwmp_tr098d $(1)/usr/sbin
+endif
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/icwmpd
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
@@ -201,18 +206,35 @@ define Package/icwmp_xmpp/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_xmppd $(1)/etc/init.d/icwmp_xmppd
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_xmpp $(1)/etc/config
+	$(CP) ./xmpp-files/* $(1)/
 endef
 
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/libdatamodel
-	$(CP) $(PKG_BUILD_DIR)/dm/*.h $(1)/usr/include/libdatamodel
-	$(CP) $(PKG_BUILD_DIR)/dm/dmtree/common/root.h $(1)/usr/include/libdatamodel
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.a $(1)/lib
+define Package/icwmp_udpechoserver/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_udpechoserverd $(1)/usr/sbin/icwmp_udpechoserverd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_udpechoserverd $(1)/etc/init.d/icwmp_udpechoserverd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_udpechoserver $(1)/etc/config
 endef
 
+define Package/icwmp_twamp/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_twampd $(1)/usr/sbin/icwmp_twampd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_twampd $(1)/etc/init.d/icwmp_twampd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_twamp $(1)/etc/config
+endef
+
+define Package/icwmp_bulkdata/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_bulkdatad $(1)/usr/sbin/icwmp_bulkdatad
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_bulkdatad $(1)/etc/init.d/icwmp_bulkdatad
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_bulkdata $(1)/etc/config
+endef
 
 define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
@@ -233,9 +255,10 @@ define Package/icwmp-$(BUILD_VARIANT)/prerm
 	exit 0
 endef
 
-
 $(eval $(call BuildPackage,icwmp-curl))
-$(eval $(call BuildPackage,libdatamodel))
 $(eval $(call BuildPackage,icwmp_stun))
 $(eval $(call BuildPackage,icwmp_xmpp))
+$(eval $(call BuildPackage,icwmp_udpechoserver))
+$(eval $(call BuildPackage,icwmp_twamp))
+$(eval $(call BuildPackage,icwmp_bulkdata))
 $(eval $(call BuildPackage,icwmp-zstream))

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

@@ -63,13 +63,23 @@ handle_icwmp_restart() {
 	network_get_device curdev $INTERFACE
 	[ -n "$curdev" ] && echo $curdev > $devfile || rm -f $devfile
 
+	local prevopt43url=""
+	local curopt43url=""
+	local opt43urlfile=/tmp/ipv4/$INTERFACE-opt43url
+	prevopt43url=$(cat $opt43urlfile 2>/dev/null)
+	curopt43url="$(uci -P /var/state -q get cwmp.acs.dhcp_url)"
+	[ -n "$curopt43url" ] && echo $curopt43url > $opt43urlfile || rm -f $opt43urlfile
+
 	[ \
 		"$prevdev" == "$curdev" -a \
 		"$previpaddr" = "$curipaddr" -a \
 		"$prevgateway" = "$curgateway" -a \
 		"$prevsubnets" = "$cursubnets" -a \
 		"$prevdnsservers" = "$curdnsservers" \
-	] && exit 0
+	] && {
+		[ "$prevopt43url" = "$curopt43url" ] &&	exit 0
+		[ -z "$prevopt43url" ] && exit 0
+	}
 
 	/etc/init.d/icwmpd reload &
 }

icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts

@@ -41,4 +41,14 @@ set_cwmp_reqopts() {
 	fi
 }
 
+regenerate_ssl_link(){
+	local cert_dir="/etc/ssl/certs"
+	local all_file=$(ls $cert_dir/*.pem)
+	for cfile in $all_file
+	do
+		ln -s $cfile $cert_dir/$(openssl x509 -hash -noout -in $cfile).0
+	done
+}
+
 set_cwmp_reqopts
+regenerate_ssl_link

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

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+[ -f /etc/config/cwmp_xmpp ] || exit 0
+
+[ "$ACTION" == "ifup" ] || exit 0
+[ "$INTERFACE" == "loopback" ] && exit 0
+
+local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
+[ -n "$defwan" -a "$(uci -q get network.$defwan)" == "interface" -a "$defwan" != "$INTERFACE" ] && exit 0
+
+local islan="$(uci -q get network.$INTERFACE.is_lan)"
+[ "$islan" == "1" ] && exit 0
+
+local proto="$(uci -q get network.$INTERFACE.proto)"
+[ "$proto" == "none" ] && exit 0
+
+local ifname="$(uci -q get network.$INTERFACE.ifname)"
+[ "${ifname:0:1}" == "@" ] && exit 0
+
+/etc/init.d/icwmp_xmppd reload &
+

ifbt/Makefile

@@ -1,26 +1,45 @@
 #
-# Copyright (C) 2013 Inteno
+# Copyright (C) 2018 iopsys Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ifbt
-PKG_VERSION:=0.1
+PKG_VERSION:=0.2
 
-PKG_SOURCE_VERSION:=da97d6668d3c0e3f2be226c66b406e90179ada81
+PKG_SOURCE_VERSION:=f6edff47b6c0a154ab892301acf767d19ac8ad73
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@private.inteno.se:ifbt.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ifbt.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=README
+
 include $(INCLUDE_DIR)/package.mk
 
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+TARGET_PLATFORM:=-DIOPSYS_BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+TARGET_PLATFORM:=-DIOPSYS_BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
+TARGET_PLATFORM:=-DIOPSYS_MARVELL
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+TARGET_PLATFORM:=-DIOPSYS_INTEL
+else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+TARGET_PLATFORM:=-DIOPSYS_MEDIATEK
+else
+$(info (UNEXPECTED CONFIG TARGET))
+endif
+
+export TARGET_PLATFORM
+
 define Package/ifbt
 	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+	DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c  +libwifi +libjson-c
 	TITLE:=Fast BSS Transition
 endef
 

ifsi/Makefile

@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2015 Inteno
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ifsi
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-LDFLAGS+= \
-        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-		-Wl,-rpath-link=$(STAGING_DIR)/lib
-
-define Package/ifsi
-  CATEGORY:=Utilities
-  DEPENDS:=+ubus +libubox
-  TITLE:=Inteno Functional Script Interface
-endef
-
-define Package/ifsi/description
-	Inteno Functional Script Interface
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Package/ifsi/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ifsi $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,ifsi))

ifsi/src/Makefile

@@ -1,17 +0,0 @@
-CC		= gcc
-CFLAGS		= -g -Wall
-LOCLIBS		= 
-LIBS		= -lubus -lubox -lblobmsg_json
-OBJS		= ifsi.o
-SRCS		= ifsi.c
-LIBSRCS		= 
-ISRCS		= 
-
-all: ifsi
-
-ifsi: ${OBJS}
-	${CC} ${LDFLAGS} ${LIBSRCS} -o ifsi ${OBJS} ${LIBS}
-
-clean:
-	rm -f ifsi *.o
-

ifsi/src/ifsi.c

@@ -1,74 +0,0 @@
-/*
- * ifsi -- Inteno functional script interface
- *
- * Copyright (C) 2012-2013 Inteno Broadband Technology AB. All rights reserved.
- *
- * Author: dev@inteno.se
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <unistd.h>
-
-#include <libubox/blobmsg.h>
-#include <libubox/blobmsg_json.h>
-#include <libubox/uloop.h>
-
-#include <libubus.h>
-
-static struct ubus_context *ctx;
-static struct ubus_event_handler event_listener;
-static struct blob_buf b;
-
-
-static void receive_event(struct ubus_context *ctx, struct ubus_event_handler *ev,
-			  const char *type, struct blob_attr *msg)
-{
-	char *str;
-	uint32_t id;
-
-	str = blobmsg_format_json(msg, true);
-	fprintf(stdout, "I got %s event %s\n", type, str);
-	free(str);
-}
-
-int main(int argc, char **argv)
-{
-	const char *ubus_socket = NULL;
-	int ret;
-
-	uloop_init();
-
-	ctx = ubus_connect(ubus_socket);
-	if (!ctx) {
-		fprintf(stderr, "Failed to connect to ubus\n");
-		return 1;
-	}
-
-	ubus_add_uloop(ctx);
-
-	event_listener.cb = receive_event;
-	ret = ubus_register_event_handler(ctx, &event_listener, "*");
-	if (ret)
-		fprintf(stderr, "Couldn't register to router events\n");
-
-	uloop_run();
-
-	ubus_free(ctx);
-	uloop_done();
-
-	return 0;
-}
-

imonitor/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 Inteno
+# Copyright (C) 2018 iopsys
 #
 
 include $(TOPDIR)/rules.mk
@@ -11,20 +11,22 @@ PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
-PKG_SOURCE_URL:=http://public.inteno.se/imonitor.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
 PKG_SOURCE_VERSION:=532f4900862bcb45d8cd4bf37555fabda81750b6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
-PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/imonitor
 	CATEGORY:=Utilities
-	TITLE:=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,14 +12,17 @@ PKG_NAME:=inbd
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=f81c146f0b07540877545e5ab644ec8e29905a4d
+PKG_SOURCE_VERSION:=53ca7f58edb87976b5897ccaf487bb0cbbf39d07
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se/inbd
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
 # support parallel build
 PKG_BUILD_PARALLEL:=1
 
@@ -34,7 +37,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

inotify-tools/Makefile

@@ -20,6 +20,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=COPYING
+
 # support parallel build
 PKG_BUILD_PARALLEL:=1
 

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/DETAILS

@@ -1,23 +0,0 @@
-{
-	"description": [
-		{ "en" : "VoIP + Bridged IPTV" },
-		{ "sv" : "VoIP + Brygg IPTV" }
-	],
-	"explanation": [
-		{ "en" : "VoIP on dedicated VLAN + LAN4 port is bridged with IPTV VLAN" },
-		{ "sv" : "VoIP on dedicated VLAN + LAN4 port överbryggas med IPTV VLAN" }
-	],
-	"credentials" : 0,
-	"excluded_boards" : [
-		"CG300",
-		"CG301",
-		"EX400",
-		"F*",
-		"SDX810-AP"
-	],
-	"acl" : [
-		"admin",
-		"support"
-	]
-}
-

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/firewall

@@ -1,117 +0,0 @@
-config settings 'settings'
-        option disabled '0'
-
-config defaults
-	option syn_flood	1
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		REJECT
-# Uncomment this line to disable ipv6 rules
-#	option disable_ipv6	1
-
-config zone
-	option name		lan
-	list   network		'lan'
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		ACCEPT
-
-config zone
-	option name		wan
-	list   network		'wan'
-	list   network		'wan6'
-	list   network		'iptv'
-	option input		REJECT
-	option output		ACCEPT
-	option forward		REJECT
-	option masq		1
-	option mtu_fix		1
-
-config forwarding
-	option src		lan
-	option dest		wan
-
-# We need to accept udp packets on port 68,
-# see https://dev.openwrt.org/ticket/4108
-config rule
-	option name		Allow-DHCP-Renew
-	option src		wan
-	option proto		udp
-	option dest_port	68
-	option target		ACCEPT
-	option family		ipv4
-	option hidden		1
-
-# Allow IPv4 ping
-config rule
-	option name		Allow-Ping
-	option src		wan
-	option proto		icmp
-	option icmp_type	echo-request
-	option family		ipv4
-	option target		ACCEPT
-	option hidden		1
-
-# Allow DHCPv6 replies
-# see https://dev.openwrt.org/ticket/10381
-config rule
-	option name		Allow-DHCPv6
-	option src		wan
-	option proto		udp
-	option src_ip		fe80::/10
-	option src_port		547
-	option dest_ip		fe80::/10
-	option dest_port	546
-	option family		ipv6
-	option target		ACCEPT
-	option hidden		1
-
-# Allow essential incoming IPv6 ICMP traffic
-config rule
-	option name		Allow-ICMPv6-Input
-	option src		wan
-	option proto		icmp
-	list icmp_type		echo-request
-	list icmp_type		echo-reply
-	list icmp_type		destination-unreachable
-	list icmp_type		packet-too-big
-	list icmp_type		time-exceeded
-	list icmp_type		bad-header
-	list icmp_type		unknown-header-type
-	list icmp_type		router-solicitation
-	list icmp_type		neighbour-solicitation
-	list icmp_type		router-advertisement
-	list icmp_type		neighbour-advertisement
-	option limit		1000/sec
-	option family		ipv6
-	option target		ACCEPT
-	option hidden		1
-
-# Allow essential forwarded IPv6 ICMP traffic
-config rule
-	option name		Allow-ICMPv6-Forward
-	option src		wan
-	option dest		*
-	option proto		icmp
-	list icmp_type		echo-request
-	list icmp_type		echo-reply
-	list icmp_type		destination-unreachable
-	list icmp_type		packet-too-big
-	list icmp_type		time-exceeded
-	list icmp_type		bad-header
-	list icmp_type		unknown-header-type
-	option limit		1000/sec
-	option family		ipv6
-	option target		ACCEPT
-	option hidden		1
-
-# include a file with users custom iptables rules
-config include
-	option path /etc/firewall.user
-	option reload 1
-
-# include a file with rules for SIP and RTP traffic
-config include
-	option path /etc/firewall.sip
-	option reload 1
-

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/mcpd

@@ -1,18 +0,0 @@
-
-config mcpd 'mcpd'
-	option igmp_query_response_interval '10'
-	option igmp_last_member_query_interval '10'
-	option igmp_robustness_value '2'
-	option igmp_lan_to_lan_multicast '0'
-	option igmp_max_groups '25'
-	option igmp_max_sources '10'
-	option igmp_max_members '25'
-	option igmp_fast_leave '1'
-	option igmp_join_immediate '0'
-	option igmp_proxy_enable '0'
-	option igmp_snooping_enable '2'
-	option igmp_snooping_interfaces 'br-iptv'
-	option igmp_default_version '2'
-	option igmp_query_interval '120'
-	option igmp_proxy_interfaces 'iptv'
-

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/network

@@ -1,88 +0,0 @@
-
-config interface 'loopback'
-	option is_lan '1'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config interface 'lan'
-	option is_lan '1'
-	option type 'bridge'
-	option proto 'static'
-	option ipaddr '192.168.1.1'
-	option netmask '255.255.255.0'
-	option ifname '$LAN1 $LAN2 $LAN3'
-	option ip6assign '60'
-	
-config interface 'wan'
-	option type 'anywan'
-	option proto 'dhcp'
-	option vendorid '$HARDWAREID-INTENO'
-	option hostname 'Inteno_$MAC4'
-	option ifname 'ptm0.1 atm0.1 $WAN.1'
-	option ipv6 '1'
-
-config interface 'iptv'
-	option type 'bridge'
-	option proto 'dhcp'
-	option gateway '0.0.0.0'
-	option reqopts 'staticroutes'
-	option ifname 'ptm0.100 $WAN.100 $LAN4'
-	option defaultroute '0'
-
-config interface 'voip'
-	option type 'anywan'
-	option proto 'dhcp'
-	option gateway '0.0.0.0'
-	option reqopts 'staticroutes'
-	option ifname 'ptm0.200 $WAN.200'
-	option defaultroute '0'
-
-config interface 'wan6'
-	option proto 'dhcpv6'
-	option ifname '@wan'
-
-config device 'atmwan'
-	option type 'untagged'
-	option ifname 'atm0'
-	option name 'atm0.1'
-
-config device 'ptmwan'
-	option type 'untagged'
-	option ifname 'ptm0'
-	option name 'ptm0.1'
-
-config device 'ethwan'
-	option type 'untagged'
-	option ifname '$WAN'
-	option name '$WAN.1'
-
-config device 'ethtv'
-	option type '8021q'
-	option name '$WAN.100'
-	option ifname '$WAN'
-	option vid '100'
-	option priority '0'
-
-config device 'ptmtv'
-	option type '8021q'
-	option name 'ptm0.100'
-	option ifname 'ptm0'
-	option vid '100'
-	option priority '0'
-
-config device 'ethvoip'
-	option type '8021q'
-	option name '$WAN.200'
-	option ifname '$WAN'
-	option vid '200'
-	option priority '0'
-
-config device 'ptmvoip'
-	option type '8021q'
-	option name 'ptm0.200'
-	option ifname 'ptm0'
-	option vid '200'
-	option priority '0'
-

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/DETAILS

@@ -1,21 +0,0 @@
-{
-	"description": [
-		{ "en" : "Repeater 2.4▴▾5" },
-		{ "sv" : "Repeater 2.4▴▾5" }
-	],
-	"explanation": [
-		{ "en" : "Your router is going to act as a wired extender or wireless repeater to the selected Wireless Access Point. Uplink 2.4G & Downlink 5G" },
-		{ "sv" : "Routern kommer att fungera som en trådbunden extender eller trådlös repeater till den valda trådlösa åtkomstpunkten. Uplink 2.4G & Downlink 5G" }
-	],
-	"excluded_boards" : [
-		"DG15*",
-		"DG40*",
-		"EG40*",
-		"EX40*",
-		"SDX*",
-		"F*"
-	],
-	"uplink_band" : "b",
-	"credentials" : 1,
-	"reboot" : 0
-}

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/network

@@ -1,20 +0,0 @@
-
-config interface 'loopback'
-	option is_lan '1'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config interface 'wan'
-	option type 'bridge'
-	option proto 'dhcp'
-	option hostname 'Inteno-$BSSID4'
-	option ifname '$WAN.1 $LAN1 $LAN2 $LAN3 $LAN4'
-	option reqopts '43'
-
-config device 'ethwan'
-	option type 'untagged'
-	option ifname '$WAN'
-	option name '$WAN.1'
-

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/wireless

@@ -1,93 +0,0 @@
-config wifi-status 'status'
-	option wlan '1'
-	option wps '1'
-	option sched_status '0'
-	option schedule '0'
-
-config bandsteering 'bandsteering'
-	option enabled '0'
-	option policy '0'
-
-config apsteering 'apsteering'
-	option enabled '0'
-
-config wifi-device 'wl0'
-	option type 'broadcom'
-	option country 'EU/13'
-	option band 'a'
-	option bandwidth '80'
-	option hwmode '11ac'
-	option channel 'auto'
-	option scantimer '15'
-	option wmm '1'
-	option wmm_noack '0'
-	option wmm_apsd '0'
-	option txpower '100'
-	option rateset 'default'
-	option frag '2346'
-	option rts '2347'
-	option dtim_period '1'
-	option beacon_int '100'
-	option rxchainps '0'
-	option rxchainps_qt '10'
-	option rxchainps_pps '10'
-	option rifs '0'
-	option rifs_advert '0'
-	option maxassoc '32'
-	option beamforming '1'
-	option doth '1'
-	option dfsc '1'
-
-config wifi-iface
-	option device 'wl0'
-	option network 'wan'
-	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option key '$WPAKEY'
-	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
-	option wmf_bss_enable '1'
-	option bss_max '32'
-	option ifname 'wl0'
-
-config wifi-device 'wl1'
-	option type 'broadcom'
-	option country 'EU/13'
-	option band 'b'
-	option bandwidth '20'
-	option hwmode 'auto'
-	option channel 'auto'
-	option scantimer '15'
-	option wmm '1'
-	option wmm_noack '0'
-	option wmm_apsd '0'
-	option txpower '100'
-	option rateset 'default'
-	option frag '2346'
-	option rts '2347'
-	option dtim_period '1'
-	option beacon_int '100'
-	option rxchainps '0'
-	option rxchainps_qt '10'
-	option rxchainps_pps '10'
-	option rifs '0'
-	option rifs_advert '0'
-	option maxassoc '32'
-	option doth '0'
-	option apsta '1'
-
-config wifi-iface
-	option device 'wl1'
-	option ifname 'wl1'
-	option network 'wan'
-	option mode 'wet'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option wps_pbc '0'
-	option wmf_bss_enable '1'
-	option ifname 'wl1'
-

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/DETAILS

@@ -1,21 +0,0 @@
-{
-	"description": [
-		{ "en" : "Repeater 2.4▴▾2.4&5" },
-		{ "sv" : "Repeater 2.4▴▾2.4&5" }
-	],
-	"explanation": [
-		{ "en" : "Your router is going to act as a wired extender or wireless repeater to the selected Wireless Access Point. Uplink 2.4G & Downlink 2.4G + 5G" },
-		{ "sv" : "Routern kommer att fungera som en trådbunden extender eller trådlös repeater till den valda trådlösa åtkomstpunkten. Uplink 2.4G & Downlink 2.4G + 5G" }
-	],
-	"excluded_boards" : [
-		"DG15*",
-		"DG40*",
-		"EG40*",
-		"EX40*",
-		"SDX*",
-		"F*"
-	],
-	"uplink_band" : "b",
-	"credentials" : 1,
-	"reboot" : 0
-}

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/network

@@ -1,20 +0,0 @@
-
-config interface 'loopback'
-	option is_lan '1'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config interface 'wan'
-	option type 'bridge'
-	option proto 'dhcp'
-	option hostname 'Inteno-$BSSID4'
-	option ifname '$WAN.1 $LAN1 $LAN2 $LAN3 $LAN4'
-	option reqopts '43'
-
-config device 'ethwan'
-	option type 'untagged'
-	option ifname '$WAN'
-	option name '$WAN.1'
-

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/wireless

@@ -1,108 +0,0 @@
-config wifi-status 'status'
-	option wlan '1'
-	option wps '1'
-	option sched_status '0'
-	option schedule '0'
-
-config bandsteering 'bandsteering'
-	option enabled '0'
-	option policy '0'
-
-config apsteering 'apsteering'
-	option enabled '0'
-
-config wifi-device 'wl0'
-	option type 'broadcom'
-	option country 'EU/13'
-	option band 'a'
-	option bandwidth '80'
-	option hwmode '11ac'
-	option channel 'auto'
-	option scantimer '15'
-	option wmm '1'
-	option wmm_noack '0'
-	option wmm_apsd '0'
-	option txpower '100'
-	option rateset 'default'
-	option frag '2346'
-	option rts '2347'
-	option dtim_period '1'
-	option beacon_int '100'
-	option rxchainps '0'
-	option rxchainps_qt '10'
-	option rxchainps_pps '10'
-	option rifs '0'
-	option rifs_advert '0'
-	option maxassoc '32'
-	option beamforming '1'
-	option doth '1'
-	option dfsc '1'
-
-config wifi-iface
-	option device 'wl0'
-	option network 'wan'
-	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option key '$WPAKEY'
-	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
-	option wmf_bss_enable '1'
-	option bss_max '32'
-	option ifname 'wl0'
-
-config wifi-device 'wl1'
-	option type 'broadcom'
-	option country 'EU/13'
-	option band 'b'
-	option bandwidth '20'
-	option hwmode 'auto'
-	option channel 'auto'
-	option scantimer '15'
-	option wmm '1'
-	option wmm_noack '0'
-	option wmm_apsd '0'
-	option txpower '100'
-	option rateset 'default'
-	option frag '2346'
-	option rts '2347'
-	option dtim_period '1'
-	option beacon_int '100'
-	option rxchainps '0'
-	option rxchainps_qt '10'
-	option rxchainps_pps '10'
-	option rifs '0'
-	option rifs_advert '0'
-	option maxassoc '32'
-	option doth '0'
-	option apsta '1'
-
-config wifi-iface
-	option device 'wl1'
-	option ifname 'wl1'
-	option network 'wan'
-	option mode 'wet'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option wps_pbc '0'
-	option wmf_bss_enable '1'
-	option autoconf '1'
-
-config wifi-iface
-	option device 'wl1'
-	option network 'wan'
-	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option key '$WPAKEY'
-	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
-	option wmf_bss_enable '1'
-	option bss_max '32'
-	option ifname 'wl1'
-

inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/DETAILS

@@ -1,17 +0,0 @@
-{
-	"description": [
-		{ "en" : "Repeater 2.4▴▾2.4&5" },
-		{ "sv" : "Repeater 2.4▴▾2.4&5" }
-	],
-	"explanation": [
-		{ "en" : "Your router is going to act as a wired extender or wireless repeater to the selected Wireless Access Point. Uplink 2.4G & Downlink 2.4G + 5G" },
-		{ "sv" : "Routern kommer att fungera som en trådbunden extender eller trådlös repeater till den valda trådlösa åtkomstpunkten. Uplink 2.4G & Downlink 2.4G + 5G" }
-	],
-	"excluded_boards" : [
-		"*G*",
-		"F*"
-	],
-	"uplink_band" : 'b',
-	"credentials" : 1,
-	"reboot" : 0
-}

inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/network

@@ -1,43 +0,0 @@
-config interface 'loopback'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config device 'lan_dev'
-	option name 'eth0.1'
-	option macaddr '$MACLAN'
-	option vid 1
-
-config interface 'wan'
-	option type 'bridge'
-	option ifname 'eth0.2 eth0.1'
-	option proto 'dhcp'
-	option hostname 'Inteno-$BSSID4'
-	option reqopts '66 67 128 224'
-	option igmp_snooping '0'
-
-config device 'wan_dev'
-	option name 'eth0.2'
-	option macaddr '$MACWAN'
-	option vid 2
-
-config interface 'wan6'
-	option ifname '@wan'
-	option proto 'dhcpv6'
-
-config switch
-	option name 'switch0'
-	option reset '1'
-	option enable_vlan '1'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '1'
-	option ports '1 6t'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '2'
-	option ports '0 5t'
-

inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/wireless

@@ -1,59 +0,0 @@
-config wifi-status 'status'
-	option wlan '1'
-	option wps '1'
-	option sched_status '0'
-	option schedule '0'
-
-config bandsteering 'bandsteering'
-	option enabled '0'
-	option policy '0'
-
-config apsteering 'apsteering'
-	option enabled '0'
-
-config wifi-device  ra0
-	option band b
-	option channel  auto
-	option bandwidth '20'
-	option hwmode   auto
-	option htmode   HT20
-	option country 'DE'
-
-config wifi-iface
-	option device   ra0
-	option network  wan
-	option mode     ap
-	option ssid     Inteno-$BSSID4
-	option encryption psk2
-	option key      $WPAKEY
-	option ifname	ra0
-	option wps_pbc	1
-
-config wifi-device  rai0
-	option band a
-	option channel  auto
-	option bandwidth '80'
-	option hwmode   11ac
-	option htmode   VHT80
-	option country 'DE'
-	option beamforming 1
-
-config wifi-iface
-	option device   rai0
-	option network  wan
-	option mode     ap
-	option ssid     Inteno-$BSSID4
-	option encryption psk2
-	option key      $WPAKEY
-	option ifname	rai0
-	option wps_pbc	1
-
-config wifi-iface
-	option device   ra0
-	option network  wan
-	option mode     wet
-	option ssid     Inteno-$BSSID4
-	option encryption psk2
-	option key      $WPAKEY
-	option ifname	apcli0
-

inteno-netmodes/files/etc/netmodes/routed_brcm/wireless

@@ -1,95 +0,0 @@
-config wifi-status 'status'
-	option wlan '1'
-	option wps '1'
-	option sched_status '0'
-	option schedule '0'
-
-config bandsteering 'bandsteering'
-	option enabled '0'
-	option policy '0'
-
-config apsteering 'apsteering'
-	option enabled '0'
-
-config wifi-device 'wl0'
-	option type 'broadcom'
-	option country 'EU/13'
-	option band 'a'
-	option bandwidth '80'
-	option hwmode 'auto'
-	option channel 'auto'
-	option scantimer '15'
-	option wmm '1'
-	option wmm_noack '0'
-	option wmm_apsd '1'
-	option txpower '100'
-	option rateset 'default'
-	option frag '2346'
-	option rts '2347'
-	option dtim_period '1'
-	option beacon_int '100'
-	option rxchainps '0'
-	option rxchainps_qt '10'
-	option rxchainps_pps '10'
-	option rifs '0'
-	option rifs_advert '0'
-	option maxassoc '32'
-	option beamforming '1'
-	option doth '1'
-	option dfsc '1'
-
-config wifi-iface
-	option device 'wl0'
-	option network 'lan'
-	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option key '$WPAKEY'
-	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
-	option wmf_bss_enable '1'
-	option bss_max '32'
-	option ifname 'wl0'
-
-config wifi-device 'wl1'
-	option type 'broadcom'
-	option country 'EU/13'
-	option band 'b'
-	option bandwidth '20'
-	option hwmode 'auto'
-	option channel 'auto'
-	option scantimer '15'
-	option wmm '1'
-	option wmm_noack '0'
-	option wmm_apsd '1'
-	option txpower '100'
-	option rateset 'default'
-	option frag '2346'
-	option rts '2347'
-	option dtim_period '1'
-	option beacon_int '100'
-	option rxchainps '0'
-	option rxchainps_qt '10'
-	option rxchainps_pps '10'
-	option rifs '0'
-	option rifs_advert '0'
-	option maxassoc '32'
-	option doth '0'
-
-config wifi-iface
-	option device 'wl1'
-	option network 'lan'
-	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'mixed-psk'
-	option cipher 'auto'
-	option key '$WPAKEY'
-	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
-	option wmf_bss_enable '1'
-	option bss_max '32'
-	option ifname 'wl1'
-

inteno-netmodes/files/etc/netmodes/routed_mtk/dhcp

@@ -1,22 +0,0 @@
-config dnsmasq
-	option domainneeded	1
-	option boguspriv	1
-	option filterwin2k	0
-	option localise_queries	1
-	option rebind_protection 0
-	option rebind_localhost 1
-	option local	'/lan/'
-	option domain	'lan'
-	option expandhosts	1
-	option nonegcache	0
-	option authoritative	1
-	option readethers	1
-	option leasefile	'/tmp/dhcp.leases'
-	option resolvfile	'/tmp/resolv.conf.auto'
-
-config dhcp lan
-	option interface	lan
-	option start 	100
-	option limit	150
-	option leasetime	12h
-

inteno-netmodes/files/etc/netmodes/routed_mtk/omcproxy

@@ -1,10 +0,0 @@
-config proxy
-	option scope global
-	option uplink wan
-	list downlink lan
-
-config proxy
-	option scope global
-	option uplink wan6
-	list downlink lan
-

iop-lla-libs/Config.in

@@ -1,7 +0,0 @@
-menu "Library options"
-
-config IOP_LLA_LIBS_DEBUG
-	bool "Enable debug support"
-	default n
-
-endmenu

iop/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2019 iopsys
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,6 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=iop
 PKG_VERSION:=1.0
 PKG_RELEASE:=0
+PKG_LICENSE:=GPLv2
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -20,7 +21,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="http://mirror.inteno.se/mirror"
 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
@@ -16,56 +14,38 @@ CONFIG_PACKAGE_comgt-ncm=y
 CONFIG_PACKAGE_crashlog=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
+CONFIG_PACKAGE_easy-qos=y
 CONFIG_PACKAGE_gdb=m
-CONFIG_PACKAGE_gdbserver=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
-CONFIG_PACKAGE_ice-client=y
-CONFIG_PACKAGE_ice-client-camerawatch=m
-CONFIG_PACKAGE_ice-client-fileme=m
-CONFIG_PACKAGE_ice-client-gigaset=m
-CONFIG_PACKAGE_ice-client-guest=m
-CONFIG_PACKAGE_ice-client-iperf=m
-CONFIG_PACKAGE_ice-client-logreader=m
-CONFIG_PACKAGE_ice-client-monitor=m
-CONFIG_PACKAGE_ice-client-netrounds=m
-CONFIG_PACKAGE_ice-client-rshell=m
-CONFIG_PACKAGE_ice-client-texec=m
 CONFIG_PACKAGE_icwmp-curl=y
+CONFIG_PACKAGE_ifbt=y
 CONFIG_PACKAGE_imonitor=y
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_inteno-netmodes=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-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-easyqos=y
 CONFIG_PACKAGE_juci-event=y
 CONFIG_PACKAGE_juci-firewall-fw3=y
-CONFIG_PACKAGE_juci-ice-client=y
 CONFIG_PACKAGE_juci-icwmp=y
 CONFIG_PACKAGE_juci-igmpinfo=y
-CONFIG_PACKAGE_juci-config-backup=y
-CONFIG_PACKAGE_juci-mwan3=y
-CONFIG_PACKAGE_juci-iup=y
-# CONFIG_PACKAGE_juci-qos is not set
-CONFIG_PACKAGE_juci-voice-client=y
-CONFIG_PACKAGE_juci-macdb=y
 CONFIG_PACKAGE_juci-minidlna=y
 CONFIG_PACKAGE_juci-mod-status=y
 CONFIG_PACKAGE_juci-mod-system=y
-CONFIG_PACKAGE_juci-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
@@ -73,24 +53,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-inteno=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
@@ -98,23 +74,19 @@ CONFIG_PACKAGE_libreadline=y
 CONFIG_PACKAGE_loop-detector=m
 CONFIG_PACKAGE_minidlna=y
 CONFIG_PACKAGE_miniupnpd=y
-CONFIG_PACKAGE_mtd-utils=y
-CONFIG_PACKAGE_mtd-utils-deubinize=y
-CONFIG_PACKAGE_mtd-utils-imagewrite=y
-CONFIG_PACKAGE_mtd-utils-mkfs.jffs2=y
-CONFIG_PACKAGE_mtd-utils-nanddump=y
 CONFIG_PACKAGE_mwan3=y
 CONFIG_PACKAGE_nand-utils=y
 CONFIG_PACKAGE_ndisc6=y
+CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_ntfs-3g=y
 CONFIG_PACKAGE_ntpd=y
+CONFIG_PACKAGE_obuspa=y
 CONFIG_PACKAGE_odhcp6c=y
 CONFIG_PACKAGE_odhcpd=y
 CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
-# CONFIG_PACKAGE_p910nd is not set
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_power-management=y
@@ -145,13 +117,18 @@ CONFIG_PACKAGE_umbim=y
 CONFIG_PACKAGE_uqmi=y
 CONFIG_PACKAGE_usb-modeswitch=y
 CONFIG_PACKAGE_usbreset=y
+CONFIG_PACKAGE_uspd=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
-CONFIG_PACKAGE_wlng=y
+CONFIG_PACKAGE_libwifi=y
+CONFIG_PACKAGE_wifilife=y
+CONFIG_PACKAGE_wifimngr=y
+CONFIG_PACKAGE_libwifix=y
+CONFIG_PACKAGE_wifixd=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
-CONFIG_TARGET_CUSTOMER="INT"
+CONFIG_TARGET_CUSTOMER="IOPSYS"
 CONFIG_TARGET_ROOTFS_TARGZ=y
 # CONFIG_USE_SSTRIP is not set
 CONFIG_USE_STRIP=y
@@ -183,7 +160,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
@@ -197,11 +173,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
@@ -211,7 +185,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
@@ -220,3 +193,6 @@ CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_SIGNED_PACKAGES is not set
 CONFIG_KERNEL_DEVTMPFS=y
 CONFIG_KERNEL_DEVTMPFS_MOUNT=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/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,16 +0,0 @@
-# CONFIG_PACKAGE_libcgroup-daemon is not set
-# CONFIG_PACKAGE_libcgroup is not set
-
-# CONFIG_PACKAGE_natalie-dect 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_omcproxy=y
-CONFIG_PACKAGE_kmod-nf-nathelper=y
-CONFIG_PACKAGE_kmod-nf-nathelper-extra=y
-# CONFIG_PACKAGE_endptmngr is not set

iop/iop.completion

@@ -5,14 +5,14 @@
 
 _iop_get_profiles()
 {
-    find feeds/feed_inteno_targets/iopsys-*/ -name '*.diff' \
+    find feeds/targets/iopsys-*/ -name '*.diff' \
         |awk -F'/' '{print$NF}' \
         |awk -F. '{print$1}'
 }
 
 _iop_get_models()
 {
-    find feeds/feed_inteno_targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
+    find feeds/targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
         |awk -F'/' '{print$NF}' \
         |egrep '^(cg|dg|eg|vg|vox)[0-9]'
 }
@@ -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/extract_core.sh

@@ -24,7 +24,7 @@ function extract_core {
 		echo ""
 		echo "Example: $0 extract_core"
 		echo "  -p package/utils/busybox"
-		echo "  -r feeds/feed_inteno_openwrt"
+		echo "  -r feeds/lede_core"
 		echo "  -b devel"
 	}
 

iop/scripts/feeds_update.sh

@@ -28,18 +28,19 @@ function feeds_update {
 
     # replace core packages with iopsys versions
     if [ $override == 1 ]; then
-		./scripts/feeds install -f -p feed_inteno_openwrt -a
-		./scripts/feeds install -f -p feed_inteno_lede -a
+		./scripts/feeds install -f -p lede_core -a
     fi
 
     # targets need to be installed explicitly
-    ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-mips
-    ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-arm
-    ./scripts/feeds install -p feed_inteno_targets iopsys-ramips
-    ./scripts/feeds install -p feed_inteno_targets_grx iopsys-grx
+    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
@@ -48,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,52 +7,131 @@ function genconfig {
 	export FILEDIR="files/"
 	export THEMEDIR="themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
-	export CONFIGPATH="package/feeds/feed_inteno_packages/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"
-
-	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02 eg200"
-	iopsys_brcm63xx_arm="dg400 eg400 sdx810_rg f104w f104 dg400prime dg400primeb 963138REF_P502"
-	iopsys_ramips="ex400 sdx810_ap"
-	ramips="mt7621"
 	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"
 
-	set_target()
-	{
-	local profile=$1
+	Red='\033[0;31m'          # Red
+	Color_Off='\033[0m'       # Text Reset
+	Yellow='\033[0;33m'       # Yellow
 
-	for p in $iopsys_brcm63xx_mips; do
-		if [ $p == $profile ]; then
-			target="iopsys_brcm63xx_mips"
-			return
+	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
+	    done
+	    # option not found return true
+	    return 0
+	}
 
-	for p in $iopsys_brcm63xx_arm; do
-		if [ $p == $profile ]; then
-			target="iopsys_brcm63xx_arm"
-			return
-		fi
-	done
+	function verify_config {
+	    IFS=$'\n'
+	    org=$(<.genconfig.config)
+	    unset IFS
+	    local num
+	    local conf_opt
+	    local conf_org
+	    local conf_new
 
-	for p in $iopsys_ramips; do
-		if [ $p == $profile ]; then
-			target="iopsys_ramips"
-			return
+	    #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
-	done
+		num=$((num+1))
+	    done
+	}
 
-	for p in $ramips; do
-		if [ $p == $profile ]; then
-			target="ramips"
-			masterconfig=0
+	# Takes a board name and returns the target name in global var $target
+	set_target() {
+	    local profile=$1
+
+
+		[ -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
+
+	    for p in $iopsys_brcm63xx_mips; do
+		if [ $p == $profile ]; then
+		    target="iopsys_brcm63xx_mips"
+			config_path="$brcm63xx_mips/config"
+		    return
 		fi
-	done
+	    done
+
+	    for p in $iopsys_brcm63xx_arm; do
+		if [ $p == $profile ]; then
+		    target="iopsys_brcm63xx_arm"
+			config_path="$brcm63xx_arm/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_ramips; do
+		if [ $p == $profile ]; then
+		    target="iopsys_ramips"
+			config_path="$ramips/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_intel_mips; do
+		if [ $p == $profile ]; then
+		    target="intel_mips"
+			config_path="$intel_mips/config"
+		    return
+		fi
+	    done
 
 	}
 
@@ -60,21 +139,16 @@ function genconfig {
 		DEVELOPER=1
 
 		bcmAllowed=0
-		iceAllowed=0
 		endptAllowed=0
 		natalieAllowed=0
 		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 ;;
-			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
 	}
 
 	v() {
@@ -83,19 +157,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 "  -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
 	}
@@ -155,7 +230,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
@@ -186,90 +261,84 @@ 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
+		v "Config $BOARDTYPE selected"
+		v "cp $CONFIGPATH/config .config"
+		cp $CONFIGPATH/config .config
+
+		if [ -f $config_path/config ]; then
+		    cat $config_path/config >> .config
+		fi
+		if [ -f $config_path/$BOARDTYPE/config ]; then
+		    cat $config_path/$BOARDTYPE/config >> .config
 		fi
 
-		# Add target (soc/board specific )
-		if [ -f $CONFIGPATH/target/config ]; then
-		    cat $CONFIGPATH/target/config >> .config
-		fi
-		if [ -f $CONFIGPATH/target/$target/config ]; then
-		    cat $CONFIGPATH/target/$target/config >> .config
-		fi
-		if [ -f $CONFIGPATH/target/$target/$BOARDTYPE/config ]; then
-		    cat $CONFIGPATH/target/$target/$BOARDTYPE/config >> .config
-		fi
-
-		# Apply profile diff to master config if selected
-		if [ -n "$PROFILE" ]; then
-			if [ -e "$CONFIGPATH/$PROFILE.diff" ]; then
-				cat $CONFIGPATH/$PROFILE.diff >> .config
-			elif [ "$PROFILE" == "juci" ]; then
-				v "Default profile (juci) is selected."
-			else
-				echo "ERROR: profile $PROFILE does not exist!"
-				exit 1
-			fi
+		#special handling for intel_mips which use TARGET_DEVICES
+		if [ "$target" = "intel_mips" ]; then
+			subtarget="xrx500"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
+			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
+			device=$(echo $BOARDTYPE | tr a-z A-Z)
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
 		else
-			v "No profile selected! Using default."
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
 		fi
 
-		# Set target and profile
-		echo "CONFIG_TARGET_${target}=y" >> .config
-		echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-
-		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
@@ -285,21 +354,26 @@ function genconfig {
 			# rewrite url to clone with ssh instead of http
 			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
 			[ $bcmAllowed -eq 0 ] && echo "CONFIG_BCM_OPEN=y" >> .config
-			[ $iceAllowed -eq 0 ] && echo "CONFIG_ICE_OPEN=y" >> .config
 			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
 			[ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
 			[ $mediatekAllowed -eq 0 ] && echo "CONFIG_MEDIATEK_OPEN=y" >> .config
+			[ $wifilifeAllowed -eq 0 ] && echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		else
-			echo "CONFIG_GITMIRROR_REWRITE=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
 			echo "CONFIG_NATALIE_OPEN=y" >> .config
 			echo "CONFIG_MEDIATEK_OPEN=y" >> .config
+			echo "CONFIG_WIFILIFE_OPEN=y" >> .config
+		fi
+
+		if [ -n "$BRCM_MAX_JOBS" ]
+		then
+		    echo "CONFIG_BRCM_MAX_JOBS=\"1\"" >>.config
 		fi
 
 		# Force regeneration of themes
-		touch package/feeds/feed_inteno_juci/juci/Makefile
+		touch package/feeds/juci/juci/Makefile
 
 		# Force regeneration of kernel Makefile
 		# Needed to disable kmods for iopsys-brcm targets
@@ -309,23 +383,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 #####
@@ -350,9 +420,11 @@ 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;;
+			-b|--boards)set_target LIST;exit 0;;
 			-*)
 				echo "Invalid option: $1 "
 				echo "Try -h or --help for more information."
@@ -363,10 +435,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

@@ -1,79 +1,79 @@
-#!/bin/sh
+#!/bin/bash
 
 
 build_bcmkernel_consumer() {
 	local tarfile bcmkernelcommith sdkversion
 	sdkversion=$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')
 	sdkversion=${sdkversion:0:4}${sdkversion:(-1)}
-	bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/feed_inteno_broadcom/bcmkernel/${sdkversion:0:5}*.mk | cut -d'=' -f2)
+	bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/broadcom/bcmkernel/${sdkversion:0:5}*.mk | cut -d'=' -f2)
 	# do not build bcmopen sdk if it was already built before
 	[ -n "$board" -a -n "$bcmkernelcommith" ] || return
-	ssh $SERVER "ls $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz" && return
+	ssh $SERVER "test -f $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz" && return
 	cd ./build_dir/target-*/bcmkernel-*-${sdkversion:0:4}*/bcm963xx/release
-	sh do_consumer_release -p $profile -y -F
+	bash do_consumer_release -p $profile -y -F
 	tarfile='out/bcm963xx_*_consumer.tar.gz'
 	[ $(ls -1 $tarfile |wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
-	scp $tarfile $SERVER:$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz
-	ssh $SERVER "ln -s $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz $FPATH/bcmopen-$board-$majver.$minver.tar.gz"
+	scp -pv $tarfile $SERVER:$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz
+	ssh $SERVER "[ -f $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz ] && ln -sf $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz $FPATH/bcmopen-$board-$majver.$minver-latest"
 	rm -f $tarfile
-	cd $curdir
+	cd "$curdir"
 }
 
 build_natalie_consumer() {
 	# create natalie-dect open version tar file
 	local natalieversion nataliecommith
 	grep -q "CONFIG_TARGET_NO_DECT=y" .config && return
-	natalieversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/natalie-dect/Makefile | cut -d'=' -f2)
-	nataliecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/natalie-dect/Makefile | cut -d'=' -f2)
+	natalieversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
+	nataliecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
 	[ -n "$profile" -a -n "$natalieversion" -a -n "$nataliecommith" ] || return
-	ssh $SERVER "ls $FPATH/natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz" && return
+	ssh $SERVER "test -f $FPATH/natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz" && return
 	cd ./build_dir/target-*/natalie-dect-$natalieversion/
 	mkdir natalie-dect-open-$natalieversion
-	cp NatalieFpCvm6362/Src/Projects/NatalieV3/FpCvm/Linux6362/dects.ko natalie-dect-open-$natalieversion/dect.ko
+	cp -f ipkg-*/natalie-dect/lib/modules/*/extra/dect.ko natalie-dect-open-$natalieversion/dect.ko
 	tar -czv  natalie-dect-open-$natalieversion/ -f natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz
-	scp natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $SERVER:$FPATH/
+	scp -pv natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $SERVER:$FPATH/
 	cp natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $curdir/
 	rm -rf natalie-dect-open-$natalieversion
 	rm -f natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz
-	cd $curdir
+	cd "$curdir"
 }
 
 build_endptmngr_consumer() {
 	# create endptmngr open version tar file
 	local endptversion endptcommith
 	grep -q "CONFIG_TARGET_NO_VOICE=y" .config && return
-	endptversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/endptmngr/Makefile | cut -d'=' -f2)
-	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/endptmngr/Makefile | cut -d'=' -f2)
+	endptversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
+	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
 	[ -n "$profile" -a -n "$endptversion" -a -n "$endptcommith" ] || return
-	ssh $SERVER "ls $FPATH/endptmngr-$profile-$endptversion-$endptcommith.tar.gz" && return
+	ssh $SERVER "test -f $FPATH/endptmngr-$profile-$endptversion-$endptcommith.tar.gz" && return
 	cd ./build_dir/target-*/endptmngr-$endptversion/
 	mkdir endptmngr-open-$endptversion
 	mkdir endptmngr-open-$endptversion/src
 	cp ./src/endptmngr endptmngr-open-$endptversion/src
 	cp -r ./files/ endptmngr-open-$endptversion/
 	tar -czv  endptmngr-open-$endptversion/ -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
-	scp endptmngr-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
+	scp -pv endptmngr-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
 	cp endptmngr-$profile-$endptversion-$endptcommith.tar.gz $curdir/
 	rm -rf endptmngr-open-$endptversion
 	rm -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
-	cd $curdir
+	cd "$curdir"
 }
 
-build_ice_consumer() {
-	# create ice-client open version tar file
-	local iceversion icebasever icerelease icecommith
-	icecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/ice-client/Makefile | head -1 | cut -d'=' -f2)
-	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/feed_inteno_packages/ice-client/Makefile | cut -d'=' -f2)
-	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/feed_inteno_packages/ice-client/Makefile | cut -d'=' -f2)
-	iceversion=$icebasever$icerelease
-	[ -n "$target" -a -n "$iceversion" -a -n "$icecommith" ] || return
-	ssh $SERVER "ls $FPATH/ice-client-$target-$iceversion-$icecommith.tar.gz" && return
-	cd ./build_dir/target-*/ice-client-$icebasever/ipkg-* || cd ./build_dir/target-mips*musl-*/ice-client-$icebasever/ipkg-*
-	tar -czv  ice-client -f ice-client-$target-$iceversion-$icecommith.tar.gz
-	scp ice-client-$target-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
-	cp ice-client-$target-$iceversion-$icecommith.tar.gz $curdir/
-	rm -f ice-client-$target-$iceversion-$icecommith.tar.gz
-	cd $curdir
+build_wifilife_consumer() {
+	local ver commit
+	ver=$(grep -w "PKG_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
+	commit=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
+	[ -n "$ver" -a -n "$commit" ] || return
+	ssh $SERVER "test -f $FPATH/wifilife-$target-${ver}_${commit}.tar.xz" && return
+	cd ./build_dir/target-*/wifilife-$ver/ipkg-* || cd ./build_dir/target-mips*musl-*/wifilife-$ver/ipkg-*
+	mkdir -p wifilife-$ver/src
+	cp -rf wifilife/usr/sbin/* wifilife-$ver/src/
+	tar Jcf wifilife-${target}-${ver}_${commit}.tar.xz wifilife-$ver
+	scp -pv wifilife-$target-${ver}_${commit}.tar.xz $SERVER:$FPATH/
+	cp wifilife-${target}-${ver}_${commit}.tar.xz $curdir/
+	rm -rf wifilife-$ver
+	rm -f wifilife-${target}-${ver}_${commit}.tar.xz
+	cd "$curdir"
 }
 
 build_mediatek_kernel() {
@@ -83,7 +83,7 @@ build_mediatek_kernel() {
 	kernel_version=$(grep KERNEL_PATCHVER target/linux/iopsys-ramips/Makefile  | cut -d '=' -f2)
 	kernel=linux-${kernel_version}.*
 	[ -n "$mediatek_commit" ] || return
-	ssh $SERVER "ls $FPATH/mediatek-kernel-open-$mediatek_commit.tar.gz" && return
+	ssh $SERVER "test -f $FPATH/mediatek-kernel-open-$mediatek_commit.tar.gz" && return
 	echo "Building mediatek kernel tarball from kernel commit:"	
 	echo $mediatek_commit
 	cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips*/$kernel
@@ -101,8 +101,8 @@ build_mediatek_kernel() {
 	cd ..
 
 	tar -czv $kernel -f mediatek-kernel-open-$mediatek_commit.tar.gz
-	scp mediatek-kernel-open-$mediatek_commit.tar.gz $SERVER:$FPATH/
-	cd $curdir
+	scp -pv mediatek-kernel-open-$mediatek_commit.tar.gz $SERVER:$FPATH/
+	cd "$curdir"
 }
 
 function print_usage {
@@ -112,9 +112,10 @@ function print_usage {
 
 function generate_tarballs {
 
-    SERVER="god@software.inteno.se"
-    FPATH="/var/www/html/iopsys/consumer"
+    SERVER="god@download.iopsys.eu"
+    FPATH="/var/www/html/iopsys/opensdk"
 
+    set -e
     git remote -v | grep -q http && return # do not continue if this is an open SDK environment
 
     target=$(grep CONFIG_TARGET_BOARD .config | cut -d'=' -f2 | tr -d '"')
@@ -122,7 +123,7 @@ function generate_tarballs {
     profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
     majver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f1 -d .)
     minver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f2 -d .)
-    curdir=$(pwd)
+    curdir="$PWD"
 
 
 	# Execute user command
@@ -151,10 +152,10 @@ function generate_tarballs {
 		build_bcmkernel_consumer
 		build_natalie_consumer
 		build_endptmngr_consumer
-		build_ice_consumer
+		build_wifilife_consumer
 	elif [ "$stk_target" == "mediatek" ]; then
 		build_mediatek_kernel
-		build_ice_consumer		
+		build_wifilife_consumer
 	else
 		echo "Invalid target: $stk_target"
 		print_usage

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