Merge remote-tracking branch 'origin/release-4.2'

-------------------------------------------------------------------------------
* c7228ea fix array size bounds for max interfaces
-------------------------------------------------------------------------------
commit c7228ea031f407580ff8e4801e0ba544aeadd050
Author: Anjan Chanda <anjan.chanda@iopsys.eu>
Date: 2019-04-08 13:40:40 +0200

    fix array size bounds for max interfaces

Base directory -> /
 wifimngr.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------

ated/Makefile

@@ -1,15 +1,8 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
+# Copyright (C) 2016 inteno
 #
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
@@ -24,13 +17,9 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/mediatek/ated.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 #PKG_BUILD_PARALLEL:=1
 

bashdb/Makefile

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

bbf/Config_bbfdm.in

@@ -1,37 +0,0 @@
-if PACKAGE_libbbfdm
-
-menu "Configuration"
-
-config BBF_VENDOR_EXTENSION
-	bool "Enable Vendor Extension"
-	default y
-
-config BBF_VENDOR_LIST
-	string "Vendor List"
-	default "iopsys"
-
-config BBF_VENDOR_PREFIX
-	string "Vendor Prefix"
-	default "X_IOPSYS_EU_"
-
-config BBF_TR181
-	bool "Enable TR-181 Data Model Support"
-	default y
-
-config BBF_TR104
-	bool "Enable TR-104 Data Model Support"
-	default y
-
-config BBF_TR143
-	bool "Enable TR-143 Data Model Support"
-	default y
-
-config BBFDM_ENABLE_JSON_PLUGIN
-	bool "Enable json plugin to extend datamodel"
-	default n
-
-config BBFDM_ENABLE_DOTSO_PLUGIN
-	bool "Enable shared library plugin to extend datamodel"
-	default n
-endmenu
-endif

bbf/Makefile

@@ -1,139 +0,0 @@
-#
-# Copyright (C) 2021 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libbbfdm
-PKG_VERSION:=6.5.6
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=aa25738c8e923a2ff54aaccb44bf8126435789f0
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libbbf_api
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=Library for libbbfdm API
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
-endef
-
-define Package/libbbfdm
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libcurl
-endef
-
-define Package/libbbfdm/config
-	source "$(SOURCE)/Config_bbfdm.in"
-endef
-
-define Package/libbbf_api/description
- Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
-endef
-
-define Package/libbbfdm/description
- Library contains the data model tree. It includes TR181, TR104 and TR143 data models
-endef
-
-USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
-ifneq ($(USE_LOCAL),)
-define Build/Prepare
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	-Wall -Werror \
-
-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_PACKAGE_libopenssl),y)
-CONFIGURE_ARGS += \
-	--enable-libopenssl
-endif
-
-ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
-CONFIGURE_ARGS += \
-	--enable-vendor-extension
-
-CONFIGURE_ARGS += \
-	BBF_VENDOR_LIST="$(CONFIG_BBF_VENDOR_LIST)" \
-	BBF_VENDOR_PREFIX="$(CONFIG_BBF_VENDOR_PREFIX)"
-
-endif ##CONFIG_BBF_VENDOR_EXTENSION
-
-ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
-CONFIGURE_ARGS += \
-	--enable-json-plugin
-endif
-
-ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
-CONFIGURE_ARGS += \
-	--enable-shared-library
-endif
-
-define Package/libbbf_api/install
-	$(INSTALL_DIR) $(1)/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
-endef
-
-define Package/libbbfdm/install
-	$(INSTALL_DIR) $(1)/lib
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
-endef
-
-define Package/libbbfdm/prerm
-	#!/bin/sh
-	rm -rf /etc/bbfdm/dmmap/*
-	exit 0
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
-	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.{a,so*} $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libbbf_api))
-$(eval $(call BuildPackage,libbbfdm))

bbk_cli/Makefile

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

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

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

bootchart2/Makefile

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

bulkdata/Makefile

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

bulkdata/files/etc/config/bulkdata

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

bulkdata/files/etc/init.d/bulkdatad

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

bulut/Makefile

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

catv/Makefile

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

catv/files/etc/config/catv

@@ -1,4 +1,4 @@
 
 config service 'catv'
-        option enable 'no'
+        option enable '0'
         option filter '3'

catv/files/etc/init.d/catv

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

crashlog/Makefile

@@ -0,0 +1,31 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=crashlog
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/crashlog
+  CATEGORY:=Utilities
+  TITLE:=Handling kernel crash logs
+endef
+
+define Package/crashlog/description
+	Handling kernel crash logs.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./files/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+endef
+
+define Package/crashlog/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,crashlog))

crashlog/files/etc/init.d/corelog

@@ -0,0 +1,11 @@
+#!/bin/sh /etc/rc.common
+
+START=01
+
+start()
+{
+    if [ -e /proc/sys/kernel/core_pattern ]
+    then
+	echo "|/sbin/logcore %e %s" > /proc/sys/kernel/core_pattern
+    fi
+}

crashlog/files/etc/init.d/crashlog

@@ -0,0 +1,56 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+
+send_log()
+{
+	nr=$(db get hw.board.serialNumber)
+	hw=$(db get hw.board.hardware)
+	hwv=$(db get hw.board.hardwareVersion)
+	bid=$(db get hw.board.boardId)
+	sw=$(db get hw.board.iopVersion)
+	server=$(/sbin/uci get system.crashlog.server)
+
+	while true
+	do
+	    scp  -S /usr/sbin/logssh /proc/last_kmsg log@${server}:log/${bid}_${hwv}_${hw}_${sw}_${nr}
+	    if [ $? == 0 ]
+	    then
+	       break;
+	    fi
+	    # wait for another minute then try again
+	    sleep 60
+	done
+}
+
+fill_in_default()
+{
+    /sbin/uci add system log
+    /sbin/uci rename system.@log[-1]=crashlog
+    /sbin/uci set system.crashlog.enable=no
+    /sbin/uci set system.crashlog.server="crash.inteno.se"
+    /sbin/uci commit
+}
+
+boot()
+{
+    # is crashlog enabled ?
+    enable=$(/sbin/uci get system.crashlog.enable)
+    case $enable in
+	0|no|NO|false|FALSE)
+	    exit 0
+	    ;;
+	"")
+	    fill_in_default
+	    exit 0
+	    ;;
+    esac
+
+    # is this boot a result from a crash ?
+    reason=$(cat /etc/boot_reason)
+    case $reason in
+	HW|WD)
+	    send_log&
+	    ;;
+    esac
+}

crashlog/files/sbin/logcore

@@ -0,0 +1,61 @@
+#! /bin/sh
+
+TMP_CORE=/tmp/new_core
+# first test if we can contact the log server.
+# if not abort directly the core file takes up memory
+alive()
+{
+	ping -c1 $server
+
+	if [ $? != 0 ]
+	then
+		# drain core file from kernel
+		cat >/dev/null
+		exit 0
+	fi
+}
+
+fill_in_default()
+{
+    /sbin/uci add system log
+    /sbin/uci rename system.@log[-1]=corelog
+    /sbin/uci set system.corelog.enable=no
+    /sbin/uci set system.corelog.server="crash.inteno.se"
+    /sbin/uci commit
+}
+
+# is corelog enabled ?
+enable=$(/sbin/uci get system.corelog.enable)
+case $enable in
+    0|no|NO|false|FALSE)
+	# drain core file from kernel
+	cat >/dev/null
+	exit 0
+	;;
+    "")
+	fill_in_default
+	exit 0
+	;;
+esac
+
+server=$(/sbin/uci get system.corelog.server)
+
+alive
+
+# dump out the core to disk we need this as scp needs a size before we send data
+# and this is the only way to know how much data there is
+cat >$TMP_CORE
+
+# in case filesystem/memory is full at least kill the core in the kernel memory should give us some
+# more memory to work with. normally this would do nothing.
+cat >/dev/null
+
+nr=$(db get hw.board.serialNumber)
+hw=$(db get hw.board.hardware)
+hwv=$(db get hw.board.hardwareVersion)
+bid=$(db get hw.board.boardId)
+sw=$(db get hw.board.iopVersion)
+
+scp -S /usr/sbin/logssh $TMP_CORE log@${server}:log/core_${1}_${2}_${bid}_${hwv}_${hw}_${sw}_${nr}
+rm $TMP_CORE
+

crashlog/files/usr/sbin/logssh

@@ -0,0 +1,6 @@
+#!/bin/sh
+# we need to have the -y option to dropbear to not halt the scp when
+# transfering the log file to a new server for the first time.
+# since we already need this also put in the keyfile
+
+ssh -y -i /etc/dropbear/logid $@

crashlog/readme

@@ -0,0 +1,42 @@
+Install scp server.
+
+Create a user account on a server and make sure it's possible to login to it
+using ssh.
+
+For now the user has to be called "log"
+
+USER is the user name of the account
+HOME is the user home directory.
+Both should be changed to the correct value in all following example commands.
+
+create HOME/bin
+Put scp_upload in HOME/bin
+make it executable "chmod a+x HOME/bin/scp_upload" 
+
+create home/.ssh   (observer the dot .shh)
+
+create an empty file HOME/.ssh/authorized_keys
+
+-------------------------------
+Now everyhting is setup for use but we have not added any clients.
+What we need is the public key for the clients.
+
+For dropbear "dropbearkey -y -f files/etc/dropbear/logid" will generate the public key.
+
+----------
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwn9RaDAzxW1dTmIhXgFBnpi1lhj8xhYpCVQiPxxdk9IEmH8zjo4y9j3sPkqKOlRnkwjpZIpLEKBnpQTwVIMCU/AG7nDJX3OH9RfS9mLJQLfFL8HyGCyqDezFWldbyovhJZvdUeK4tAXJWv2W3OVHiz2L8IlncBgP/E9DJElsyhhQHsM96UE6tBkXsvXkoDbMSYXFcLbgiUwBKfmM2BF/aPDL45iznGur7/2j9v95PwJ0gtMu9jjNRq+pXCXhTh3bsnczm0MpZC1aiRc9nJAeGIMmhrf15E4jBKgTnrstzJxGVAdajKeR954KcNsS33cS2Wmui2YjmPbBXjqf1frzJ log@inteno
+----------
+
+The public key should be just one line. Add that line to the 
+HOME/.ssh/authorized_keys file on the scp server. Then add the follwoing as
+the first text on the same line. that is insert before the key data.
+
+command="HOME/bin/scp_upload",no-port-forwarding,no-agent-forwarding,no-X11-forwarding 
+
+Do not forget to change HOME to the correct value for the server and there 
+should be one space separating the key data and the above text.
+---------------------------------
+Now test to make sure that you can upload new files, not download files
+and not overwrite files from the client.
+
+

crashlog/scp_upload

@@ -0,0 +1,53 @@
+#! /bin/bash
+# authorized_keys command="/home/boxi/my_scp",no-port-forwarding,no-agent-forwarding,no-X11-forwarding
+
+val=`expr match "$SSH_ORIGINAL_COMMAND" "scp"`
+if [ $val != 3 ]
+then
+    echo "only scp is allowed for this rsa key"
+    exit 1
+fi
+
+#strip out "scp" as getopts barf on anything not an option
+
+args=${SSH_ORIGINAL_COMMAND:3}
+
+# we must set args to positional paramters otherwise it's next to impossible
+# to get to the rest of the line that is not arguments.
+
+set -- $args
+while getopts "rftdvpq" Option
+do
+  case $Option in
+    r ) echo "recursive not allowed";exit 1;;
+    f ) echo "reading files not allowed";exit 1;;
+    t ) ;;
+    d ) ;;
+    v ) ;;
+    p ) ;;
+    q ) ;;
+    * ) ;;   # Default.
+  esac
+done
+
+shift $(($OPTIND - 1))
+
+file="$*"
+dir=$(dirname "$file")
+
+if [ "$dir" != "log" ]
+then
+    echo "only allowed to write to log/"
+    exit 1
+fi
+
+# try to create uniq files
+EXTRA=$((0))
+while [ -e "${file}_${EXTRA}" ]
+do
+    EXTRA=$((EXTRA +1))
+done
+
+logger -t scp_upload "${SSH_ORIGINAL_COMMAND}_${EXTRA}"
+
+exec ${SSH_ORIGINAL_COMMAND}_${EXTRA}

dectmngr/Config.in

@@ -1,11 +0,0 @@
-if PACKAGE_dectmngr
-
-menu "Configuration"
-
-config ENABLE_LINE_SETTINGS_EXTENSION
-	bool "Enable Line Settings List extension "
-	default y
-
-endmenu
-
-endif

dectmngr/Makefile

@@ -1,74 +0,0 @@
-#
-# Copyright (C) 2021 IOPSYS Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dectmngr
-PKG_RELEASE:=3
-PKG_VERSION:=3.5.1
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ef9d4c6124d0ca66f048f3d678d9a25f13aa4207
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_LICENSE:=PROPRIETARY
-PKG_LICENSE_FILES:=LICENSE
-
-RSTRIP:=true
-export BUILD_DIR
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-	CATEGORY:=Utilities
- 	TITLE:=DECT Manager
-	DEPENDS:= +libubox +ubus +uci +libxml2
-endef
-
-define Package/$(PKG_NAME)/description
-	DECT manager is a daemon that provides UBUS RPC objects and sends UBUS events for communication with the DECT chip.
-endef
-
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -av --exclude=.* ~/git/voip/dectmngr/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-TARGET_CFLAGS += \
-	-Wall \
-        -Werror \
-	-I$(STAGING_DIR)/usr/include/libxml2
-
-ifeq ($(CONFIG_ENABLE_LINE_SETTINGS_EXTENSION),y)
-TARGET_CFLAGS += -DENABLE_LINE_SETTINGS_EXTENSION
-endif
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/dectmngr $(1)/usr/sbin/
-	$(STRIP) $(1)/usr/sbin/dectmngr
-	$(CP) ./files/etc/* $(1)/etc/
-	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/dect $(1)/lib/upgrade/keep.d/dect
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

dectmngr/files/etc/config/dect

@@ -1,2 +0,0 @@
-config dect 'global'
-	option log_dect_cmbs 'syslog'

dectmngr/files/etc/init.d/dectmngr

@@ -1,96 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-source /lib/functions/uci-defaults.sh
-
-START=70
-STOP=12
-
-USE_PROCD=1
-NAME=dectmngr
-PROG=/usr/sbin/dectmngr
-LOG_PATH=/var/log/dectmngr
-DB_PATH=/etc/dect
-
-# Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
-stop_and_wait_dectmngr() {
-	pidof $NAME && killall -q $NAME
-
-	pidof $NAME && sleep 2 # wait for the process to stop gracefully
-	while pidof $NAME; do
-		killall -q -9 $NAME 
-		sleep 1
-	done
-}
-
-start_service() {
-	local opt_ext=
-	local rfpi=
-	local model_id=
-	local rxtun=
-
-	test $(db get hw.board.hasDect) = "0" && return
-
-	echo 1 > /sys/class/gpio/gpio14/value
-
-	rfpi=$(db -q get hw.board.dect_rfpi)
-	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"
-
-	model_id=$(db -q get hw.board.dect_model_id)
-	[ -n "$model_id" -a ${#model_id} -eq 8 ] || {
-		echo "Invalid hw.board.dect_model_id:$model_id. Set to 30.3B.06"
-		model_id="30.3B.06"
-	}
-	opt_ext="$opt_ext -model $model_id"
-
-	rxtun=$(db -q get hw.board.dect_rxtun)
-	[ -n "$rxtun" -a ${#rxtun} -eq 2 ] && opt_ext="$opt_ext -rxtun $rxtun"
-
-	config_load dect
-	config_get log_dect_cmbs global log_dect_cmbs syslog
-
-	procd_open_instance
-	if [ "$log_dect_cmbs" = "none" ]; then
-		echo "Starting dectmngr with cmbs logging disabled"
-		procd_set_param command $PROG -comname ttyH0 $opt_ext
-		rm -f $LOG_PATH/*
-	elif [ "$log_dect_cmbs" = "file" ]; then
-		echo "Starting dectmngr with cmbs logging enabled to file"
-		procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_ext
-	else
-		echo "Starting dectmngr with cmbs logging enabled to syslog"
-		procd_set_param command $PROG -comname ttyH0 -syslog $opt_ext
-		rm -f $LOG_PATH/*
-	fi
-
-	procd_set_param respawn 6 2 3
-	procd_set_param term_timeout 20
-	procd_set_param triggers asterisk
-	procd_close_instance
-}
-
-stop_service() {
-	test $(db get hw.board.hasDect) = "0" && return
-
-	echo 0 > /sys/class/gpio/gpio14/value
-	stop_and_wait_dectmngr
-}
-
-reload_service() {
-	ubus call dect reload
-}
-
-service_triggers()
-{
-	procd_add_config_trigger "config.change" "asterisk" /etc/init.d/dectmngr restart
-	procd_add_config_trigger "config.change" "dect" /etc/init.d/dectmngr reload
-}
-
-boot() {
-	echo 14 > /sys/class/gpio/export
-	echo out > /sys/class/gpio/gpio14/direction
-
-	[ ! -d $LOG_PATH ] && mkdir -p $LOG_PATH
-	[ ! -d $DB_PATH ] && mkdir -p $DB_PATH
-	start
-}
-

dectmngr/files/lib/upgrade/keep.d/dect

@@ -1 +0,0 @@
-/etc/dect/LA_DB

dectmngr2/Makefile

@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_RELEASE:=1
+PKG_VERSION:=1.2.0
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=0c029ed2486342e7e7687631b702d5c743f3c41a
+PKG_NAME:=dectmngr2
+
+
+RSTRIP:=true
+export BUILD_DIR
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dectmngr2
+  CATEGORY:=Utilities
+  TITLE:=Dectmngr2
+  URL:=
+  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent
+endef
+
+define Package/dectmngr2/description
+	Dectmngr2
+endef
+
+
+define Package/dectmngr2/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/dect/
+	$(INSTALL_DIR) $(1)/etc/config/
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_DIR) $(1)/etc/uci-defaults/
+
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dectmngr2 $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/target.bin $(1)/etc/dect/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/nvs_default $(1)/etc/dect/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dect $(1)/etc/init.d/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dectmngr-wrapper.sh $(1)/usr/sbin/
+	$(CP) ./files/dect.config $(1)/etc/config/dect
+	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
+endef
+
+$(eval $(call BuildPackage,dectmngr2))

dectmngr2/files/dect.config

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

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

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

dslmngr/Makefile

@@ -1,81 +0,0 @@
-#
-# Copyright (C) 2018 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dslmngr
-PKG_VERSION:=1.1.2
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=bb754ae620a9fc66fd6fc0745f0fead0708c7a17
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-
-include $(INCLUDE_DIR)/package.mk
-
-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 +libeasy
-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 \
-	-I$(STAGING_DIR)/usr/include/xdsl \
-	-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

@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# 
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=easy-qos
-PKG_VERSION:=1.1
-PKG_RELEASE:=0
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/easy-qos
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_intel_mips||TARGET_iopsys_brcm63xx_arm)
-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

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

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

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

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

@@ -1,140 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-USE_PROCD=1
-
-log() {
-	echo "${@}"|logger -t easy_qos.ebtable -p debug
-}
-
-exec_log() {
-	${@}
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-	fi
-}
-
-get_priority() {
-	local prio=$(echo $1|tr 'A-Z' 'a-z');
-	case "${prio}" in
-		"lowest")
-			echo 0;;
-		"low")
-			echo 1;;
-		"besteffort")
-			echo 2;;
-		"normal")
-			echo 3;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 5;;
-		"high")
-			echo 6;;
-		"highest")
-			echo 7;;
-	esac
-}
-
-validate_rule_section()
-{
-	uci_validate_section easy_qos rule "${1}" \
-		'priority:string' \
-		'macaddr:string' \
-		'proto:string:none' \
-		'port:list(uinteger)' \
-		'comment:string:none'
-}
-
-# Clear existing rules before applying new rules
-clear_existing_rules() {
-	local rule=$(ebtables -t broute -L BROUTING|grep -m 1 mark)
-	while [ -n "${rule}" ]; do
-		exec_log ebtables -t broute -D BROUTING ${rule}
-		rule=$(ebtables -t broute -L BROUTING|grep -m 1 mark)
-	done
-}
-
-create_rule() {
-	local protocol=$1; shift
-	local mac=$1; shift
-	local mark="0x$1"; shift
-	local forward_port=$1;
-	local cmd="";
-	local protocol_number
-
-	cmd="-j mark --mark-or ${mark}";
-	if [ -n "${forward_port}" ]; then
-		cmd="--ip-destination-port ${forward_port} ${cmd}";
-	fi
-	
-	case "${protocol}" in
-		"tcp")
-			protocol_number=6;;
-		"udp")
-			protocol_number=17;;
-		"dccp")
-			protocol_number=33;;
-		"sctp")
-			protocol_number=132;;
-		*)
-			log "Protocol ${protocol} not supported in ebtables"
-			return;;
-	esac
-			
-	cmd="--ip-proto ${protocol_number} $cmd"
-	cmd="-p ip $cmd"
-
-	cmd="-s ${mac} $cmd"
-	exec_log ebtables -t broute -A BROUTING ${cmd}
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num protocol
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	protocol=$(echo ${proto}|tr 'A-Z' 'a-z')
-	prio_num=$(get_priority ${priority})
-	if [ -n "${macaddr}" -a -n "${prio_num}" ]; then
-		for p in ${port}; do
-			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
-				create_rule tcp ${macaddr} ${prio_num} ${p}
-				create_rule udp ${macaddr} ${prio_num} ${p}
-			else
-				create_rule ${protocol} ${macaddr} ${prio_num} ${p}
-			fi
-		done
-		# Create rule for all ports if port is not mentioned in uci
-		if [ -z "${port}" ]; then
-			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
-				create_rule tcp ${macaddr} ${prio_num}
-				create_rule udp ${macaddr} ${prio_num}
-			else
-				create_rule ${protocol} ${macaddr} ${prio_num}
-			fi
-		fi
-	fi
-}
-
-reload_service() {
-	# Do not apply rules if ebtables is not present in system
-	[ -x /usr/sbin/ebtables ] || return;
-
-	clear_existing_rules
-	config_load easy_qos
-	config_foreach manage_rule rule
-}
-
-start_service() {
-	reload_service
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos"
-}
-

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

@@ -1,186 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-. /usr/share/libubox/jshn.sh
-
-START=99
-USE_PROCD=1
-
-CLIENT_LIST="/tmp/easy_qos_client.list"
-
-log() {
-	echo "${@}"|logger -t easy_qos -p debug
-}
-
-exec_log() {
-	${@}
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-	fi
-}
-
-get_priority() {
-	local prio=$(echo $1|tr 'A-Z' 'a-z');
-	case "${prio}" in
-		"lowest")
-			echo 0;;
-		"low")
-			echo 1;;
-		"besteffort")
-			echo 2;;
-		"normal")
-			echo 3;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 5;;
-		"high")
-			echo 6;;
-		"highest")
-			echo 7;;
-	esac
-}
-
-clean_client_entries() {
-	[ -f ${CLIENT_LIST} ] && rm ${CLIENT_LIST}
-}
-
-map_client_entries() {
-	local clients ip mac host
-
-	json_load "$(ubus call router.network 'clients')"
-	json_get_keys keys
-
-	for key in ${keys};
-	do
-		json_select ${key}
-		json_get_vars ipaddr macaddr hostname
-		clients="${macaddr} ${ipaddr} ${hostname};${clients}"
-		json_select ..
-	done
-
-	json_init
-
-#	json_add_array "clients"
-	IFS=";"
-	for client in ${clients};
-	do
-		macaddr=$(echo ${client} | cut -d" " -f1)
-		json_add_object "${macaddr//:/_}"
-		json_add_string "ip" "$(echo ${client} | cut -d" " -f2)"
-		json_add_string "macaddr" "$(echo ${client} | cut -d" " -f1)"
-		json_add_string "host" "$(echo ${client} | cut -d" " -f3)"
-		json_close_object
-	done
-
-	IFS=' '
-	echo `json_dump` > ${CLIENT_LIST}
-	json_cleanup
-}
-
-# Find the IP of a corresponding mac from arp table
-get_ipaddress() {
-	local clients ip mac host
-
-	json_load "$(cat ${CLIENT_LIST})"
-	json_get_keys keys
-
-	# jshn seems a bit iffy on having : in key, replace by _
-	json_select "${1//:/_}" 2 > /dev/null
-	json_get_var ip ip
-
-	echo "$ip"
-}
-
-validate_rule_section()
-{
-	uci_validate_section easy_qos rule "${1}" \
-		'priority:string' \
-		'macaddr:string' \
-		'proto:string:none' \
-		'port:list(uinteger)' \
-		'comment:string:none'
-}
-
-# Clear existing rules before applying new rules
-clear_existing_rules() {
-	local rule=$(iptables -t mangle -S PREROUTING | grep -m 1 MARK |sed 's/-A/-D/1')
-	while [ -n "${rule}" ]; do
-		exec_log iptables -t mangle ${rule}
-		rule=$(iptables -t mangle -S PREROUTING | grep -m 1 MARK |sed 's/-A/-D/1')
-	done
-}
-
-check_and_create() {
-	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
-	# Create rule if not exists
-	if [ ${?} -ne 0 ]; then
-		exec_log iptables -t mangle -A PREROUTING ${@}
-	else
-		log "Rule exists for ${@}"
-	fi
-}
-
-create_rule() {
-	local proto=$1; shift
-	local src_ip=$1; shift
-	local mark="0x$1/0x$1"; shift
-	local ports=$1;
-	local cmd="";
-
-	cmd="-j MARK --set-xmark ${mark}";
-	if [ -n "${ports}" ]; then
-		cmd="--match multiport --dports ${ports} ${cmd}";
-	fi
-
-	if [ "${proto}" == "icmp" ]; then
-		cmd="-p icmp -m icmp --icmp-type 8 $cmd"
-	elif [ "${proto}" == "all" ]; then
-		cmd="-p all $cmd"
-	else
-		cmd="-p ${proto} -m ${proto} $cmd"
-	fi
-	cmd="-s ${src_ip} $cmd"
-
-	check_and_create ${cmd} 
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num ip port_list
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	prio_num=$(get_priority ${priority})
-	ip=$(get_ipaddress ${macaddr})
-	port_list=$(echo ${port}|sed 's/ /,/g')
-
-	if [ -n "${ip}" -a -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
-			create_rule tcp ${ip} ${prio_num} ${port_list}
-			create_rule udp ${ip} ${prio_num} ${port_list}
-		else
-			create_rule ${proto} ${ip} ${prio_num} ${port_list}
-		fi
-	fi
-}
-
-reload_service() {
-	clear_existing_rules
-	map_client_entries
-	config_load easy_qos
-	config_foreach manage_rule rule
-	clean_client_entries
-}
-
-start_service() {
-	reload_service
-	echo "Easy QoS installed">/dev/console;
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos"
-}
-

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

@@ -1,8 +0,0 @@
-# Add firewall include
-uci -q batch <<-EOT
-        delete firewall.easyqos
-        set firewall.easyqos=include
-        set firewall.easyqos.path=/etc/firewall.easyqos
-        set firewall.easyqos.reload=1
-        commit firewall
-EOT

easy-soc-events/Makefile

@@ -1,110 +0,0 @@
-# All rights reserved.
-# See LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=easy-soc-events
-PKG_VERSION:=1.1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/easy-soc-events.git
-PKG_SOURCE_VERSION:=5c582b0165b574dc94e4865f82e0bb91fa561754
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-PKG_BUILD_DIR:=$(BUILD_DIR)/easy-soc-events-$(PKG_VERSION)
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
-
-include $(INCLUDE_DIR)/package.mk
-
--include $(TOPDIR)/.config
-
-ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
-  LINUX_DIR=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.1
-  LINUX_VERSION := 4.1.52
-  LINUXINCLUDE=-Iarch/$(LINUX_KARCH)/mach-bcm963xx/include
-  BCM_BS_PROFILE := $(patsubst "%",%,$(CONFIG_BCM_KERNEL_PROFILE))
-  FS_DIR := $(BUILD_DIR)/bcmkernel/bcm963xx/targets/$(BCM_BS_PROFILE)/fs
-  MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)/extra
-  TARGET_MODULES_DIR:=/$(MODULES_SUBDIR)
-endif
-
-
-define KernelPackage/easy-soc-events/default
-  SUBMENU:=Other modules
-endef
-
-define KernelPackage/easy-soc-events
-  $(KernelPackage/easy-soc-events/default)
-  TITLE:=Helper module for netlink event notification
-  FILES:=$(PKG_BUILD_DIR)/easyevent.ko
-  AUTOLOAD:=$(call AutoLoad,11,easyevent)
-endef
-
-define KernelPackage/easy-soc-events-test
-  $(KernelPackage/easy-soc-events/default)
-  TITLE:=Test module for event notification through easyevent
-  DEPENDS+=+kmod-easy-soc-events
-  FILES+=$(PKG_BUILD_DIR)/test/testevent.ko
-endef
-
-
-define KernelPackage/easy-soc-events/description
-  This is a helper module to generate and pass netlink events from
-  kernel to user applications.
-endef
-
-#NOSTDINC_FLAGS :=
-
-ifdef CONFIG_PACKAGE_kmod-easy-soc-events
-  PKG_MAKE_FLAGS += CONFIG_EASYEVENT=y
-endif
-
-LINUXINCLUDE += \
-		-I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/$(LINUX_UAPI_DIR) \
-		-Iarch/$(LINUX_KARCH)/include \
-		-Iarch/$(LINUX_KARCH)/include/generated \
-		-Iarch/$(LINUX_KARCH)/include/generated/$(LINUX_UAPI_DIR) \
-		-I$(LINUX_DIR)/include/generated/uapi \
-		-Iarch/$(LINUX_KARCH)/include/$(LINUX_UAPI_DIR) \
-		-include ./include/linux/kconfig.h
-
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-endef
-
-define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-		$(KERNEL_MAKE_FLAGS) V=1 \
-		$(PKG_MAKE_FLAGS) \
-		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
-		LINUXINCLUDE="$(LINUXINCLUDE)" \
-		SUBDIRS="$(PKG_BUILD_DIR)" \
-		modules
-endef
-
-
-ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
-define KernelPackage/easy-soc-events/install-extra
-	cp $(PKG_BUILD_DIR)/easyevent.ko $(FS_DIR)/lib/modules/$(LINUX_VERSION)/extra
-endef
-endif
-
-define KernelPackage/easy-soc-events/install
-	$(call KernelPackage/easy-soc-events/install-extra)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
-	#$(INSTALL_DIR) $(STAGING_DIR)/usr/include/linux
-	#$(CP) $(PKG_BUILD_DIR)/easysoc-event.h $(STAGING_DIR)/usr/include/linux/
-	#$(CP) $(PKG_BUILD_DIR)/easysoc-event.h $(LINUX_DIR)/include/linux/
-	$(CP) $(PKG_BUILD_DIR)/easyevent.h $(STAGING_DIR)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/wifievent.h $(STAGING_DIR)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/easyevent.h $(LINUX_DIR)/include/generated/uapi
-	$(CP) $(PKG_BUILD_DIR)/wifievent.h $(LINUX_DIR)/include/generated/uapi
-endef
-
-$(eval $(call KernelPackage,easy-soc-events-test))
-$(eval $(call KernelPackage,easy-soc-events))

easy-soc-libs/Config.in

@@ -1,5 +1,19 @@
-# libeasy configuration
+if (PACKAGE_libwifi || PACKAGE_libdsl || PACKAGE_libethernet)
+menu "configurations"
 
-config LIBWIFI_USE_CTRL_IFACE
-	bool "Use UNIX sockets"
+config IOP_LLA_LIBS_DEBUG
+	bool "Enable debugging support"
 	default n
+
+config LIBWIFI_DEBUG
+	depends on PACKAGE_libwifi
+	bool "Enable wifi debugging"
+	default n
+
+config LIBDSL_DEBUG
+	depends on PACKAGE_libdsl
+	bool "Enable xdsl debugging"
+	default n
+
+endmenu
+endif

easy-soc-libs/Makefile

@@ -1,130 +1,133 @@
 #
-# Copyright (C) 2020 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
+# Copyright (C) 2018 Iopsys
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.4.34
+PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4b4f04fb2485909fc56b409ae89296a815a98988
+PKG_SOURCE_VERSION:=6a311af7cd17fc410c27de3cfae33b658195fd0b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-endif
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/easy-soc-libs
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=IOPSYS Easy SoC libraries
-  SUBMENU:=IOPSYS Easy SoC libraries
+  TITLE:=IOPSYS easy SoC libraries
+  SUBMENU:=IOPSYS easy SoC libraries
   DEPENDS:=+libopenssl
   MENU:=1
 endef
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+define Package/libwifi/config
+  source "$(SOURCE)/Config.in"
+endef
+
+define Package/libwifi
+  $(call Package/easy-soc-libs)
+  TITLE:= WiFi library (libwifi)
+endef
+
+define Package/libdsl
+  $(call Package/easy-soc-libs)
+  TITLE:= XDSL library (libdsl)
+endef
+
+define Package/libethernet
+  $(call Package/easy-soc-libs)
+  TITLE:= Ethernet library (libethernet)
+  DEPENDS:=+TARGET_iopsys_ramips:swconfig
+endef
+
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
   TARGET_PLATFORM=BROADCOM
-  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
+  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+  TARGET_PLATFORM=BROADCOM
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
   TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
-else ifeq ($(CONFIG_TARGET_iopsys_x86),y)
-  TARGET_PLATFORM=TEST
-  TARGET_CFLAGS +=-DIOPSYS_TEST
-else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
-  TARGET_PLATFORM=TEST
-  TARGET_CFLAGS +=-DIOPSYS_TEST
+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, use default MAC80211)
-  TARGET_PLATFORM=MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_MAC80211
+  $(info (UNEXPECTED CONFIG TARGET))
 endif
 
-export TARGET_PLATFORM
+ifdef CONFIG_IOP_LLA_LIBS_DEBUG
+  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
+endif
 
 subdirs := \
-	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
-	$(if $(CONFIG_PACKAGE_libqos),libqos)
-
-EASY_SOC_LIBS := \
-	libeasy \
-	libwifi \
-	libdsl \
-	libethernet \
-	libqos
-
-ifeq ($(CONFIG_LIBWIFI_USE_CTRL_IFACE),y)
-  TARGET_CFLAGS +=-DLIBWIFI_USE_CTRL_IFACE
-endif
+	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/openssl \
 	-I$(STAGING_DIR)/usr/include/libnl3
 
 MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
+	CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	FPIC="$(FPIC)" \
 	PLATFORM="$(TARGET_PLATFORM)" \
 	subdirs="$(subdirs)"
 
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -r --exclude=.* ~/git/easy-soc-libs/ $(PKG_BUILD_DIR)/
+define Build/InstallDev/libwifi
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
 endef
-endif
 
-include easy.mk
-include wifi.mk
-include dsl.mk
-include ethernet.mk
-include qos.mk
-
-ifneq ($(wildcard $(PKG_BUILD_DIR)/.config_*),\
-	$(PKG_BUILD_DIR)/.config_$(patsubst "%",%,$(CONFIG_TARGET_PROFILE)))
-define Build/Compile/rebuild
-	$(FIND) $(PKG_BUILD_DIR) -name \*.o -or -name \*.so\* | $(XARGS) rm -f;
-	$(if $(wildcard $(PKG_BUILD_DIR)/config_*), \
-		rm -f $(PKG_BUILD_DIR)/.config_*)
+define Build/InstallDev/libdsl
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libdsl/xdsl.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
 endef
-endif
 
-STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell echo $(TARGET_CFLAGS) | mkhash md5)
-
-define Build/Compile
-	$(Build/Compile/rebuild)
-	touch $(PKG_BUILD_DIR)/.config_$(CONFIG_TARGET_PROFILE)
-	$(call Build/Compile/Default)
-	$(foreach dir,$(subdirs),$(call Build/Compile/$(dir)))
+define Build/InstallDev/libethernet
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libethernet/ethernet.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
 endef
 
+
 define Build/InstallDev
 	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
 endef
 
-define Package/easy-soc-libs/install
-	:
+define Package/libwifi/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
 endef
 
-$(eval $(foreach e,$(EASY_SOC_LIBS),$(call BuildPackage,$(e))))
+define Package/libethernet/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so* $(1)/usr/lib/
+endef
+
+define Package/libdsl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libwifi))
+$(eval $(call BuildPackage,libdsl))
+$(eval $(call BuildPackage,libethernet))

easy-soc-libs/dsl.mk

@@ -1,44 +0,0 @@
-
-define Package/libdsl
-  $(call Package/easy-soc-libs)
-  TITLE:= xDSL library (libdsl)
-endef
-
-define Package/libdsl/config
-  if PACKAGE_libdsl
-	  config LIBDSL_DEBUG
-		depends on PACKAGE_libdsl
-		bool "Enable dsl debugging"
-		default n
-
-	  config LIBDSL_TEST
-		depends on PACKAGE_libdsl
-		bool "Enable dsl test program"
-		default n
-
-  endif
-endef
-
-define Build/InstallDev/libdsl
-	$(INSTALL_DIR) $(1)/usr/include/xdsl
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libdsl/xdsl.h $(1)/usr/include/xdsl
-	$(CP) $(PKG_BUILD_DIR)/libdsl/xtm.h $(1)/usr/include/xdsl
-	$(CP) $(PKG_BUILD_DIR)/libdsl/common.h $(1)/usr/include/xdsl
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-endef
-
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-define Build/Compile/libdsl
-	$(MAKE) -C "$(PKG_BUILD_DIR)/libdsl/test" $(MAKE_FLAGS)
-endef
-endif
-
-define Package/libdsl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(CP) $(PKG_BUILD_DIR)/libdsl/test/libdsl_test $(1)/usr/bin/
-endif
-endef

easy-soc-libs/easy.mk

@@ -1,29 +0,0 @@
-
-
-define Package/libeasy
-  $(call Package/easy-soc-libs)
-  TITLE:= Common helper functions library (libeasy)
-  DEPENDS+=+libnl +libnl-route
-endef
-
-define Package/libeasy/config
-    source "$(SOURCE)/Config.in"
-endef
-
-define Build/InstallDev/libeasy
-	$(INSTALL_DIR) $(1)/usr/include/easy
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libeasy/easy.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/event.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/utils.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/if_utils.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/debug.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/hlist.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
-endef
-
-define Package/libeasy/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
-endef
-

easy-soc-libs/ethernet.mk

@@ -1,27 +0,0 @@
-
-define Package/libethernet
-  $(call Package/easy-soc-libs)
-  TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig
-endef
-
-define Package/libethernet/config
-  config LIBETHERNET_DEBUG
-	depends on PACKAGE_libethernet
-	bool "Enable ethernet debugging"
-	default n
-
-endef
-
-define Build/InstallDev/libethernet
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libethernet/ethernet.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
-endef
-
-define Package/libethernet/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so* $(1)/usr/lib/
-endef
-

easy-soc-libs/qos.mk

@@ -1,27 +0,0 @@
-
-define Package/libqos
-  $(call Package/easy-soc-libs)
-  TITLE:= QoS library (libqos)
-  DEPENDS+=+libnl +libnl-route +libeasy
-endef
-
-define Package/libqos/config
-  config LIBQOS_DEBUG
-	depends on PACKAGE_libqos
-	bool "Enable qos debugging"
-	default n
-
-endef
-
-define Build/InstallDev/libqos
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libqos/include/qos.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libqos/libqos.so $(1)/usr/lib/
-endef
-
-define Package/libqos/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libqos/libqos*.so* $(1)/usr/lib/
-endef
-

easy-soc-libs/wifi.mk

@@ -1,29 +0,0 @@
-
-define Package/libwifi
-  $(call Package/easy-soc-libs)
-  TITLE:= WiFi library (libwifi)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_brcm63xx_arm:bcmkernel
-endef
-
-define Package/libwifi/config
-  if PACKAGE_libdsl
-	  config LIBWIFI_DEBUG
-		depends on PACKAGE_libwifi
-		bool "Enable wifi debugging"
-		default n
-
-  endif
-endef
-
-define Build/InstallDev/libwifi
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
-endef
-
-define Package/libwifi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
-endef
-

endptmngr/Makefile

@@ -1,37 +1,35 @@
 #
-# Copyright (C) 2018 IOPSYS Software Solutions AB
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
+
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=endptmngr
-PKG_VERSION:=0.6
+PKG_RELEASE:=1
+PKG_VERSION:=0.2
+PKG_SOURCE_VERSION:=a78fe95d5c5a0a320f3b62b9d2faafd07b56e3a7
 
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
+
+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_NAME:=endptmngr-open
+else
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/endptmngr
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=94df920d39e8589c7ac7f5523bf372d48ef24c5e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
+PKG_NAME:=endptmngr
 endif
 
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-
+RSTRIP:=true
 export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
 
-# All config variable that are passed to the make invocation, directly or
-# indirectly. This ensures that the package is rebuilt on config-changes.
-PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
 
-export CONFIG_BRCM_SDK_VER_504021
-export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -41,28 +39,27 @@ endef
 
 define Package/endptmngr
   CATEGORY:=Utilities
-  TITLE:=Broadcom Voice Endpoint Manager
+  TITLE:=Brcmslic
   URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent +uci +bcmkernel @TARGET_HAS_VOICE @BCM_VOICE
+  DEPENDS:= +libubox +ubus +libpicoevent +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen
 endef
 
 define Package/endptmngr/description
 	endptmngr
 endef
 
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        rsync -av --exclude=.* ~/git/endptmngr/* $(PKG_BUILD_DIR)/
+ifeq ($(CONFIG_ENDPT_OPEN),y)
+
+define Build/Compile
 endef
+
 endif
 
-TARGET_CFLAGS += \
-        -Wall \
-        -Werror
 
 define Package/endptmngr/install
-	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	cp $(PKG_BUILD_DIR)/files/etc/init.d/* $(1)/etc/init.d/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/endptmngr $(1)/usr/sbin/
 endef
 

endptmngr/files/etc/init.d/endptmngr

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

ethmngr/Makefile

@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2020 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ethmngr
-PKG_VERSION:=2.0.1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5a0ff3bc7c49dcb05129f423ef8e0c4929f6aa03
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ethmngr.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ethmngr
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Ethernet status and configration utility
-  DEPENDS:=+libethernet +libuci +libubox +ubus +libpthread +libnl-genl
-endef
-
-define Package/ethmngr/description
- This package can be used to configure and provide status about
- the ethernet interfaces and ports through UBUS.
- It uses APIs from the libethernet.so library.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-define Package/ethmngr/install
-	$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/ethmngr.init $(1)/etc/init.d/ethmngr
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,ethmngr))

fatrace/Makefile

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

fdtextract/Makefile

@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2021 IOPSYS Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fdtextract
-PKG_RELEASE:=1
-PKG_VERSION:=1.0
-
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/fdtextract.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7e013f0afa68378d38a6bdc9b0c5a342bd3dd0a5
-PKG_MIRROR_HASH:=skip
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-RSTRIP:=true
-export BUILD_DIR
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-	CATEGORY:=Utilities
-	TITLE:=fdtextract
-	DEPENDS:= +libfdt
-endef
-
-define Package/$(PKG_NAME)/description
-	Command to extract sub images from FIT images.
-endef
-
-MAKE_FLAGS += \
-	CFLAGS+="-Wall"
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fdtextract $(1)/usr/sbin/
-	$(STRIP) $(1)/usr/sbin/fdtextract
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

fping/Makefile

@@ -0,0 +1,54 @@
+#
+# Copyright (C) 2016 Nikil Mehta <nikil.mehta@gmail.com>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fping
+PKG_VERSION:=4.0
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://fping.org/dist/
+PKG_HASH:=67eb4152b98ad34f99d2eec4e1098a0bb52caf13c0c89cd147349d08190fe8ce
+
+PKG_MAINTAINER:=Nikil Mehta <nikil.mehta@gmail.com>
+PKG_LICENSE:=BSD-4-Clause
+PKG_LICENSE_FILES:=COPYING
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/fping
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=sends ICMP ECHO_REQUEST packets to network hosts
+  URL:=http://fping.org/
+endef
+
+
+define Package/fping/description
+	fping is a ping like program which uses the Internet Control Message Protocol
+	(ICMP) echo request to determine if a target host is responding.  fping
+	differs from ping in that you can specify any number of targets on the command
+	line, or specify a file containing the lists of targets to ping.  Instead of
+	sending to one target until it times out or replies, fping will send out a
+	ping packet and move on to the next target in a round-robin fashion.
+endef
+
+CONFIGURE_ARGS+= \
+	--enable-ipv4 \
+	--enable-ipv6
+
+TARGET_CFLAGS += -std=gnu99
+
+define Package/fping/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fping $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,fping))

gigaset-elements/.gitignore

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

gigaset-elements/Makefile

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

gryphon-led-module/Makefile

@@ -1,78 +0,0 @@
-# Copyright (c) 2017 Genexis B.V.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=gryphon-led-kernel-module
-PKG_RELEASE:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/$(PKG_NAME)
-  SUBMENU:=LED modules
-  TITLE:=LED driver for Gryphon
-  FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
-  AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  DEPENDS:= +(TARGET_iopsys_brcm63xx_arm):bcmkernel
-  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)
-
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-	LINUX_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.19
-	MODULES_SUBDIR:=lib/modules/4.19.183
-	TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_PREFIX)-
-
-	ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"63158" "6856" "6858"))
-		# These targets use a 64-bit kernel
-		LINUX_KARCH:=arm64
-		TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_PREFIX)-
-	endif
-	# For some reason, Broadcom's kernel does not set the include paths correctly when compiling out-of-tree modules
-	EXTRA_KCPPFLAGS:="-I $(LINUX_DIR)/../bcmkernel/include -I $(LINUX_DIR)/arch/arm/mach-bcm963xx/include"
-endif
-
-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

@@ -1,26 +0,0 @@
-# Copyright (c) 2017 Genexis B.V.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-MODULE_NAME  = gryphon-led-kernel-module
-
-obj-m  := $(MODULE_NAME).o
-
-GENEXIS_FILES= \
-	main.o \
-	sk9822.o \
-	sk9822_bitbang.o
-
-$(MODULE_NAME)-objs := $(GENEXIS_FILES)

gryphon-led-module/src/main.c

@@ -1,334 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#define DEBUG 1
-
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/printk.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/platform_device.h>
-#include <linux/gpio/consumer.h>
-#include <linux/of.h>
-#include <linux/version.h>
-
-#include "sk9822.h"
-
-#define DRIVER_NAME			"canyon_led"
-#define DRIVER_AUTHOR		"Genexis B.V."
-#define DRIVER_DESC			"Canyon LED driver for SK9822"
-#define DRIVER_VERSION	"1"
-
-/**
- * sysfs interfaces
- */
-
-static ssize_t get_led_color(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	int len;
-	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
-
-	if (IS_ERR(sk9822)) {
-		printk(KERN_ERR "Platform get drvdata returned NULL\n");
-		return -EIO;
-	}
-
-	len = scnprintf(buf, PAGE_SIZE, "%02x%02x%02x\n", sk9822->led_colors[0].r, sk9822->led_colors[0].g, sk9822->led_colors[0].b);
-	if (len <= 0) {
-		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
-		return -EIO;
-	}
-
-	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 ssize_t get_led_brightness(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	int len;
-	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
-
-	if (IS_ERR(sk9822)) {
-		printk(KERN_ERR "Platform get drvdata returned NULL\n");
-		return -EIO;
-	}
-
-	len = scnprintf(buf, PAGE_SIZE, "%x\n", sk9822->led_brightness);
-	if (len <= 0) {
-		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
-		return -EIO;
-	}
-
-	return len;
-}
-
-/**
- * @brief Set LED brightness
- * @retval count number of bytes written
- * @retval -EINVAL if the message is not a valid hexadecimal number
- * @retval -EIO for all other errors (e.g. leds cannot be configured)
- */
-static ssize_t set_led_brightness(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t count)
-{
-	int ret = 0;
-	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
-	unsigned long val = SK9822_DEFAULT_BRIGHTNESS;
-
-	if (IS_ERR(sk9822)) {
-		printk(KERN_ERR "Platform get drvdata returned NULL\n");
-		return -EIO;
-	}
-
-	if (kstrtoul(buf, 16, &val)) {
-		return -EINVAL;
-	}
-
-	if(val > SK9822_DEFAULT_BRIGHTNESS) {
-		val = SK9822_DEFAULT_BRIGHTNESS;
-	}
-
-	sk9822->led_brightness = (uint8_t)val;
-
-	// Now push to the HW
-	ret = sk9822_update(sk9822);
-	if (ret != 0) {
-		printk(KERN_ERR "Failed to update led\n");
-		return -EIO;
-	}
-
-	return count;
-}
-static DEVICE_ATTR(led_brightness, S_IRUGO | S_IWUSR, get_led_brightness, set_led_brightness);
-
-
-static struct attribute *sk9822_dev_attrs[] = {
-	 &dev_attr_led_color.attr,
-	 &dev_attr_led_brightness.attr,
-	 NULL
-};
-
-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;
-	} else {
-		printk(KERN_INFO "Got led count: %u\n", leds->led_count);
-	}
-
-	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(4, 3, 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
-	if (IS_ERR(leds->clock_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
-				PTR_ERR(leds->clock_gpio));
-		leds->clock_gpio = NULL;
-		return PTR_ERR(leds->clock_gpio);
-	}
-
-	gpiod_direction_output(leds->clock_gpio, 1);
-	if (IS_ERR(leds->clock_gpio)) {
-		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(4, 3, 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
-	if (IS_ERR(leds->data_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
-				PTR_ERR(leds->data_gpio));
-		leds->data_gpio = NULL;
-		return PTR_ERR(leds->data_gpio);
-	}
-
-	gpiod_direction_output(leds->data_gpio, 1);
-	if (IS_ERR(leds->data_gpio)) {
-		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

@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-
-#include "sk9822.h"
-#include "sk9822_bitbang.h"
-
-cRGB __hexs_to_rgb(const char *hex)
-{
-	cRGB rgb;
-	int r, g, b;
-
-	sscanf(hex, "%02x%02x%02x", &r, &g, &b);
-	// This needs sanity checking
-	rgb.r = r;
-	rgb.g = g;
-	rgb.b = b;
-	return rgb;
-}
-
-/**
- * @brief update the color over the given device struct to the provided HEX color
- */
-int sk9822_set_color_str(struct sk9822_leds *sk9822, const char *hex)
-{
-	int i;
-	cRGB color = __hexs_to_rgb(hex);
-
-	for (i = 0; i < sk9822->led_count; i++) {
-		sk9822->led_colors[i] = color;
-	}
-
-	return 0;
-}
-
-/**
- * @brief write device struct to the device
- */
-int sk9822_update(struct sk9822_leds *sk9822)
-{
-	uint16_t i;
-	uint16_t led_count = sk9822->led_count;
-
-	// Start Frame
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-
-	for (i = 0; i < led_count; i++) {
-		cRGB *p = &sk9822->led_colors[i];
-		sk9822_bb_write(sk9822, 0xe0+sk9822->led_brightness);  // Maximum global brightness
-		sk9822_bb_write(sk9822, p->b);
-		sk9822_bb_write(sk9822, p->g);
-		sk9822_bb_write(sk9822, p->r);
-	}
-
-	// End frame
-	sk9822_bb_write(sk9822, 0xff);
-	sk9822_bb_write(sk9822, 0xff);
-	sk9822_bb_write(sk9822, 0xff);
-	sk9822_bb_write(sk9822, 0xff);
-
-	return 0;
-}

gryphon-led-module/src/sk9822.h

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef SK9822_H_
-#define SK9822_H_
-
-#include <linux/types.h>
-
-#define SK9822_DEFAULT_NUM_LEDS 32 // U16, used if DT param fails
-#define SK9822_DEFAULT_BRIGHTNESS 15  // 5-bit brightness, 0-31
-
-typedef struct {
-	uint8_t b;
-	uint8_t g;
-	uint8_t r;
-} cRGB;   // BGR (SK9822 Standard)
-
-struct sk9822_leds {
-	struct device *dev;
-	struct gpio_desc *clock_gpio;
-	struct gpio_desc *data_gpio;
-
-	cRGB *led_colors;
-	uint8_t led_brightness;
-	uint16_t led_count;
-};
-
-int sk9822_set_color_str(struct sk9822_leds *sk9822, const char *hex);
-int sk9822_update(struct sk9822_leds *sk9822);
-
-#endif /* SK9822_H_ */

gryphon-led-module/src/sk9822_bitbang.c

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <linux/gpio/consumer.h>
-#include <linux/delay.h>
-#include <linux/types.h>
-
-#include "sk9822.h"
-
-/**
- * @brief Bitbang write operation CLOCK+DATA
- *
- * Assumed state before call: CLOCK- Low, DATA- High
- */
-void sk9822_bb_write(struct sk9822_leds *sk9822, uint8_t c)
-{
-	uint8_t i;
-
-	for (i = 0; i < 8 ; i++) {
-		if (!(c&0x80)) {
-			gpiod_set_value(sk9822->data_gpio, 0); // set data low
-		} else {
-			gpiod_set_value(sk9822->data_gpio, 1); // set data high
-		}
-
-		gpiod_set_value(sk9822->clock_gpio, 1); // set clock high, data sampled here
-		c <<= 1;
-		udelay(1); // stretch clock
-		gpiod_set_value(sk9822->clock_gpio, 0); // set clock low
-	}
-
-	// State after call: SCK Low, Data high
-}

gryphon-led-module/src/sk9822_bitbang.h

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef _SK9822_BB_H_
-#define _SK9822_BB_H_
-
-#include <linux/types.h>
-
-#include "sk9822.h"
-
-void sk9822_bb_write(struct sk9822_leds *sk9822, uint8_t c);
-
-#endif /* _SK9822_BB_H_ */

ice-client/Config.in

@@ -0,0 +1,4 @@
+
+config ICE_OPEN
+       bool "Use pre-compiled version for Open SDK"
+       default n

ice-client/files/ice-client.uci_default

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

icgroupd/Makefile

@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2016 Inteno Broadband AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=icgroupd
+PKG_VERSION:=1.0
+PKG_RELEASE:=0
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Inteno Broadband AB
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/icgroupd
+  SECTION:=base
+  CATEGORY:=Base system
+  TITLE:=Inteno cgroup daemon
+  DEPENDS:=+uci +busybox
+endef
+
+define Package/icgroupd/description
+	This package contains Intenos cgroup daemon and associated
+	configuration and startup scripts.
+endef
+
+define Build/Compile
+	true
+endef
+
+define Package/icgroupd/install
+	$(INSTALL_DIR) $(1)/sbin $(1)/etc/init.d $(1)/etc/config
+
+	$(INSTALL_CONF) ./files/cgroups.config $(1)/etc/config/cgroups
+	$(INSTALL_BIN) ./files/cgroups.init $(1)/etc/init.d/cgroups
+	$(INSTALL_BIN) ./files/cgroupd $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,icgroupd))
+

icgroupd/files/cgroupd

@@ -0,0 +1,76 @@
+#!/bin/sh
+
+CGBASEDIR=$1
+CGCONFIG=$2
+[ -n "$CGBASEDIR" -a -n "$CGCONFIG" ] || exit 1
+
+[ -r /lib/functions.sh ] || exit 1
+. /lib/functions.sh
+
+CGPROCMAP=/tmp/cgprocmap
+CGPERIOD=3s
+
+DBGLOG=/tmp/cgroupd.log
+DEBUG=0
+
+
+add_to_procmap () {
+	local name_grp=$1
+	local name grp
+
+	name=$(echo $name_grp |awk -F= '{print $1}')
+	grp=$(echo $name_grp |awk -F= '{print $2}')
+
+	echo "($name) $grp" >> $CGPROCMAP
+}
+
+# Read configuration file and create process:group look-up table
+# in /tmp file
+read_config () {
+	local enab
+
+	config_load $CGCONFIG
+
+	config_get enab cgroups enabled "1"
+	[ $enab -eq 0 ] && exit 1
+
+	config_get CGDEFGROUP cgroups defgroup "_undef_"
+	[ "$CGDEFGROUP" == "_undef_" ] && exit 1
+	[ "$DEBUG" == "1" ] && echo "default $CGDEFGROUP" >> $DBGLOG
+
+	echo -n '' > $CGPROCMAP
+	config_list_foreach procmap procmap add_to_procmap
+	[ "$DEBUG" == "1" ] && cat $CGPROCMAP >> $DBGLOG
+}
+
+# Move all process except init from cgroup root to cgroups according
+# to /tmp look-up table
+move_wild_procs () {
+	local wild_procs=$(cat $CGBASEDIR/cgroup.procs)
+	local pid name grp
+
+	for pid in $wild_procs; do
+
+		[ $pid -eq 1 ] && continue
+		if [ -d /proc/$pid ]; then
+
+			name=$(awk '{print $2}' /proc/$pid/stat)
+			grp=$(awk "\$1==\"$name\" {print \$2}" $CGPROCMAP)
+
+			[ "$grp" == "." ] && continue
+			[ -n "$grp" ] || grp=$CGDEFGROUP
+
+			[ "$DEBUG" == "1" ] && \
+			    echo "Moving proc $pid $name to $grp" >> $DBGLOG
+			echo $pid > $CGBASEDIR/$grp/cgroup.procs
+		fi
+	done
+}
+
+
+[ "$DEBUG" == "1" ] && echo "$0 started $(date)" >> $DBGLOG
+read_config
+while true; do
+	move_wild_procs
+	sleep $CGPERIOD
+done

icgroupd/files/cgroups.config

@@ -0,0 +1,48 @@
+config cgroups cgroups
+	option enabled 1
+	option defgroup iopsys/normal
+
+config cgroup _root_
+#	list option cpu.rt_runtime_us=50000
+	list option memory.move_charge_at_immigrate=1
+
+config cgroup iopsys
+	list option cpu.shares=4096
+#	list option cpu.rt_runtime_us=40000
+	list option memory.limit_in_bytes=-1
+	list option memory.move_charge_at_immigrate=1
+
+config cgroup iopsys_normal
+	list option cpu.shares=1024
+#	list option cpu.rt_runtime_us=10000
+	list option memory.limit_in_bytes=-1
+	list option memory.move_charge_at_immigrate=1
+
+config cgroup iopsys_high
+	list option cpu.shares=4096
+#	list option cpu.rt_runtime_us=30000
+	list option memory.limit_in_bytes=-1
+	list option memory.move_charge_at_immigrate=1
+
+config cgroup 3prt
+	list option cpu.shares=1024
+#	list option cpu.rt_runtime_us=10000
+	list option memory.limit_in_bytes=75M
+	list option memory.move_charge_at_immigrate=1
+
+config cgroup 3prt_normal
+	list option cpu.shares=1024
+#	list option cpu.rt_runtime_us=2500
+	list option memory.limit_in_bytes=75M
+	list option memory.move_charge_at_immigrate=1
+
+config cgroup 3prt_high
+	list option cpu.shares=4096
+#	list option cpu.rt_runtime_us=7500
+	list option memory.limit_in_bytes=75M
+	list option memory.move_charge_at_immigrate=1
+
+config procmap procmap
+	list procmap kthreadd=.
+	list procmap minidlna=3prt/normal
+

icgroupd/files/cgroups.init

@@ -0,0 +1,93 @@
+#!/bin/sh /etc/rc.common
+
+START=01
+USE_PROCD=1
+PROCD_DEBUG=1
+NAME=cgroupd
+
+CGBASEDIR=/sys/fs/cgroup
+CGCONFIG="cgroups"
+
+DBGLOG=/tmp/cginit.log
+DEBUG=0
+
+
+cgroupinit_set_knob_value () {
+	local knob_val=$1
+	local dir=$2
+	local knob val
+
+	knob=$(echo $knob_val |awk -F= '{print $1}')
+	val=$(echo $knob_val |awk -F= '{print $2}')
+	/bin/echo $val > $CGBASEDIR/$dir/$knob
+	[ "$DEBUG" == "1" ] && \
+	    echo "/bin/echo $val > $CGBASEDIR/$dir/$knob (ret=$?)" >> $DBGLOG
+}
+
+cgroupinit_create_group () {
+	local cgrp=$1
+	local dir
+
+	[ "$DEBUG" == "1" ] && echo "Create group $cgrp:" >> $DBGLOG
+	if [ "$cgrp" == "_root_" ]; then
+		dir=.
+	else
+		dir=$(echo $cgrp |tr '_' '/')
+
+		if [ ! -d $CGBASEDIR/$dir ]; then
+			mkdir $CGBASEDIR/$dir
+			[ "$DEBUG" == "1" ] && \
+			    echo "mkdir $CGBASEDIR/$dir (ret=$?)" >> $DBGLOG
+		fi
+	fi
+
+	config_list_foreach $cgrp option cgroupinit_set_knob_value $dir
+}
+
+cgroupinit_configure_cgroups () {
+	local enab defgrp
+
+	[ "$DEBUG" == "1" ] && echo "$0 started $(date)" >> $DBGLOG
+	config_load $CGCONFIG
+
+	config_get enab cgroups enabled "1"
+	[ $enab -eq 0 ] && return 1
+
+	config_get defgrp cgroups defgroup "_undef_"
+	[ "$defgrp" == "_undef_" ] && return 1
+
+	if ! grep -q " $CGBASEDIR cgroup " /proc/mounts; then
+		mount -t cgroup -o nodev,noexec,nosuid cgroup $CGBASEDIR
+		[ $? -eq 0 ] || return 1
+	fi
+
+	config_foreach cgroupinit_create_group cgroup
+	return 0
+}
+
+start_service () {
+	cgroupinit_configure_cgroups
+	[ $? -eq 0 ] || return
+
+	procd_open_instance
+	procd_set_param command /sbin/cgroupd $CGBASEDIR $CGCONFIG
+	procd_set_param respawn
+	procd_close_instance
+}
+
+stop_service () {
+	local cgdir procs prc
+
+	for cgdir in $(find $CGBASEDIR -type d -mindepth 1 -depth); do
+		procs=$(cat $cgdir/cgroup.procs)
+		for prc in $procs; do
+			echo $prc > $CGBASEDIR/cgroup.procs
+		done
+		rmdir $cgdir
+	done
+}
+
+service_triggers() {
+        procd_add_reload_trigger $CGCONFIG
+}
+

icwmp/Config_cwmp.in

@@ -1,6 +1,9 @@
-if PACKAGE_icwmp
+if PACKAGE_icwmp-curl || PACKAGE_icwmp-zstream
+
+config CWMP_SCRIPTS_FULL
+	bool "Install all icwmp scripts"
+	default y
 
-menu "Configuration"
 choice
 	prompt "Select ACS sever"
 	default CWMP_ACS_MULTI
@@ -16,9 +19,17 @@ config CWMP_DEBUG
 	bool "Compile with debug options"
 	default y
 
+config XMPP_ENABLE
+	bool "enable xmpp feature"
+	default n
+
 config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
-endmenu
+
+config LIBDATAMODEL_VENDOR_PREFIX
+    string "Vendor Prefix"
+    default "X_IOPSYS_EU_"
+    
 endif
 

icwmp/Config_datamodel.in

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

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 iopsys Software Solutions AB
+# Copyright (C) 2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,18 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.2.27
+PKG_VERSION:=4.0-2019-04-25
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=da88c8c28656b2db54ab205d26faccda68546c05
+PKG_SOURCE_VERSION:=cd777bbd2dbe7477ec7665f12d3d20e6b2e9e052
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
@@ -27,26 +24,66 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_DEBUG \
 	CONFIG_CWMP_DEVEL_DEBUG
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/$(PKG_NAME)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libcurl
+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/$(PKG_NAME)/description
+define Package/icwmp_stun
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 stun Client
+	DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
+endef
+
+define Package/icwmp_xmpp
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 xmpp feature
+	DEPENDS:=+libuci +libubox +libexpat +libstrophe
+endef
+
+define Package/icwmp/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
+endef
+
+define Package/icwmp/description
  A free client implementation of CWMP (TR-069) protocol
 endef
 
-define Package/$(PKG_NAME)/config
+define Package/icwmp-curl
+  $(call Package/icwmp/Default)
+  TITLE+= (using libcurl)
+  DEPENDS+= +libcurl
+  VARIANT:=curl
+endef
+
+define Package/icwmp-zstream
+  $(call Package/icwmp/Default)
+  TITLE+= (using libzstream)
+  DEPENDS+= +libzstream
+  VARIANT:=zstream
+endef
+
+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
@@ -54,9 +91,52 @@ define Build/Prepare
 endef
 endif
 
+ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+TARGET_CFLAGS += -DEX400
+endif
+
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBDATAMODEL_VENDOR_PREFIX)\\\"
+
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""
+	-D_GNU_SOURCE -D_AADJ
+
+ifneq ($(CWMP_REVISION)_,_)
+ifneq ($(CWMP_REVISION),exported)
+ifneq ($(CWMP_REVISION),Unversioned directory)
+TARGET_CFLAGS += "-DCWMP_REVISION=\\\"$(CWMP_REVISION)\\\""
+TARGET_LDFLAGS += "-DCWMP_REVISION=\\\"$(CWMP_REVISION)\\\""
+endif
+endif
+endif
+
+TARGET_LDFLAGS += \
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+CONFIGURE_ARGS += \
+	--with-uci-include-path=$(STAGING_DIR)/usr/include \
+	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
+	--with-libubus-include-path=$(STAGING_DIR)/usr/include
+	
+ifeq ($(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 \
+	--with-zstream-include-path=$(STAGING_DIR)/usr/include
+endif
+
+ifeq ($(BUILD_VARIANT),curl)
+CONFIGURE_ARGS += \
+	--enable-http=curl
+endif
 
 ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
 CONFIGURE_ARGS += \
@@ -78,22 +158,84 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/etc/icwmpd
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin/icwmpd
-	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
-	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
-	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
-	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/95-icwmp-generate-ssl $(1)/etc/uci-defaults/
-	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
-	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
+define Package/libdatamodel/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib/
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+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
+	$(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
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmpd.init $(1)/etc/init.d/icwmpd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/90-cwmpfirewall
+ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)
+	$(INSTALL_DIR) $(1)/usr/share/icwmp
+	$(CP) $(PKG_BUILD_DIR)/scripts/defaults $(1)/usr/share/icwmp
+	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/icwmp
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/icwmp.sh $(1)/usr/sbin/icwmp
+endif
+	$(CP) ./files/* $(1)/
+endef
+
+define Package/icwmp_stun/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_stund $(1)/usr/sbin/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_stund $(1)/etc/init.d/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_stun $(1)/etc/config
+endef
+
+define Package/icwmp_xmpp/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_xmppd $(1)/usr/sbin/icwmp_xmppd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_xmppd $(1)/etc/init.d/icwmp_xmppd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_xmpp $(1)/etc/config
+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
+endef
+
+
+define Package/icwmp-$(BUILD_VARIANT)/postinst
+	#!/bin/sh
+	echo "$(CWMP_BKP_FILE)" >> $${IPKG_INSTROOT}/etc/sysupgrade.conf
+	if [ -z "$${IPKG_INSTROOT}" ]; then
+		echo "Enabling rc.d symlink for icwmpd"
+		/etc/init.d/icwmpd enable
+	fi
+	exit 0
+endef
+
+define Package/icwmp-$(BUILD_VARIANT)/prerm
+	#!/bin/sh
+	if [ -z "$${IPKG_INSTROOT}" ]; then
+		echo "Disabling rc.d symlink for icwmpd"
+		/etc/init.d/icwmpd disable
+	fi
+	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-zstream))

icwmp/README

@@ -0,0 +1,136 @@
+1)Build
+    Requirements<74>:
+	librairies:
+	- libuci.so
+	- libexpat.so
+	- libcurl.so
+	- libpthread.so
+	- libopenssl.so
+	- libz.so
+	- libcrypto.so
+	the librairies should be present in the "staging_dir/target-i386_uClibc-0.9.30.1/usr/lib/"  or "staging_dir/toolchain-mips_gcc-4.3.3+cs_uClibc-0.9.30.1/usr/lib"
+	
+	header files and folders:
+	- expat.h
+	- expat_external.h
+	- uci.h
+	- uci_config.h
+	- zlib.h
+	- curl folder
+	- openssl folder
+	the header files and folders should be present in the staging_dir/target-i386_uClibc-0.9.30.1/usr/include/ or staging_dir/toolchain-i386_gcc-4.1.2_uClibc-0.9.30.1/usr/include/
+
+
+if a librairie doesn't exist:
+ 	a- run make menuconfig and select the librarie
+	b- build the librarie package
+
+2) Build
+
+this software is composed of 3 packages:
+- icwmp package:  contains icwmpd daemon
+- cwmp lib package: contains cwmplib and contains cwmp_value_change binary. They could be used by other user space applications in order to notify the icwmp daemon when paramter changes
+- cwmp kernel package: contains cwmp kernel module. This module could be used by other kernel modules to notify the icwmpd daemon  when kernel parameter changes
+
+The three packages should be selected in the make menu config in order to get the three packages compiled.
+To compile the three packages: $ make package/cwmpd/compile 
+
+3) OpenWRT settings
+in the  OpenWRT, Add the following lines in the /usr/share/udhcpc/default.script file:
+ uci_set_state provisioning iup tr069url "$url"
+ uci_set_state provisioning iup provisioningcode "$provisioningcode"
+
+4) Run
+    Requirements:
+	- libuci package should be installed
+	- libexpat package should be installed
+	- libcurl package should be installed
+	- libpthread package should be installed
+	- libopenssl package should be installed
+	- libz package should be installed
+	- libcrypto package should be installed
+    
+    Configure the acs url in the /etc/config/icwmp
+    and then start the cwmpd service: /etc/init.d/icwmpd start
+    for the help: /etc/init.d/icwmpd
+
+5) Value Change
+
+5.1) value change for user space applications (using the libcwmp)
+
+Before using the libcwmp, we should check that the libcwmp package is selected in "make menu config". and we should check that the package is compiled.
+The libcwmp should be installed uin the OpenWRT firmware
+
+example of using libcwmp
+in myapplication.c
+
+#...
+#include <cwmp_lib.h>
+#...
+
+int anyfunction ()
+{
+   .....
+   /* parameter change here  */
+   /* so we inform the icwmp: */
+   lib_api_cwmp_value_change_call (3, "InternetGatewayDevice.LANDevice.{i}.LANHostConfigManagement.IPInterface.{i}.IPInterfaceIPAddress","lan2","3");
+   .....
+/*
+Description of lib_api_cwmp_value_change_call input parameters
+ parameter 1 : is the number of input string in the function lib_api_cwmp_value_change_call
+ parameter 2 : is the parameter path
+ parameter 3 : is the first correspondence related to the first indice
+ parameter 4 : is the second correspondence related to the second indice
+   .
+   .
+   .
+ parameter n : is the (n-2) correspondence related to the (n-2) indice
+*/
+
+}
+
+5.2) value change for user space applications (using the cwmp_value_change CLI)
+
+Before using the libcwmp, we should check that the libcwmp package is selected in "make menu config". and we should check that the package is compiled.
+The libcwmp should be installed uin the OpenWRT firmware
+
+in OpenWRT:
+
+root@OpenWrt:~# cwmp_value_change InternetGatewayDevice.LANDevice.{i}.LANHostConfigManagement.IPInterface.{i}.IPInterfaceIPAddress "lan2" "3"
+
+in this case the command will force cwmp client to send a notification to the ACS (if and only if the parameter path as configured as active or as passive parameter using the setAttributeParameter method)
+
+5.3) value change for kernel space modules
+Before using the cwmp kernel module for value change, we should check that the kernel module package is selected in "make menu config". and we should check that the package is compiled.
+The kernel module should be installed uin the OpenWRT firmware and should be insert before all other kernel modules
+
+example of using cwmp kernel module
+in mykernelmodule.c
+
+#...
+#include <linux/cwmp_kernel.h>
+#...
+
+int anykernelfunction ()
+{
+   .....
+   /* parameter change here  */
+   /* so we inform the cwmp: */
+   kernel_api_cwmp_value_change_call (3, "InternetGatewayDevice.LANDevice.{i}.LANHostConfigManagement.IPInterface.{i}.IPInterfaceIPAddress","lan2","3");
+   .....
+/*
+Description of lib_api_cwmp_value_change_call input parameters
+ parameter 1 : is the number of input string in the function lib_api_cwmp_value_change_call
+ parameter 2 : is the parameter path
+ parameter 3 : is the first correspondence related to the first indice
+ parameter 4 : is the second correspondence related to the second indice
+   .
+   .
+   .
+ parameter n : is the (n-2) correspondence related to the (n-2) indice
+*/
+
+}
+
+
+

icwmp/files/etc/config/cwmp

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

icwmp/files/etc/firewall.cwmp

@@ -1,81 +0,0 @@
-#!/bin/sh
-
-#created by the icwmp package
-log() {
-	echo "${@}"|logger -t firewall.cwmp -p info
-}
-
-if [ ! -f "/var/state/cwmp" ]; then
-	touch "/var/state/cwmp"
-	exit 0;
-fi
-
-zone_name=$(uci -c /var/state -q get cwmp.acs.zonename)
-port=$(uci -q get cwmp.cpe.port)
-ipaddr=$(uci -c /var/state -q get cwmp.acs.ip)
-ip6addr=$(uci -c /var/state -q get cwmp.acs.ip6)
-incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr 'A-Z' 'a-z')
-
-if [ -z "${zone_name}" ]; then
-	log "empty firewall zone name"
-	exit 0
-elif [ "$zone_name" = "icwmp" ]; then
-	iptables -nL zone_icwmp_input 2> /dev/null
-	if [ $? != 0 ]; then
-		iptables -w 1 -N zone_icwmp_input
-		iptables -w 1 -t filter -A INPUT -j zone_icwmp_input
-		iptables -w 1 -I zone_icwmp_input -p tcp --dport $port -j REJECT
-	else			
-		iptables -w 1 -F zone_icwmp_input
-		iptables -w 1 -I zone_icwmp_input -p tcp --dport $port -j REJECT
-	fi			
-else
-	iptables -w 1 -F zone_icwmp_input 2> /dev/null
-	iptables -w 1 -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
-	iptables -w 1 -X zone_icwmp_input 2> /dev/null
-fi
-
-cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"
-cmd6="ip6tables -w 1 -I zone_${zone_name}_input -p tcp"
-
-# default incoming rule is Port only
-if [ -z "${incoming_rule}" ]; then
-	incoming_rule="port_only"
-fi
-
-if [ "${incoming_rule}" = "ip_only" ]; then
-	if [ -n "${ipaddr}" ]; then
-		cmd="${cmd} -s ${ipaddr}"
-		cmd6="${cmd6} -s ${ip6addr}"
-	fi
-elif [ "${incoming_rule}" = "port_only" ]; then
-	if [ -n "${port}" ]; then
-		cmd="${cmd} --dport ${port}"
-		cmd6="${cmd6} --dport ${port}"
-	fi
-else
-	if [ -n "${ipaddr}" ]; then
-		cmd="${cmd} -s ${ipaddr}"
-		cmd6="${cmd6} -s ${ip6addr}"
-	fi
-
-	if [ -n "${port}" ]; then
-		cmd="${cmd} --dport ${port}"
-		cmd6="${cmd6} --dport ${port}"
-	fi
-fi
-
-echo ${cmd}|grep -q "\-\-dport \|\-s "
-if [ "$?" -eq 0 ]; then
-	cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
-	${cmd}
-fi
-
-echo ${cmd6}|grep -q "\-\-dport \|\-s "
-if [ "$?" -eq 0 ]; then
-	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
-	${cmd6}
-fi
-
-uci -c /var/state -q set cwmp.cpe.firewall_restart="init"
-uci -c /var/state -q commit cwmp

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

@@ -0,0 +1,87 @@
+#!/bin/sh
+
+. /lib/functions/network.sh
+
+[ "$ACTION" == "ifup" ] || exit 0
+
+[ -f /etc/config/cwmp ] || exit 0
+
+handle_icwmp_restart() {
+	[ -f /tmp/switching_mode ] && exit 0
+	[ -f /tmp/wificontrol.txt -a -f /tmp/netmode-conf.pid ] && 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
+
+	mkdir -p /tmp/ipv4
+
+	network_flush_cache
+
+	local previpaddr=""
+	local curipaddr=""
+	local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
+	previpaddr=$(cat $ipaddrfile 2>/dev/null)
+	network_get_ipaddr curipaddr $INTERFACE
+	[ -n "$curipaddr" ] && echo $curipaddr > $ipaddrfile || rm -f $ipaddrfile
+
+	local prevgateway=""
+	local curgateway=""
+	local gatewayfile=/tmp/ipv4/$INTERFACE-gateway
+	prevgateway=$(cat $gatewayfile 2>/dev/null)
+	network_get_gateway curgateway $INTERFACE
+	[ -n "$curgateway" ] && echo $curgateway > $gatewayfile || rm -f $gatewayfile
+
+	local prevsubnets=""
+	local cursubnets=""
+	local subnetsfile=/tmp/ipv4/$INTERFACE-subnets
+	prevsubnets=$(cat $subnetsfile 2>/dev/null)
+	network_get_subnets cursubnets $INTERFACE
+	[ -n "$cursubnets" ] && echo $cursubnets > $subnetsfile || rm -f $subnetsfile
+
+	local prevdnsservers=""
+	local curdnsservers=""
+	local dnsserverfile=/tmp/ipv4/$INTERFACE-dnsservers
+	prevdnsservers=$(cat $dnsserverfile 2>/dev/null)
+	network_get_dnsserver curdnsservers $INTERFACE
+	[ -n "$curdnsservers" ] && echo $curdnsservers > $dnsserverfile || rm -f $dnsserverfile
+
+	local prevdev=""
+	local curdev=""
+	local devfile=/tmp/ipv4/$INTERFACE-dev
+	prevdev=$(cat $devfile 2>/dev/null)
+	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" \
+	] && {
+		[ "$prevopt43url" = "$curopt43url" ] &&	exit 0
+		[ -z "$prevopt43url" ] && exit 0
+	}
+
+	/etc/init.d/icwmpd reload &
+}
+
+handle_icwmp_restart

icwmp/files/etc/icwmpd/update.sh

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-log() {
-	echo $@ |logger -t cwmp.update -p info
-}
-
-handle_icwmp_update() {
-	local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
-	local vendorspecinf=`ifstatus ${defwan} | jsonfilter -e "@.data.vendorspecinf"`
-
-	log "Handling dhcp option value ${vendorspecinf}"
-	[ -n "$vendorspecinf" ] && {
-		local url=""
-		local old_url="$(uci -q get cwmp.acs.dhcp_url)"
-
-		case $vendorspecinf in
-			http://*|https://*)
-					url="${vendorspecinf}"
-				;;
-			*)
-				for optval in $vendorspecinf; do
-				        case $optval in
-				                1=*)
-				                        url="$(echo $optval | cut -d"=" -f2-)"
-				                ;;
-				        esac
-				done
-			;;
-		esac
-
-		if [ -n "$url" ]; then
-			log "## icwmp url[${old_url}] changed to [${url}]"
-			if [ "${url}" != "${old_url}" ]; then
-				log "Restarting icwmp url[${old_url}] changed to [${url}]"
-				uci -q set cwmp.acs.dhcp_url="$url"
-				uci commit cwmp
-				ubus call uci commit '{"config":"cwmp"}'
-			fi
-		fi
-	}
-}
-
-handle_icwmp_update

icwmp/files/etc/init.d/icwmpd

@@ -1,272 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2015-2019 iopsys Software Solutions AB
-
-. /lib/functions.sh
-include /lib/network
-. /usr/share/libubox/jshn.sh
-
-START=99
-STOP=2
-
-USE_PROCD=1
-PROG="/usr/sbin/icwmpd"
-
-log() {
-	echo "${@}"|logger -t cwmp.init -p info
-}
-
-enable_dhcp_option43() {
-	local wan="${1}"
-
-	### Ask for DHCP Option 43 only if CWMP is enabled ###
-	local reqopts="$(uci -q get network.$wan.reqopts)"
-	local proto="$(uci -q get network.$wan.proto)"
-	local newreqopts=""
-	local option43_present=0
-
-	for ropt in $reqopts; do
-		case $ropt in
-			43) option43_present=1 ;;
-			*) ;;
-		esac
-	done
-
-	if [ ${option43_present} -eq 1 ]; then
-		return;
-	fi
-
-	newreqopts="$reqopts 43"
-	if [ $proto == "dhcp" ]; then
-		uci -q set network.$wan.reqopts="$newreqopts"
-		uci commit network
-		ubus call network reload
-	fi
-}
-
-wait_for_resolvfile() {
-	local time=$1
-	local tm=1
-
-	local resolvfile="$(uci -q get dhcp.@dnsmasq[0].resolvfile)"
-	[ -n "$resolvfile" ] || return
-
-	while [ ! -f $resolvfile ]; do
-		sleep 1
-		[ $tm -ge $time ] && break
-		tm=$((tm+1))
-	done
-}
-
-set_wan_interface() {
-	local wan_interface="${1}"
-	local l3_device=""
-
-	if [ -z "${wan_interface}" ]; then
-		return 0;
-	fi
-
-	json_load "$(ifstatus ${wan_interface})"
-	json_get_var l3_device l3_device
-	if [ -n "$l3_device" ]; then
-		uci -q set cwmp.cpe.interface="${l3_device}"
-		uci -q commit cwmp
-	fi
-}
-
-copy_cwmp_etc_files_to_varstate() {
-	if [ ! -f /var/state/cwmp ]
-	then
-		if [ -f /etc/icwmpd/cwmp ]
-		then
-			uci -q -c /etc/icwmpd delete cwmp.acs
-			uci -q -c /etc/icwmpd commit cwmp
-			cp /etc/icwmpd/cwmp /var/state/cwmp
-		else
-			touch /var/state/cwmp
-		fi
-	fi
-
-	mkdir -p /var/run/icwmpd
-	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]
-	then
-		mv /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd 2>/dev/null
-	fi
-	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]
-	then
-		mv /etc/icwmpd/dm_enabled_notify /var/run/icwmpd 2>/dev/null
-	fi
-}
-
-copy_cwmp_varstate_files_to_etc() {
-	if [ -f /var/state/cwmp ]
-	then
-		cp /var/state/cwmp /etc/icwmpd 2>/dev/null
-	fi
-	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]
-	then
-		cp /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd 2>/dev/null
-	fi
-	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]
-	then
-		cp /var/run/icwmpd/dm_enabled_notify /etc/icwmpd 2>/dev/null
-	fi
-}
-
-validate_acs_section()
-{
-	uci_validate_section cwmp acs "acs" \
-		'passwd:string' \
-		'periodic_inform_enable:bool' \
-		'periodic_inform_interval:uinteger' \
-		'periodic_inform_time:string' \
-		'url:string' \
-		'dhcp_url:string' \
-		'compression:or("GZIP","Deflate","Disabled")' \
-		'retry_min_wait_interval:range(1, 65535)' \
-		'retry_interval_multiplier:range(1000, 65535)' \
-		'https_ssl_capath:file' \
-		'ipv6_enable:bool'
-
-}
-
-validate_cpe_section()
-{
-	uci_validate_section cwmp cpe "cpe" \
-		'interface:string' \
-		'default_wan_interface:string' \
-		'log_to_console:or("enable","disable")' \
-		'log_to_file:or("enable","disable")' \
-		'log_severity:or("EMERG", "ALERT", "CRITIC" ,"ERROR", "WARNING", "NOTICE", "INFO", "DEBUG")' \
-		'log_file_name:string' \
-		'log_max_size:uinteger' \
-		'userid:string' \
-		'passwd:string' \
-		'port:uinteger' \
-		'provisioning_code:string:""' \
-		'amd_version:range(1, 6)' \
-		'instance_mode:or("InstanceNumber","InstanceAlias")' \
-		'session_timeout:uinteger' \
-		'notification:bool' \
-		'exec_download:bool' \
-		'periodic_notify_enable:bool' \
-		'enable:bool' \
-		'periodic_notify_interval:uinteger'
-}
-
-validate_defaults() {
-	config_load cwmp
-
-	validate_acs_section || {
-		log "Validation of acs section failed"
-		return 1;
-	}
-
-	[ -z "${url}" -a -z "${dhcp_url}" ] && {
-		log "ACS url is empty can't start"
-		return 1;
-	}
-
-	validate_cpe_section || {
-		log "Validation of cpe section failed"
-		return 1;
-	}
-
-	[ -z "${default_wan_interface}" ] && {
-		log "Wan interface is empty"
-		return 1;
-	}
-
-	return 0;
-}
-
-boot() {
-	local dhcp_url=""
-	local discovery="1"
-
-	config_load cwmp
-	config_get_bool dhcp_discovery acs dhcp_discovery 1
-	config_get dhcp_url acs dhcp_url ""
-
-	if [ "${dhcp_discovery}" == "enable" -o "${dhcp_discovery}" == "1" ]; then
-		if [ -z "${dhcp_url}" ]; then
-			log "dhcp discovery enabled but no dhcp url, trigger update"
-			/etc/icwmpd/update.sh
-		fi
-	fi
-	start
-}
-
-start_service() {
-	local enable_cwmp
-	local wan_interface
-	local dhcp_discovery
-
-	config_load cwmp
-	config_get_bool enable_cwmp cpe enable 1
-	config_get dhcp_discovery acs dhcp_discovery
-	config_get wan_interface cpe default_wan_interface "wan"
-
-	if [ "$enable_cwmp" = "0" -o "$enable_cwmp" = "false" ]; then
-		log "CWMP is not enabled"
-		return 0
-	fi
-
-	# Set wan interface if not configured
-	set_wan_interface "${wan_interface}"
-
-	# Set dhcp option 43 if dhcp discovery enabled
-	if [ "${dhcp_discovery}" == "enable" -o "${dhcp_discovery}" == "1" ]; then
-		enable_dhcp_option43 "${wan_interface}"
-	fi
-
-	[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
-	[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
-	[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
-
-	# Copy backup data so that if it restart latter on it gets the info
-	copy_cwmp_etc_files_to_varstate
-
-	validate_defaults || {
-		log "Validation of defaults failed"
-		return 1;
-	}
-
-	procd_open_instance icwmp
-	procd_set_param command "$PROG"
-	procd_append_param command -b
-	procd_set_param respawn \
-		${respawn_threshold:-5} \
-		${respawn_timeout:-10} ${respawn_retry:-3}
-
-	procd_set_param watch network.interface
-	procd_close_instance
-}
-
-stop_service()
-{
-	copy_cwmp_varstate_files_to_etc
-}
-
-reload_service() {
-	log "Restarting CWMP client"
-	stop
-	start
-}
-
-service_triggers() {
-       procd_add_reload_trigger "cwmp"
-
-       procd_open_trigger
-               json_add_array
-                       json_add_string "" "interface.update"
-                       json_add_array
-                               json_add_array
-                                       json_add_string "" "run_script"
-                                       json_add_string "" "/etc/icwmpd/update.sh"
-                               json_close_array
-                       json_close_array
-                       json_add_int "" "2000"
-               json_close_array
-       procd_close_trigger
-}
-

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

@@ -1,32 +0,0 @@
-# Copy defaults by the factory to the cwmp UCI user section.
-
-# Get Manufacturer OUI.
-oui=$(uci -q get cwmp.cpe.manufacturer_oui)
-if [ -z "${oui}" ]; then
-	oui=$(db -q get device.deviceinfo.ManufacturerOUI)
-fi
-
-oui=$(echo "${oui}" | tr 'a-f' 'A-F')
-
-# Get system serial number.
-serial=$(uci -q get cwmp.cpe.serial_number)
-if [ -z "${serial}" ]; then
-	serial=$(db -q get device.deviceinfo.SerialNumber)
-fi
-
-# Get userid values
-acs_userid=$(uci -q get cwmp.acs.userid)
-cpe_userid=$(uci -q get cwmp.cpe.userid)
-
-# Only set if they are empty
-if [ -z "$acs_userid" ]
-then
-    uci -q set cwmp.acs.userid="${oui}-${serial}"
-fi
-
-if [ -z "$cpe_userid" ]
-then
-    uci -q set cwmp.cpe.userid="${oui}-${serial}"
-fi
-
-# No need for commit here, it is done by uci_apply_defaults().

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

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

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

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+set_cwmp_reqopts() {
+	### Ask for DHCP Option 43 only if CWMP is enabled ###
+	local wan=$(uci -q get cwmp.cpe.default_wan_interface)
+	local dhcp_discovery=$(uci -q get cwmp.acs.dhcp_discovery)
+	local discovery=0
+	case $dhcp_discovery in
+		enable|1) discovery=1 ;;
+	esac
+
+	local newreqopts=
+	local baseopts=
+	local reqopts="$(uci -q get network.$wan.reqopts)"
+	local proto="$(uci -q get network.$wan.proto)"
+	local tropts="43"
+	local oldreqopts="$reqopts"
+	local ropt iopt
+	for ropt in $reqopts; do
+		case $ropt in
+			43) ;;
+			*) baseopts="$baseopts $ropt" ;;
+		esac
+	done
+	ropt=""
+	reqopts="$baseopts $tropts"
+	for ropt in $reqopts; do
+		case $ropt in
+			43) [ $discovery -eq 1 ] && newreqopts="$newreqopts $ropt" ;;
+			*) newreqopts="$newreqopts $ropt" ;;
+		esac
+	done
+	if [ "$proto" == "dhcp" ]; then
+		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
+		oldreqopts="$(echo $oldreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
+		[ "$newreqopts" == "$oldreqopts" ] && return
+		uci -q set network.$wan.reqopts="$newreqopts"
+		uci commit network
+	fi
+}
+
+set_cwmp_reqopts

icwmp/files/etc/uci-defaults/95-icwmp-generate-ssl

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-regenerate_ssl_link(){
-	[ ! -d "/etc/ssl/certs" ] && return 0;
-	[ ! -f "/etc/ssl/certs/*.pem" ] && return 0;
-
-	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
-}
-
-regenerate_ssl_link

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

@@ -1 +0,0 @@
-/var/run/icwmpd/icwmpd_backup_session.xml

ieee1905/Config.in

@@ -1,14 +0,0 @@
-if (PACKAGE_ieee1905)
-
-menu "Configurations"
-
-config IEEE1905_EXTENSION_ALLOWED
-	bool "Allow plugins to extend 1905 CMDUs and/or TLVs"
-	default y
-
-config IEEE1905_PLATFORM_HAS_WIFI
-	bool "Platform has WiFi"
-	default y if PACKAGE_libwifi
-
-endmenu
-endif

ieee1905/Makefile

@@ -1,141 +0,0 @@
-#
-# Copyright (C) 2021 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ieee1905
-PKG_VERSION:=4.6.8
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=43cc5cac9a7dc1fd3a78f60509800d853d67d476
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-endif
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/ieee1905/Default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=IEEE-1905.1 stack
-endef
-
-define Package/ieee1905/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/libieee1905
-$(call Package/ieee1905/Default,$(1))
-  TITLE+= (library for CMDU and TLV handling)
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json
-endef
-
-define Package/ieee1905
-$(call Package/ieee1905/Default,$(1))
-  TITLE+= ieee1905d (daemon implementing 1905.1 and provides cli)
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +ubus +libpthread \
-	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi
-endef
-
-
-define Package/map-plugin
-$(call Package/ieee1905/Default,$(1))
-  TITLE:=Multi-AP (Easymesh) plugin
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
-endef
-
-define Package/ieee1905/description
- This package provides IEEE Std 1905.1 stack.
-endef
-
-define Package/libieee1905/description
- This package provides library functions for IEEE Std 1905.1 stack.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-ifeq ($(CONFIG_IEEE1905_PLATFORM_HAS_WIFI),y)
-TARGET_CFLAGS += -DHAS_WIFI
-endif
-
-MAKE_PATH:=src
-
-
-define Package/ieee1905/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ieee1905d $(1)/usr/sbin/
-endef
-
-define Package/libieee1905/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/src/libieee1905.so $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
-endef
-
-define Package/map-plugin/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
-endef
-
-define Build/InstallDev/map-plugin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map2.h $(1)/usr/include/map2.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/cntlrsync.h $(1)/usr/include/cntlrsync.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
-endef
-
-
-define Build/InstallDev/libieee1905
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/src/cmdu.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/cmdu_ackq.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/1905_tlvs.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/bufutil.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/i1905_extension.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/src/libieee1905.so $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(call Build/InstallDev/libieee1905,$(1),$(2))
-	$(call Build/InstallDev/map-plugin,$(1),$(2))
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        rsync -r --exclude=.* ~/git/ieee1905/ $(PKG_BUILD_DIR)/
-endef
-endif
-
-$(eval $(call BuildPackage,ieee1905))
-$(eval $(call BuildPackage,libieee1905))
-$(eval $(call BuildPackage,map-plugin))

ieee1905/files/etc/config/ieee1905

@@ -1,22 +0,0 @@
-config ieee1905 'ieee1905'
-	option enabled '1'
-	option extension '1'
-	list extmodule 'map'
-	option registrar '2 5'
-
-config ap
-	option band '2'
-	option ssid 'TestSSID.2'
-	option encryption 'psk2'
-	option key '5555500000'
-
-config ap
-	option band '5'
-	option ssid 'TestSSID.5'
-	option encryption 'psk2'
-	option key '2222200000'
-
-config al-iface
-	option enabled 1
-	option ifname 'br-lan'
-	option type 'bridge'

ieee1905/files/etc/init.d/ieee1905

@@ -1,25 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=96
-STOP=21
-
-USE_PROCD=1
-
-start_service() {
-	procd_open_instance
-        procd_set_param command "/usr/sbin/ieee1905d"
-	procd_set_param respawn
-#	procd_set_param stdout 1
-#	procd_set_param stderr 1
-	procd_close_instance
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "ieee1905"
-}
-
-reload_service() {
-	stop
-	start
-}

ifbt/Makefile

@@ -0,0 +1,52 @@
+#
+# Copyright (C) 2018 iopsys Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ifbt
+PKG_VERSION:=0.1
+
+PKG_SOURCE_VERSION:=0286812ed8036dea758f904694dc416481fba64d
+PKG_SOURCE_PROTO:=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)
+
+include $(INCLUDE_DIR)/package.mk
+
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+TARGET_PLATFORM:=-DIOPSYS_BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+TARGET_PLATFORM:=-DIOPSYS_BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
+TARGET_PLATFORM:=-DIOPSYS_MARVELL
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+TARGET_PLATFORM:=-DIOPSYS_INTEL
+else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+TARGET_PLATFORM:=-DIOPSYS_MEDIATEK
+else
+$(info (UNEXPECTED CONFIG TARGET))
+endif
+
+export TARGET_PLATFORM
+
+define Package/ifbt
+	CATEGORY:=Utilities
+	DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c  +libwifi +libjson-c
+	TITLE:=Fast BSS Transition
+endef
+
+define Package/ifbt/description
+	ifbt is Iopsys application for fast BSS transition
+endef
+
+define Package/ifbt/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ifbt $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,ifbt))

ifsi/Makefile

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

ifsi/src/Makefile

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

ifsi/src/ifsi.c

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

imonitor/Makefile

@@ -1,33 +1,30 @@
 #
-# Copyright (C) 2018 iopsys
+# Copyright (C) 2018 Inteno
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=imonitor
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
-PKG_SOURCE_VERSION:=4beb1d5d6925507f1850a84c0b83aaf12a082f7f
+PKG_SOURCE_VERSION:=532f4900862bcb45d8cd4bf37555fabda81750b6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
+PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
 define Package/imonitor
 	CATEGORY:=Utilities
-	TITLE:=iopsysWrt process supervisor
+	TITLE:=Inteno process supervisor
 	DEPENDS:=+ubox +uci +ubus +rpcd +rpcd-mod-file
 endef
 

inbd/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016 iopsys
+# Copyright (C) 2016 Inteno
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,20 +9,17 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=inbd
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=10f765f3d0fcc226b6ecf0c481598c9e7f76315e
+PKG_SOURCE_VERSION:=12755fccb8ef87965ac684d62d56e19e73a255bd
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
 # support parallel build
 PKG_BUILD_PARALLEL:=1
 
@@ -37,7 +34,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/inbd
 	CATEGORY:=Utilities
-	TITLE:=iopsys Netlink Bridge Daemon
+	TITLE:=Inteno Netlink Bridge Daemon
 	URL:=
 	DEPENDS:=+libuci +libubus +libblobmsg-json +libnl-genl
 endef

inotify-tools/Makefile

@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=inotify-tools
+PKG_VERSION:=3.14
+PKG_RELEASE:=1
+
+PKG_SOURCE_VERSION:=1df9af4d6cd0f4af4b1b19254bcf056aed4ae395
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/rvoicilas/inotify-tools.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)
+
+# support parallel build
+PKG_BUILD_PARALLEL:=1
+
+#re create configure scripts if not present.
+PKG_FIXUP:=autoreconf
+
+# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
+# this way we don't need to pick out the resulting files from the build dir.
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/inotify-tools
+	CATEGORY:=Utilities
+	TITLE:=Tools to trace filesystem events.
+	URL:=
+endef
+
+define Package/inotify-tools/description
+	Tools to trace filesystem events.
+endef
+
+define Package/inotify-tools/install
+	$(INSTALL_DIR) $(1)/usr
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) ./files/* $(1)/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libinotifytools.so.0.4.1 $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libinotifytools.so.0 $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libinotifytools.so $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/inotifywait $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/inotifywatch $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,inotify-tools))

inotify-tools/files/usr/bin/iop_write_monitor

@@ -0,0 +1,13 @@
+#! /bin/sh
+
+# is the real root mounted ?
+if [ ! -f /tmp/inotify_real_root/etc/preinit ]
+then
+	ubivol=$( cat /proc/cmdline  | sed -e "s/.*root=\(ubi:rootfs_.\).*/\1/" )
+	mkdir /tmp/inotify_real_root
+	mount -t ubifs $ubivol /tmp/inotify_real_root
+fi
+
+inotifywait -r -m -e modify -e create -e attrib -e delete -e move /tmp/inotify_real_root
+
+

iop/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 iopsys
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=iop
 PKG_VERSION:=1.0
 PKG_RELEASE:=0
-PKG_LICENSE:=GPLv2
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -21,7 +20,7 @@ define Package/iop
 endef
 
 define Package/iop/description
-	This package contains iopsysWrt SDK utilities
+	This package contains Intenos Iop utilities
 endef
 
 define Build/Compile

iop/config

@@ -1,217 +1,174 @@
-############
-# Generic #
-##########
-
-# Build #
-CONFIG_BUILD_LOG=y
+CONFIG_BUILD_NLS=y
+CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
 CONFIG_DEVEL=y
-# CONFIG_USE_SSTRIP is not set
-CONFIG_USE_STRIP=y
-# CONFIG_SIGNED_PACKAGES is not set
-
-# Image #
-CONFIG_TARGET_CUSTOMER="IOPSYS"
-CONFIG_TARGET_ROOTFS_TARGZ=y
-
-# /etc/banner and /etc/device_info #
-CONFIG_IMAGEOPT=y
-CONFIG_VERSIONOPT=y
-CONFIG_VERSION_MANUFACTURER="iopsysWrt"
-CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
-
-# /lib/preinit #
-CONFIG_PREINITOPT=y
-# CONFIG_TARGET_PREINIT_SUPPRESS_STDERR is not set
-CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE=y
-CONFIG_TARGET_PREINIT_TIMEOUT=1
-# CONFIG_TARGET_PREINIT_SHOW_NETMSG is not set
-# CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG is not set
-CONFIG_TARGET_PREINIT_IFNAME=""
-CONFIG_TARGET_PREINIT_IP=""
-CONFIG_TARGET_PREINIT_NETMASK=""
-CONFIG_TARGET_PREINIT_BROADCAST=""
-
-# Mirror #
-CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
-
-
-##################
-# IOWRT Add-ons #
-################
-
-# EasySoC HAL #
-CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_libwifi=y
-CONFIG_PACKAGE_peripheral_manager=y
-CONFIG_PACKAGE_port-management=y
-CONFIG_PACKAGE_wifimngr=y
-
-# Multi-AP #
-CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-topology=y
-CONFIG_PACKAGE_wfadatad=y
-CONFIG_PACKAGE_wfadatad-collector=y
-
-# Network #
-CONFIG_PACKAGE_netmode=y
-CONFIG_PACKAGE_owsd=m
-CONFIG_PACKAGE_urlfilter=y
-
-# System #
-CONFIG_PACKAGE_imonitor=m
-CONFIG_PACKAGE_questd=y
-CONFIG_PACKAGE_rulengd=y
-
-# TR-x69 #
-CONFIG_PACKAGE_uspd=y
-CONFIG_PACKAGE_icwmp=y
-CONFIG_PACKAGE_obuspa=y
-CONFIG_PACKAGE_bulkdata=y
-CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc=m
-CONFIG_PACKAGE_swmodd=m
-CONFIG_PACKAGE_twamp=m
-CONFIG_PACKAGE_udpechoserver=m
-CONFIG_PACKAGE_xmppc=m
-
-# WebGUI #
-CONFIG_PACKAGE_sulu=y
-
-
-############
-# Network #
-##########
-
-# Protocols #
+# CONFIG_LOCALMIRROR is not set
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
+CONFIG_PACKAGE_6tunnel=y
+CONFIG_PACKAGE_alsa-lib=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
 CONFIG_PACKAGE_comgt-directip=y
 CONFIG_PACKAGE_comgt-ncm=y
+CONFIG_PACKAGE_crashlog=y
+CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
-CONFIG_PACKAGE_gre=y
-CONFIG_PACKAGE_map=y
+CONFIG_PACKAGE_gdb=m
+CONFIG_PACKAGE_gdbserver=m
+CONFIG_PACKAGE_getopt=y
+CONFIG_PACKAGE_glib2=y
+CONFIG_PACKAGE_ice-client=y
+CONFIG_PACKAGE_ice-client-camerawatch=m
+CONFIG_PACKAGE_ice-client-fileme=m
+CONFIG_PACKAGE_ice-client-gigaset=m
+CONFIG_PACKAGE_ice-client-guest=m
+CONFIG_PACKAGE_ice-client-iperf=m
+CONFIG_PACKAGE_ice-client-logreader=m
+CONFIG_PACKAGE_ice-client-monitor=m
+CONFIG_PACKAGE_ice-client-netrounds=m
+CONFIG_PACKAGE_ice-client-rshell=m
+CONFIG_PACKAGE_ice-client-texec=m
+CONFIG_PACKAGE_icwmp-curl=y
+CONFIG_PACKAGE_ifbt=y
+CONFIG_PACKAGE_imonitor=y
+CONFIG_PACKAGE_inbd=y
+CONFIG_PACKAGE_netmode=y
+CONFIG_PACKAGE_iperf-mt=y
+CONFIG_PACKAGE_ipset=y
+CONFIG_PACKAGE_iptables=y
+CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
+CONFIG_PACKAGE_iptables-mod-filter=y
+CONFIG_PACKAGE_iptables-mod-ipopt=y
+CONFIG_PACKAGE_iup=y
+# CONFIG_PACKAGE_iwatchdog is not set
+CONFIG_PACKAGE_juci=y
+CONFIG_PACKAGE_juci-broadcom-iptv=y
+CONFIG_PACKAGE_juci-broadcom-pwrmgmt=y
+CONFIG_PACKAGE_juci-wifilife=y
+CONFIG_PACKAGE_juci-wireless=y
+CONFIG_PACKAGE_juci-ddns=y
+CONFIG_PACKAGE_juci-diagnostics=y
+CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
+CONFIG_PACKAGE_juci-dropbear=y
+CONFIG_PACKAGE_juci-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-netmode=y
+CONFIG_PACKAGE_juci-network-device=y
+CONFIG_PACKAGE_juci-network-dsl=y
+CONFIG_PACKAGE_juci-network-netifd=y
+CONFIG_PACKAGE_juci-network-port=y
+CONFIG_PACKAGE_juci-openvpn=y
+CONFIG_PACKAGE_juci-owsd=y
+CONFIG_PACKAGE_juci-printer=y
+CONFIG_PACKAGE_juci-realtime-graphs=y
+CONFIG_PACKAGE_juci-samba=y
+CONFIG_PACKAGE_juci-simple-gui=y
+CONFIG_PACKAGE_juci-snmpd=y
+CONFIG_PACKAGE_juci-sysupgrade=y
+CONFIG_PACKAGE_juci-theme-iopsys=y
+CONFIG_PACKAGE_juci-ubus-core=y
+CONFIG_PACKAGE_juci-upnp=y
+CONFIG_PACKAGE_juci-usb=y
+CONFIG_PACKAGE_juci-utils=y
+# CONFIG_PACKAGE_kmod-ipt-nathelper is not set
+CONFIG_PACKAGE_kmod-nls-base=y
+CONFIG_PACKAGE_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
+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_ntfs-3g=y
 CONFIG_PACKAGE_ntpd=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
 CONFIG_PACKAGE_ppp-mod-pppoa=y
 CONFIG_PACKAGE_ppp-mod-pppoe=y
 CONFIG_PACKAGE_ppp-mod-pppol2tp=y
 CONFIG_PACKAGE_ppp-mod-pptp=y
 CONFIG_PACKAGE_ppp-multilink=y
 # CONFIG_PACKAGE_ppp is not set
+# CONFIG_PACKAGE_qos-scripts is not set
+CONFIG_PACKAGE_questd=y
+CONFIG_PACKAGE_rdisc6=y
+CONFIG_PACKAGE_rdnssd=y
 CONFIG_PACKAGE_relayd=y
+CONFIG_PACKAGE_resolveip=y
+CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rulengd=y
+CONFIG_PACKAGE_samba3=y
+CONFIG_PACKAGE_samba3-nmbd=y
+CONFIG_PACKAGE_snmpd=y
+CONFIG_PACKAGE_strace=y
+CONFIG_PACKAGE_tc=y
+CONFIG_PACKAGE_tcpdump=y
+CONFIG_PACKAGE_terminfo=y
+CONFIG_PACKAGE_tptest=y
+CONFIG_PACKAGE_traceroute6=y
 CONFIG_PACKAGE_umbim=y
 CONFIG_PACKAGE_uqmi=y
-CONFIG_PACKAGE_wwan=y
-CONFIG_PACKAGE_xl2tpd=y
-
-# Services #
-CONFIG_PACKAGE_atftp=m
-CONFIG_PACKAGE_atftpd=m
-CONFIG_PACKAGE_ddns-scripts=y
-CONFIG_PACKAGE_miniupnpd=y
-CONFIG_PACKAGE_mosquitto-client-ssl=y
-CONFIG_PACKAGE_mosquitto-ssl=y
-CONFIG_PACKAGE_mwan3=y
-CONFIG_PACKAGE_nginx=y
-CONFIG_PACKAGE_openvpn-easy-rsa=y
-CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
-# CONFIG_PACKAGE_qos-scripts is not set
-CONFIG_PACKAGE_rdnssd=y
-CONFIG_PACKAGE_vsftpd-tls=m
-
-# Tools and Utilities #
-CONFIG_PACKAGE_curl=y
-CONFIG_PACKAGE_libcurl=y
-CONFIG_LIBCURL_CRYPTO_AUTH=y
-# CONFIG_LIBCURL_MBEDTLS is not set
-CONFIG_LIBCURL_OPENSSL=y
-CONFIG_PACKAGE_ethtool=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_ndisc6=y
-CONFIG_PACKAGE_rdisc6=y
-CONFIG_PACKAGE_resolveip=y
-CONFIG_PACKAGE_tcpdump=y
-CONFIG_PACKAGE_traceroute6=y
-
-
-############
-# System  #
-##########
-
-CONFIG_PACKAGE_at=y
-CONFIG_PACKAGE_getopt=y
-# CONFIG_PACKAGE_iwatchdog is not set
-CONFIG_PACKAGE_jq=y
-CONFIG_PACKAGE_libustream-openssl=y
-# CONFIG_PACKAGE_libustream-wolfssl is not set
-CONFIG_PACKAGE_lscpu=y
-CONFIG_PACKAGE_nand-utils=y
-CONFIG_PACKAGE_openssl-util=y
-CONFIG_OPENSSL_WITH_COMPRESSION=y
-CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_rpcd-mod-rpcsys=y
-CONFIG_PACKAGE_rpcd-mod-rrdns=y
-CONFIG_PACKAGE_strace=y
-CONFIG_PACKAGE_terminfo=y
-CONFIG_PACKAGE_uledd=y
-# The urandom-seed package is very strange. It seeds urandom with urandom...
-# Disable it. Most SoCs nowadays has HW random generators anyway.
-# CONFIG_PACKAGE_urandom-seed is not set
-# CONFIG_PACKAGE_urngd is not set
 CONFIG_PACKAGE_usb-modeswitch=y
-CONFIG_PACKAGE_uuidgen=y
+CONFIG_PACKAGE_usbreset=y
+CONFIG_PACKAGE_wget=y
+CONFIG_PACKAGE_wwan=y
+CONFIG_PACKAGE_libwifi=y
+CONFIG_PACKAGE_wifilife=y
+CONFIG_PACKAGE_wifimngr=y
+CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
-
-
-################
-# LuCI WebGUI #
-##############
-
-# BEGIN: luci-nginx metapackage with some changes
-# We do not want libiwinfo-lua on non-WiFi targets, but it is already
-# depended on by other luci-packages, so no need to take it in explicitly
-CONFIG_PACKAGE_luci-mod-admin-full=y
-CONFIG_PACKAGE_luci-app-firewall=y
-CONFIG_PACKAGE_luci-app-opkg=y
-CONFIG_PACKAGE_luci-proto-ppp=y
-CONFIG_PACKAGE_luci-proto-ipv6=y
-# CONFIG_LUCI_JSMIN is not set
-# CONFIG_LUCI_CSSTIDY is not set
-CONFIG_PACKAGE_luci-mod-dashboard=y
-CONFIG_PACKAGE_luci-theme-openwrt-2020=y
-CONFIG_PACKAGE_nginx-mod-luci=y
-
-
-############
-# BusyBox #
-##########
-
-CONFIG_BUSYBOX_CUSTOM=y
+CONFIG_TARGET_CUSTOMER="IOPSYS"
+CONFIG_TARGET_ROOTFS_TARGZ=y
+# CONFIG_USE_SSTRIP is not set
+CONFIG_USE_STRIP=y
+CONFIG_BUILD_LOG=y
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
 CONFIG_BUSYBOX_CONFIG_ARPING=y
-CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
 CONFIG_BUSYBOX_CONFIG_DELUSER=y
 # CONFIG_BUSYBOX_CONFIG_DEVMEM is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q=y
 CONFIG_BUSYBOX_CONFIG_FIRST_SYSTEM_ID=100
-# CONFIG_BUSYBOX_CONFIG_HTTPD is not set
+CONFIG_BUSYBOX_CONFIG_HTTPD=y
 # CONFIG_BUSYBOX_CONFIG_INSMOD is not set
 # CONFIG_BUSYBOX_CONFIG_MODINFO is not set
 # CONFIG_BUSYBOX_CONFIG_MODPROBE is not set
@@ -221,7 +178,6 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_MODUTILS_ALIAS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_MODUTILS_SYMBOLS=y
 CONFIG_BUSYBOX_CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-# CONFIG_BUSYBOX_CONFIG_IP is not set
 CONFIG_BUSYBOX_CONFIG_LAST_SYSTEM_ID=999
 CONFIG_BUSYBOX_CONFIG_LOGIN=y
 # CONFIG_BUSYBOX_CONFIG_LSMOD is not set
@@ -231,6 +187,7 @@ CONFIG_BUSYBOX_CONFIG_MICROCOM=y
 # CONFIG_BUSYBOX_CONFIG_RMMOD is not set
 CONFIG_BUSYBOX_CONFIG_STTY=y
 CONFIG_BUSYBOX_CONFIG_TFTP=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_2_4_MODULES is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -244,9 +201,11 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
 # CONFIG_BUSYBOX_CONFIG_FEATURE_NOLOGIN is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_SECURETTY=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY is not set
 # CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
@@ -256,32 +215,16 @@ 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_MOUNTPOINT=y
-CONFIG_BUSYBOX_CONFIG_RUN_PARTS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_RUN_PARTS_FANCY=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_GZIP_LEVELS=y
-CONFIG_BUSYBOX_CONFIG_GZIP_FAST=2
-CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_BUSYBOX_CONFIG_FLOAT_DURATION=y
-CONFIG_BUSYBOX_CONFIG_USLEEP=y
-CONFIG_BUSYBOX_CONFIG_REALPATH=y
-CONFIG_BUSYBOX_CONFIG_TTY=y
-CONFIG_BUSYBOX_CONFIG_BLOCKDEV=y
-CONFIG_BUSYBOX_CONFIG_PARTPROBE=y
-CONFIG_BUSYBOX_CONFIG_LFS=y
-CONFIG_BUSYBOX_CONFIG_FDISK=y
-CONFIG_BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_GPT_LABEL=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED=y
-CONFIG_BUSYBOX_CONFIG_IONICE=y
-CONFIG_BUSYBOX_CONFIG_RENICE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_BTRFS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_F2FS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
-CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
-CONFIG_BUSYBOX_CONFIG_NOHUP=y
+# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
+CONFIG_LIBCURL_CRYPTO_AUTH=y
+# CONFIG_LIBCURL_MBEDTLS is not set
+CONFIG_LIBCURL_OPENSSL=y
+CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
+# CONFIG_SAMBA3_CONFIG_NO_PRINTING is not set
+# CONFIG_SIGNED_PACKAGES is not set
+CONFIG_KERNEL_DEVTMPFS=y
+CONFIG_KERNEL_DEVTMPFS_MOUNT=y
+CONFIG_PACKAGE_ip-full=y
+# CONFIG_BUSYBOX_CONFIG_IP is not set
+CONFIG_PACKAGE_iopupgrade=y
+

iop/iop.completion

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

iop/scripts/extract_core.sh

@@ -6,9 +6,13 @@ function extract_core {
 	topdir=$(pwd)
 
 	# Paths to packages that should be exported.
+	paths+='package/network/services/dnsmasq '
 	paths+='package/network/config/firewall '
 	paths+='package/network/config/netifd '
+	paths+='package/network/config/qos-scripts '
 	paths+='package/utils/busybox '
+	paths+='package/base-files '
+	paths+='package/system/procd '
 	paths+='package/system/rpcd '
 	paths+='package/network/services/openvpn '
 
@@ -20,13 +24,7 @@ function extract_core {
 		echo ""
 		echo "Example: $0 extract_core"
 		echo "  -p package/utils/busybox"
-		echo "  -r feeds/openwrt_core"
-		echo "  -b devel"
-		echo ""
-		echo "Extract all default packages:"
-		echo "$0 extract_core"
-		echo "  -p default"
-		echo "  -r feeds/openwrt_core"
+		echo "  -r feeds/lede_core"
 		echo "  -b devel"
 	}
 

iop/scripts/feeds_update.sh

@@ -14,7 +14,7 @@ function feeds_update {
     done
 
 
-    git remote -v | grep -qE '(git@|ssh://)' && developer=1
+    git remote -v | grep -q http || developer=1
 
     cp .config .genconfig_config_bak
 
@@ -28,19 +28,17 @@ function feeds_update {
 
     # replace core packages with iopsys versions
     if [ $override == 1 ]; then
-		./scripts/feeds install -f -p openwrt_core -a
+		./scripts/feeds install -f -p lede_core -a
     fi
 
     # targets need to be installed explicitly
-    targets="iopsys-brcm63xx-arm iopsys-ramips intel_mips iopsys-x86 iopsys-armvirt iopsys-bcm27xx iopsys-mediatek iopsys-econet"
-    for target in $targets
-    do
-	rm -f target/linux/$target
-	./scripts/feeds install -p targets $target
-    done
+    ./scripts/feeds install -p targets iopsys-brcm63xx-mips
+    ./scripts/feeds install -p targets iopsys-brcm63xx-arm
+    ./scripts/feeds install -p targets iopsys-ramips
+    ./scripts/feeds install -p intel_targets intel_mips
 
     # install all packages
-    ./scripts/feeds install -a
+    ./scripts/feeds install -a 
 
     # remove broken symlinks ( for packages that are no longer in the feed )
     find -L package/feeds -maxdepth 2 -type l -delete
@@ -49,7 +47,7 @@ function feeds_update {
     make defconfig
 
     # record when we last run this script
-    touch tmp/.iop_bootstrap
+    touch tmp/.iop_bootstrap 
 
     # always return true
     exit 0
@@ -57,3 +55,6 @@ function feeds_update {
 
 register_command "feeds_update" "Update feeds to point to commit hashes from feeds.conf"
 
+
+
+

iop/scripts/genconfig.sh

@@ -5,133 +5,54 @@ function genconfig {
 	export IMPORT=1
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
+	export THEMEDIR="themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
 	export CONFIGPATH="package/feeds/iopsys/iop"
 	CUSTPATH="customerconfigs"
 	export CUSTCONF="customerconfigs/customers"
 	export VERBOSE=0
 	export DEVELOPER=0
+	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
+
 	target="bogus"
-	target_config_path=""
-	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
-	ramips="target/linux/iopsys-ramips"
-	econet="target/linux/iopsys-econet"
-	x86="target/linux/iopsys-x86"
-	armvirt="target/linux/iopsys-armvirt"
-
-	Red='\033[0;31m'          # Red
-	Color_Off='\033[0m'       # Text Reset
-	Yellow='\033[0;33m'       # Yellow
-
-	function find_last {
-	    egrep "^[ #]*${1}[ =]" $2 | tail -n1
-	}
-
-	function is_new {
-	    for opt in $conf_warned
-	    do
-		if [ "$opt" == "$1" ]
-		then
-		    return 1
-		fi
-	    done
-	    # option not found return true
-	    return 0
-	}
-
-	function verify_config {
-	    IFS=$'\n'
-	    org=$(<.genconfig.config)
-	    unset IFS
-	    local num
-	    local conf_opt
-	    local conf_org
-	    local conf_new
-
-	    #echo "lines to check $tot_lines"
-	    num=0
-	    for line in $org
-	    do
-		conf_opt=$(echo $line | grep CONFIG_ | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
-		if [ -n "${conf_opt}" ]
-		then
-		    conf_org=$(find_last ${conf_opt} .genconfig.config)
-		    conf_new=$(find_last ${conf_opt} .config)
-		    if [ "$conf_org" != "$conf_new" ]
-		    then
-			if is_new $conf_opt
-			then
-			    echo -e "config option [${Red}$conf_opt${Color_Off}] is not set correctly in .config"
-			    echo -e "got value [${Yellow}$conf_new${Color_Off}] but wanted [${Yellow}$conf_org${Color_Off}]"
-			    echo "This is a real problem somebody needs to investigate"
-			    echo ""
-			    conf_warned="$conf_warned $conf_opt"
-			fi
-		    else
-			true
-			# for debug to see all options
-			#echo -e "wanted [$conf_org] got [$conf_new]"
-		    fi
-		fi
-		num=$((num+1))
-	    done
-	}
+	config_path=""
 
 	# Takes a board name and returns the target name in global var $target
 	set_target() {
-		local profile=$1
+	    local profile=$1
 
-		[ -n "$profile" ] || return
+	    local iopsys_brcm63xx_mips=$(cd target/linux/iopsys-brcm63xx-mips; ./genconfig)
+	    local iopsys_brcm63xx_arm=$(cd target/linux/iopsys-brcm63xx-arm; ./genconfig)
+	    local iopsys_ramips=$(cd target/linux/iopsys-ramips; ./genconfig)
+	    local intel_mips=$(cd target/linux/intel_mips; ./genconfig)
 
-		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
-			local targetpath="./target/linux/$TARGET"
-			local profiles=
-			local pfound=0
-
-			if [ -e "$targetpath/genconfig" ]; then
-				profiles=$(cd $targetpath; ./genconfig)
-
-				for p in $profiles; do
-					if [ $p == $profile ]; then
-						pfound=1
-						break
-					fi
-				done
-			fi
-
-			if [ $pfound -eq 1 ]; then
-				target="$(echo $TARGET | tr '-' '_')"
-				target_config_path="$targetpath/config"
-			fi
-
-			return
-		fi
-
-		[ -e $brcm63xx_arm/genconfig ] &&
-			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
-		[ -e $ramips/genconfig ] &&
-			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $econet/genconfig ] &&
-			iopsys_econet=$(cd $econet; ./genconfig)
-		[ -e $x86/genconfig ] &&
-			iopsys_x86=$(cd $x86; ./genconfig)
-		[ -e $armvirt/genconfig ] &&
-			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-
-	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
-				echo "$list based boards:"
-				for b in ${!list}; do
-					echo -e "\t$b"
-				done
-			done
-			return
+	    if [ "$profile" == "LIST" ]
+	    then
+		for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips intel_mips
+		do
+		    echo "$list based boards:"
+		    for b in ${!list}
+		    do
+			echo -e "\t$b"
+		    done
+		done
+		return
 	    fi
 
+	    local targets
+
+	    for p in $iopsys_brcm63xx_mips; do
+		if [ $p == $profile ]; then
+		    target="iopsys_brcm63xx_mips"
+			config_path="target/linux/iopsys-brcm63xx-mips/config"
+		    return
+		fi
+	    done
+
 	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_arm"
-			target_config_path="$brcm63xx_arm/config"
+			config_path="target/linux/iopsys-brcm63xx-arm/config"
 		    return
 		fi
 	    done
@@ -139,38 +60,42 @@ function genconfig {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			target_config_path="$ramips/config"
+			config_path="target/linux/iopsys-ramips/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_econet; do
+	    for p in $intel_mips; do
 		if [ $p == $profile ]; then
-		    target="iopsys_econet"
-			target_config_path="$econet/config"
+		    target="intel_mips"
+			config_path="target/linux/intel_mips/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_x86; do
-		if [ $p == $profile ]; then
-		    target="iopsys_x86"
-			target_config_path="$x86/config"
-		    return
-		fi
-	    done
-
-	    for p in $iopsys_armvirt; do
-		if [ $p == $profile ]; then
-		    target="iopsys_armvirt"
-			target_config_path="$armvirt/config"
-		    return
-		fi
-	    done
 	}
 
-	git remote -v | grep -qE '(git@|ssh://)' && {
+	git remote -v | grep -q http || {
 		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 ;;
+			wifilife) wifilifeAllowed=1 ;;
+			esac
+		done
 	}
 
 	v() {
@@ -181,19 +106,17 @@ function genconfig {
 		echo
 		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
 		echo
-		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -v|--verbose\t\tVerbose"
+		echo -e "  -c|--clean\tRemove all files under ./files and import from config "
+		echo -e "  -v|--verbose\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
-		echo -e "  -t|--target\t\tExplicitly specify the linux target to build the board profile from"
-		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 "  -s|--override\tEnable 'Package source tree override'"
+		echo -e "  -h|--help\tShow this message"
 		echo -e "  -l|--list [customer]\tList all Customers or all boards for one customer"
-		echo -e "  -a|--list-all\t\tList all Customers and their board types"
-		echo -e "  -b|--boards\t\tList all board types"
+		echo -e "  -a|--list-all\tList all Customers and their board types"
+		echo -e "  -b|--boards\tList all board types"
 		echo
-		echo "Example ./iop genconfig eg400 OPERATORX"
-		echo "(if no customerconfig is chosen, iopsys config will be used)"
+		echo "Example ./iop genconfig vg50 TELIA"
+		echo "(if no customerconfig is chosen the Inteno Config will be used)"
 		echo
 		exit 0
 	}
@@ -203,7 +126,7 @@ function genconfig {
 		local ALL="$1"
 		local CUSTOMER="$2"
 		if [ "$CUSTOMER" -a -d "$CUSTCONF/$CUSTOMER" ]; then
-			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common)"
+			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common | grep -v juci-theme)"
 			if [ "$boards" ]; then
 				echo "$CUSTOMER has following boards:"
 				for board in $boards; do
@@ -220,7 +143,7 @@ function genconfig {
 			if [ "$customers" -a "$ALL" == 1 ]; then
 				for customer in $customers; do
 					echo $customer
-					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common)"
+					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common | grep -v juci-theme)"
 					if [ "$boards" ]; then
 						for board in $boards; do
 							echo -e "\t$board"
@@ -243,30 +166,28 @@ function genconfig {
 
 	generate_config()
 	{
-		DIFFFILE="$1"
-		MASTERFILE="$2"
-		while read p; do
-			v "$p"
-			sed -r -i "$p" $MASTERFILE
-		done < $DIFFFILE
+	DIFFFILE="$1"
+	MASTERFILE="$2"
+	while read p; do
+		v "$p"
+		sed -r -i "$p" $MASTERFILE
+	done < $DIFFFILE
 	}
 
 	setup_dirs()
 	{
-		git remote -v | grep -q http || {
-			if git ls-remote $CUSTREPO -q 2>/dev/null; then
-				if [ ! -d "$CUSTPATH" ]; then
-					git clone "$CUSTREPO" "$CUSTPATH"
-				elif [ $IMPORT -eq 1 ]; then
-					cd $CUSTPATH
-					v "git pull"
-					git pull
-					cd - >/dev/null #go back
-				fi
-			else
-				echo "You do not have access to $CUSTREPO"
+		if ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null  | grep -qw ${CUSTREPO:22}; then
+			if [ ! -d "$CUSTPATH" ]; then
+				git clone "$CUSTREPO" "$CUSTPATH"
+			elif [ $IMPORT -eq 1 ]; then
+				cd $CUSTPATH
+				v "git pull"
+				git pull
+				cd - >/dev/null #go back
 			fi
-		}
+		else
+			echo "You do not have access to $CUSTREPO"
+		fi
 
 		if [ ! -d "$FILEDIR" ]; then
 			mkdir -p $FILEDIR
@@ -274,6 +195,13 @@ function genconfig {
 			v "rm -rf $FILEDIR*"
 			rm -rf $FILEDIR*
 		fi
+
+		if [ ! -d "$THEMEDIR" ]; then
+			mkdir -p $THEMEDIR
+		elif [ -d "$THEMEDIR" -a $CLEAN -eq 1 ]; then
+			v "rm -rf $THEMEDIR/*"
+			rm -rf $THEMEDIR/*
+		fi
 	}
 
 	create_and_copy_files()
@@ -309,25 +237,22 @@ function genconfig {
 		v "cp $CONFIGPATH/config .config"
 		cp $CONFIGPATH/config .config
 
-		if [ -f $target_config_path/config ]; then
-		    cat $target_config_path/config >> .config
-		    echo "" >> .config
+		if [ -f $config_path/config ]; then
+		    cat $config_path/config >> .config
 		fi
-		if [ -f $target_config_path/$BOARDTYPE/config ]; then
-		    cat $target_config_path/$BOARDTYPE/config >> .config
-		    echo "" >> .config
+		if [ -f $config_path/$BOARDTYPE/config ]; then
+		    cat $config_path/$BOARDTYPE/config >> .config
 		fi
 
-		# Special handling for targets which use TARGET_DEVICES 
-		if [ "$target" = "iopsys_ramips" ]; then
-			subtarget="mt7621"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_econet" ]; then
-			subtarget="en7562"
+		#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
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
@@ -346,29 +271,27 @@ function genconfig {
 					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
-					echo "" >> .config
 				fi
 				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
 					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
 					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
-					echo "" >> .config
 				fi
 			done
 		fi
 
 		# Set target version
 		local GIT_TAG=$(git describe --abbrev=0 --tags)
-		local GIT_REV=$(git rev-parse --short HEAD)
-		local GIT_VER="$GIT_TAG"
-		git describe --contains $GIT_REV >/dev/null 2>&1 || GIT_VER="${GIT_TAG}_${GIT_REV}"
-		echo "CONFIG_TARGET_VERSION=\"${GIT_VER}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${GIT_VER}\"" >> .config
-		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
+		echo "CONFIG_TARGET_VERSION=\"${GIT_TAG}\"" >> .config
 
-		# Enable Package source tree override if selected
+		# Enable Pckage source tree override if selected
 		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
 
 		# developer mode selected ?
@@ -376,27 +299,34 @@ function genconfig {
 		if [ $DEVELOPER -eq 1 ]; then
 			# rewrite url to clone with ssh instead of http
 			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
+			[ $bcmAllowed -eq 0 ] && echo "CONFIG_BCM_OPEN=y" >> .config
+			[ $iceAllowed -eq 0 ] && echo "CONFIG_ICE_OPEN=y" >> .config
+			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
+			[ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
+			[ $mediatekAllowed -eq 0 ] && echo "CONFIG_MEDIATEK_OPEN=y" >> .config
+			[ $wifilifeAllowed -eq 0 ] && echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		else
-			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
+			echo "CONFIG_GITMIRROR_REWRITE=n" >>.config
+			echo "CONFIG_BCM_OPEN=y" >> .config
+			echo "CONFIG_ICE_OPEN=y" >> .config
+			echo "CONFIG_ENDPT_OPEN=y" >> .config
+			echo "CONFIG_NATALIE_OPEN=y" >> .config
+			echo "CONFIG_MEDIATEK_OPEN=y" >> .config
+			echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		fi
 
-		if [ -n "$BRCM_MAX_JOBS" ]
-		then
-		    echo "CONFIG_BRCM_MAX_JOBS=\"1\"" >>.config
-		fi
+		# Force regeneration of themes
+		touch package/feeds/juci/juci/Makefile
 
 		# Force regeneration of kernel Makefile
 		# Needed to disable kmods for iopsys-brcm targets
 		touch package/kernel/linux/Makefile
 
 		# we need to signal to bradcom SDK that we have changed the board id
-		# currently boardparms.c and boardparms_voice.c is the only place that is depending on boardid name
+		# currently boardparms.c and boardparms_voice.c is the only place that is depending on inteno boardid name
 		# so just touch that file.
 		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
 
-		# Store generated config
-		cp .config .genconfig.config
-
 		# Set default values based on selected parameters
 		v "$(make defconfig 2>&1)"
 
@@ -404,8 +334,6 @@ function genconfig {
 
 		# Clean base-file package to force rebuild when changing profile
 		v "$(make package/base-files/clean 2>&1)"
-
-		verify_config
 	}
 
 	####### main #####
@@ -427,11 +355,9 @@ function genconfig {
 			-c|--clean) export CLEAN=1;;
 			-n|--no-update) export IMPORT=0;;
 			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
-			-t|--target) export TARGET="$2"; shift;;
 			-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;;
@@ -446,7 +372,7 @@ function genconfig {
 			shift;
 		done
 
-		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
+		CUSTREPO="${CUSTREPO:-git@private.inteno.se:customerconfigs}"
 
 		setup_dirs
 		create_and_copy_files "$@"