obuspa: Rebase with obuspa-4.0

- missing library files under /usr/lib/bbfdm
	- Added global enable for periodicstats & disabled by default
	- updated to latest devel

ated/Makefile

@@ -1,16 +1,16 @@
-/* 
- * Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- */
+#
+# Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
+#
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -24,6 +24,7 @@ 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)
 

bbf/Config_bbfdm.in

@@ -1,27 +1,27 @@
 if PACKAGE_libbbfdm
 
-config LIBBBFDM_VENDOR_PREFIX
-    string "Vendor Prefix"
-    default "X_IOPSYS_EU_"
+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 "Compile with tr181 device features"
+	bool "Enable TR-181 Data Model Support"
 	default y
 
 config BBF_TR104
-	bool "Compile with tr104 voice features"
+	bool "Enable TR-104 Data Model Support"
 	default y
 
 config BBF_TR143
-	bool "Compile with tr143 diagnostics features"
+	bool "Enable TR-143 Data Model Support"
 	default y
 
-config BBF_TR157
-	bool "Compile with tr157 bulkdata collector features"
-	default y
-	
-config BBF_TR064
-	bool "Compile with tr064 features"
-	default n
-
 endif

bbf/Makefile

@@ -1,42 +1,64 @@
 #
-# Copyright (C) 2019 Iopsys
+# Copyright (C) 2021 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=1.0-2019-10-01
+PKG_VERSION:=4.1.5
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b3bae9df19df35075ac52f53758288d8e0573790
+PKG_SOURCE_VERSION:=838372a16ed0029cd681626bb5adb722f6a7681e
 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:=GPLv2
+PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/libbbf_api
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=BBF
+  TITLE:=Library for libbbfdm API
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+endef
+
 define Package/libbbfdm
   SECTION:=libs
   CATEGORY:=Libraries
+  SUBMENU:=BBF
   TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libmbedtls +libcurl
 endef
 
 define Package/libbbfdm/config
 	source "$(SOURCE)/Config_bbfdm.in"
 endef
 
-define Package/libbbfdm/description
- Test description will update later.
+define Package/libbbf_api/description
+ Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
 endef
 
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBBBFDM_VENDOR_PREFIX)\\\"
+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 += -DBBF_VENDOR_LIST=\\\"$(CONFIG_BBF_VENDOR_LIST)\\\"
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
 
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
@@ -56,32 +78,56 @@ CONFIGURE_ARGS += \
 	--enable-tr143
 endif
 
-ifeq ($(CONFIG_BBF_TR157),y)
+ifeq ($(CONFIG_PACKAGE_libopenssl),y)
 CONFIGURE_ARGS += \
-	--enable-tr157
+	--enable-libopenssl
 endif
 
-ifeq ($(CONFIG_BBF_TR064),y)
+ifeq ($(CONFIG_PACKAGE_libmbedtls),y)
 CONFIGURE_ARGS += \
-	--enable-tr064
+	--enable-libmbedtls
 endif
 
+ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
+CONFIGURE_ARGS += \
+	--enable-vendor-extension
+
+CONFIGURE_ARGS += \
+	BBF_VENDOR_LIST="$(CONFIG_BBF_VENDOR_LIST)"
+
+endif ##CONFIG_BBF_VENDOR_EXTENSION
+
+define Package/libbbf_api/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
+endef
+
 define Package/libbbfdm/install
 	$(INSTALL_DIR) $(1)/lib
 	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
-	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/bbfdm
+	$(CP) $(PKG_BUILD_DIR)/scripts/* $(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
+endef
+
+define Package/libbbfdm/prerm
+	#!/bin/sh
+	rm -rf /etc/bbfdm/*
+	exit 0
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
+	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
 	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
-	$(CP) $(PKG_BUILD_DIR)/dmtree/tr181/*.h $(1)/usr/include/libbbfdm/
+	$(CP) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.{a,so*} $(1)/usr/lib/
 endef
 
+$(eval $(call BuildPackage,libbbf_api))
 $(eval $(call BuildPackage,libbbfdm))

bulkdata/Makefile

@@ -0,0 +1,50 @@
+#
+# 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.1
+
+PKG_SOURCE_VERSION:=e4f39d1bf4678fc05b9d02e81b194c70719909e4
+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

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

@@ -0,0 +1,34 @@
+#!/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

@@ -0,0 +1,38 @@
+#
+# 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/files/etc/init.d/catv

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

crashlog/files/etc/init.d/crashlog

@@ -4,16 +4,15 @@ 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)
+	nr=$(db get hw.board.serial_number)
+	hw=$(db get hw.board.model_name)
+	fam=$(db get hw.board.iopVerFam)
 	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}
+	    scp  -S /usr/sbin/logssh /proc/last_kmsg log@${server}:log/${fam}_${hw}_${sw}_${nr}
 	    if [ $? == 0 ]
 	    then
 	       break;
@@ -28,7 +27,7 @@ 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 set system.crashlog.server="crashlog.iopsys.eu"
     /sbin/uci commit
 }
 

crashlog/files/sbin/logcore

@@ -20,7 +20,7 @@ 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 set system.corelog.server="corelog.iopsys.eu"
     /sbin/uci commit
 }
 
@@ -50,12 +50,11 @@ cat >$TMP_CORE
 # 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)
+nr=$(db get hw.board.serial_number)
+hw=$(db get hw.board.model_name)
+fam=$(hw.board.iopVerFam)
 sw=$(db get hw.board.iopVersion)
 
-scp -S /usr/sbin/logssh $TMP_CORE log@${server}:log/core_${1}_${2}_${bid}_${hwv}_${hw}_${sw}_${nr}
+scp -S /usr/sbin/logssh $TMP_CORE log@${server}:log/core_${1}_${2}_${fam}_${hw}_${sw}_${nr}
 rm $TMP_CORE
 

crashlog/readme

@@ -24,7 +24,7 @@ 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
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwn9RaDAzxW1dTmIhXgFBnpi1lhj8xhYpCVQiPxxdk9IEmH8zjo4y9j3sPkqKOlRnkwjpZIpLEKBnpQTwVIMCU/AG7nDJX3OH9RfS9mLJQLfFL8HyGCyqDezFWldbyovhJZvdUeK4tAXJWv2W3OVHiz2L8IlncBgP/E9DJElsyhhQHsM96UE6tBkXsvXkoDbMSYXFcLbgiUwBKfmM2BF/aPDL45iznGur7/2j9v95PwJ0gtMu9jjNRq+pXCXhTh3bsnczm0MpZC1aiRc9nJAeGIMmhrf15E4jBKgTnrstzJxGVAdajKeR954KcNsS33cS2Wmui2YjmPbBXjqf1frzJ log@iopsys
 ----------
 
 The public key should be just one line. Add that line to the 

crun/Makefile

@@ -0,0 +1,82 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=crun
+PKG_VERSION:=0.18
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/containers/crun.git
+PKG_SOURCE_DATE:=2021-03-18
+PKG_SOURCE_VERSION:=496e81bdd69f117f10e4477e4204e4611a94b68f
+PKG_MIRROR_HASH:=26941b0d84bbeabeb5e982af48d131f55d0aa16f4a2f2ca3279a5c812cdeea8b
+
+PKG_BUILD_DEPENDS:=argp-standalone
+PKG_BUILD_PARALLEL:=1
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/crun
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=crun
+  URL:=https://github.com/containers/crun
+  DEPENDS:=@!arc +libseccomp +libcap
+endef
+
+define Package/crun/description
+  A fast and low-memory footprint OCI Container Runtime fully written in C.
+endef
+
+CONFIGURE_ARGS+= \
+	--disable-systemd \
+	--enable-embedded-yajl \
+	--enable-caps \
+	--enable-dl \
+	--enable-seccomp \
+	--enable-bpf
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(SED) '/#include <git-version.h>/d' $(PKG_BUILD_DIR)/src/crun.c
+endef
+
+define Build/Configure
+	$(call Build/Configure/Default)
+
+	$(SED) '/#define PACKAGE \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define VERSION \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define GIT_VERSION \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_BUGREPORT \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_NAME \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_STRING \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_TARNAME \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_VERSION \"/d' $(PKG_BUILD_DIR)/config.h
+
+	echo "#define PACKAGE \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define VERSION \"$(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_NAME \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_VERSION \"$(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_STRING \"$(PKG_NAME) $(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_TARNAME \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_BUGREPORT \"bugs@openwrt.org\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define GIT_VERSION \"$(PKG_SOURCE_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
+endef
+
+define Package/crun/install
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/crun $(1)/usr/bin/
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/crun $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcrun.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,crun))

dectmngr/Makefile

@@ -0,0 +1,62 @@
+#
+# 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.0.13
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=2c4fdf3f3ffc299c7596e6d0dc4be86485250533
+PKG_MIRROR_HASH:=skip
+endif
+
+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:=DECT Manager
+ 	DEPENDS:= +libubox +ubus
+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
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	rsync -av --exclude=.* ~/git/voip/dectmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+MAKE_FLAGS += \
+	CFLAGS+="-Wall"
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc
+
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/dectmngr $(1)/usr/sbin/
+	$(STRIP) $(1)/usr/sbin/dectmngr
+	$(CP) ./files/etc/* $(1)/etc/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

dectmngr/files/etc/init.d/dectmngr

@@ -0,0 +1,66 @@
+#!/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
+
+# 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 rfpi=
+	local opt_rfpi=
+	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_rfpi="-rfpi $rfpi"
+
+	procd_open_instance
+	procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_rfpi
+	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() {
+	stop_and_wait_dectmngr
+	start
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger asterisk
+}
+
+boot() {
+	echo 14 > /sys/class/gpio/export
+	echo out > /sys/class/gpio/gpio14/direction
+
+	[ ! -d $LOG_PATH ] && mkdir -p $LOG_PATH
+	start
+}
+

dectmngr2/Makefile

@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_RELEASE:=1
-PKG_VERSION:=1.3.0
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2c8990fd5275d469e8ab6c7a99e17fe0a56052ea
-PKG_NAME:=dectmngr2
-
-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/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

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

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

@@ -1,23 +0,0 @@
-#!/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

@@ -8,14 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.1.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7522faab4142fe2c0ac8cbf71bb0cc5bd49f0750
+PKG_SOURCE_VERSION:=d17c699c1fc9588303d6da35ac2250903bf17cd8
 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)
@@ -25,9 +26,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-  TARGET_PLATFORM=BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
@@ -45,7 +44,7 @@ define Package/dslmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +easy-soc-libs
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
 endef
 
 define Package/dslmngr/description
@@ -56,6 +55,7 @@ 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 += \

easy-qos/Makefile

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

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

@@ -4,6 +4,7 @@ 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 ] && {
@@ -16,6 +17,13 @@ log() {
 }
 
 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 ${@}";
@@ -46,6 +54,114 @@ get_priority() {
 	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
@@ -67,10 +183,10 @@ get_bridge_interface() {
 validate_rule_section()
 {
 	uci_validate_section easy_qos rule "${1}" \
-		'priority:string:none' \
-		'macaddr:string:none' \
+		'priority:string' \
+		'macaddr:string' \
 		'proto:string:none' \
-		'port:list(uinteger):none' \
+		'port:list(uinteger)' \
 		'comment:string:none'
 }
 
@@ -82,8 +198,14 @@ clear_existing_rules() {
 	while read line
 	do
 		log "Deleting old classification rules"
-		exec_log classcfg -D ${line} -i ${BRIDGE_INTF}
+		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}
@@ -104,13 +226,16 @@ create_rule() {
 	if [ "${mac_addr}" != "none" ]; then
 		cmd="--smac ${mac_addr} ${cmd}";
 	fi
-	if [ "${ports}" != "none" ]; then
-		IFS=","
-		for port in ${ports};
-		do
-			cmd="--dport ${port}:${port} ${cmd}";
-		done
-		IFS=' '
+
+	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"
@@ -119,14 +244,14 @@ create_rule() {
 	cmd="-A ${rule_name} $cmd"
 
 	# Store the rule_names for cleanup on reload
-	exec_log classcfg ${cmd} 
+	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
+	local priority macaddr proto port comment prio_num port_list ip ipmark
 
 	validate_rule_section "${1}" || {
 		log "Validation of section failed"
@@ -135,22 +260,33 @@ manage_rule() {
 
 	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() {

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

@@ -103,18 +103,18 @@ validate_rule_section()
 
 # Clear existing rules before applying new rules
 clear_existing_rules() {
-	local rule=$(iptables -t mangle -S OUTPUT|grep -m 1 MARK |sed 's/-A/-D/1')
+	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 OUTPUT|grep -m 1 MARK |sed 's/-A/-D/1')
+		rule=$(iptables -t mangle -S PREROUTING | grep -m 1 MARK |sed 's/-A/-D/1')
 	done
 }
 
 check_and_create() {
-	iptables -t mangle -C OUTPUT ${@} 2>/dev/null
+	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
 	# Create rule if not exists
 	if [ ${?} -ne 0 ]; then
-		exec_log iptables -t mangle -A OUTPUT ${@}
+		exec_log iptables -t mangle -A PREROUTING ${@}
 	else
 		log "Rule exists for ${@}"
 	fi

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

@@ -4,7 +4,5 @@ uci -q batch <<-EOT
         set firewall.easyqos=include
         set firewall.easyqos.path=/etc/firewall.easyqos
         set firewall.easyqos.reload=1
-	uci del_list firewall.easyqos._access_w="root"
-	uci add_list firewall.easyqos._access_w="root"
         commit firewall
 EOT

easy-soc-events/Makefile

@@ -0,0 +1,110 @@
+# 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.deprecated/Config.in

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

easy-soc-libs.deprecated/Makefile

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

easy-soc-libs/Config.in

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

easy-soc-libs/Makefile

@@ -1,22 +1,23 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
-# 
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=2.4.0
+PKG_VERSION:=6.2.19
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=30f5527ae724d54537c803127e11992d1a5ae154
+PKG_SOURCE_VERSION:=d1fd660106d9ac3c937d005775608df43e1aa17c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -29,66 +30,52 @@ 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
 
-define Package/libwifi/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/libwifi
-  $(call Package/easy-soc-libs)
-  TITLE:= WiFi library (libwifi)
-  DEPENDS+=+libnl +libnl-route
-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)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
-  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
+  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
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
   TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-  TARGET_PLATFORM=MARVELL
-  TARGET_CFLAGS +=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-  TARGET_PLATFORM=INTEL
-  TARGET_CFLAGS +=-DIOPSYS_INTEL
+else ifeq ($(CONFIG_TARGET_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
-  $(info Unexpected CONFIG_TARGET)
+  $(info Unexpected CONFIG_TARGET, use default MAC80211)
+  TARGET_PLATFORM=MAC80211
+  TARGET_CFLAGS +=-DIOPSYS_MAC80211
 endif
 
 export TARGET_PLATFORM
 
-ifdef CONFIG_IOP_LLA_LIBS_DEBUG
-  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
-endif
-
-define Package/libdsl
-  $(call Package/easy-soc-libs)
-  TITLE:= XDSL library (libdsl)
-  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi +TARGET_intel_mips:kmod-ppa-drv
-endef
-
 subdirs := \
+	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
+	$(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
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
@@ -108,57 +95,36 @@ define Build/Prepare
 endef
 endif
 
-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
+include easy.mk
+include wifi.mk
+include dsl.mk
+include ethernet.mk
+include qos.mk
 
-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/
+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_*)
 endef
+endif
 
-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
+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)
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(MAKE) -C "$(PKG_BUILD_DIR)/libdsl/test" $(MAKE_FLAGS)
-endif
+	$(foreach dir,$(subdirs),$(call Build/Compile/$(dir)))
 endef
 
 define Build/InstallDev
 	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
 endef
 
-define Package/libwifi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
+define Package/easy-soc-libs/install
+	:
 endef
 
-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
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(CP) $(PKG_BUILD_DIR)/libdsl/test/libdsl_test $(1)/usr/bin/
-endif
-endef
-
-$(eval $(call BuildPackage,libwifi))
-$(eval $(call BuildPackage,libdsl))
-$(eval $(call BuildPackage,libethernet))
+$(eval $(foreach e,$(EASY_SOC_LIBS),$(call BuildPackage,$(e))))

easy-soc-libs/dsl.mk

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

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

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

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

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

@@ -6,33 +6,29 @@
 #
 include $(TOPDIR)/rules.mk
 
-PKG_RELEASE:=1
-PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=631e61b7ab5d86f2f4c86756a117badff9fb0f2c
-
-
-ifeq ($(CONFIG_ENDPT_OPEN),y)
-BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
-PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
-PKG_NAME:=endptmngr-open
-else
-PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/endptmngr
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_NAME:=endptmngr
+PKG_VERSION:=0.5
 
-PKG_LICENSE:=GPLv2
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
+PKG_SOURCE_VERSION:=d3938443caffea15641bff72837d2de0cf87d62c
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
-endif
-
-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_504002
+export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -42,27 +38,18 @@ endef
 
 define Package/endptmngr
   CATEGORY:=Utilities
-  TITLE:=Brcmslic
+  TITLE:=Broadcom Voice Endpoint Manager
   URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen
+  DEPENDS:= +libubox +ubus +libpicoevent +uci +bcmkernel @TARGET_HAS_VOICE @BCM_VOICE
 endef
 
 define Package/endptmngr/description
 	endptmngr
 endef
 
-ifeq ($(CONFIG_ENDPT_OPEN),y)
-
-define Build/Compile
-endef
-
-endif
-
-
 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

@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+
+START=68
+STOP=12
+
+USE_PROCD=1
+NAME=endptmngr
+
+start_service() {
+	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

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

ethmngr/files/ethmngr.init

@@ -4,12 +4,11 @@ START=95
 STOP=10
 
 USE_PROCD=1
-PROG=/usr/sbin/wifimngr
+PROG=/usr/sbin/ethmngr
 
 start_service() {
 	procd_open_instance
 	procd_set_param command ${PROG}
-#	procd_set_param env IOP_LLA_LIBS_DEBUG=3    #for debugging only
 	procd_set_param respawn
 	procd_close_instance
 }

fdtextract/Makefile

@@ -0,0 +1,51 @@
+#
+# 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:=485a38bc4eaf2a54d080b8529d5130b2955626d1
+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

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

gryphon-led-module/src/main.c

@@ -46,9 +46,10 @@ static ssize_t get_led_color(struct device *dev,
 	/* [ln] todo: dummy implementation */
 	int len;
 
-	len = sprintf(buf, "%d\n", 123);
+	len = scnprintf(buf, PAGE_SIZE, "%d\n", 123);
 	if (len <= 0) {
 		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
+		return -EIO;
 	}
 
 	return len;
@@ -99,8 +100,69 @@ static ssize_t set_led_color(struct device *dev,
 }
 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
 };
 
@@ -129,6 +191,8 @@ static int canyon_led_probe(struct platform_device *pdev)
 	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,
@@ -140,7 +204,7 @@ static int canyon_led_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, leds);
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 16, 0)
+#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);
@@ -148,6 +212,12 @@ static int canyon_led_probe(struct platform_device *pdev)
 	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)) {
@@ -160,7 +230,7 @@ static int canyon_led_probe(struct platform_device *pdev)
 		gpiod_set_value(leds->clock_gpio, 0);
 	}
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 16, 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);
@@ -168,6 +238,12 @@ static int canyon_led_probe(struct platform_device *pdev)
 	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)) {

icgroupd/Makefile

@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=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

@@ -1,76 +0,0 @@
-#!/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

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

@@ -1,93 +0,0 @@
-#!/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,8 +1,4 @@
-if PACKAGE_icwmp-curl || PACKAGE_icwmp-zstream
-
-config CWMP_SCRIPTS_FULL
-	bool "Install all icwmp scripts"
-	default y
+if PACKAGE_icwmp
 
 choice
 	prompt "Select ACS sever"
@@ -22,6 +18,6 @@ config CWMP_DEBUG
 config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
-    
+
 endif
 

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,13 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-10-01
+PKG_VERSION:=7.0.1-2021-05-14
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ed781436f96f2dc3cf58b35adc640c6f9f6783d1
+PKG_SOURCE_VERSION:=f70cc81e5688e32aa82084faae5bc6ff710bb81b
 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
@@ -26,73 +27,25 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_DEBUG \
 	CONFIG_CWMP_DEVEL_DEBUG
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
 
 include $(INCLUDE_DIR)/package.mk
 
-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_twamp
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 twamp feature
-	DEPENDS:=+libuci
-endef
-
-define Package/icwmp_udpechoserver
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=TR-069 udpechoserver feature
-	DEPENDS:=+libuci
-endef
-
-define Package/icwmp_bulkdata
- SECTION:=utils
- CATEGORY:=Utilities
- TITLE:=TR-069 BulkData Collection
- DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm
-endef
-
-define Package/icwmp/Default
+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 +libbbfdm +(PACKAGE_libtr098):libtr098
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libcurl
 endef
 
-define Package/icwmp/description
+define Package/$(PKG_NAME)/description
  A free client implementation of CWMP (TR-069) protocol
 endef
 
-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
+define Package/$(PKG_NAME)/config
 	source "$(SOURCE)/Config_cwmp.in"
 endef
 
@@ -103,10 +56,6 @@ define Build/Prepare
 endef
 endif
 
-ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-TARGET_CFLAGS += -DEX400
-endif
-
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 
@@ -126,17 +75,6 @@ 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 ($(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 += \
@@ -158,87 +96,15 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-ifeq ($(CONFIG_PACKAGE_libtr098),y)
-CONFIGURE_ARGS += \
-	--enable-tr098
-endif
-
-CONFIGURE_ARGS += \
-	--enable-tr181
-
-define Package/icwmp-$(BUILD_VARIANT)/install
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin
-ifeq ($(CONFIG_PACKAGE_libtr098),y)
-	$(CP) $(PKG_BUILD_DIR)/bin/icwmp_tr098d $(1)/usr/sbin
-endif
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/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
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin/
 	$(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
-	$(CP) ./xmpp-files/* $(1)/
-endef
-
-define Package/icwmp_udpechoserver/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_udpechoserverd $(1)/usr/sbin/icwmp_udpechoserverd
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_udpechoserverd $(1)/etc/init.d/icwmp_udpechoserverd
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_udpechoserver $(1)/etc/config
-endef
-
-define Package/icwmp_twamp/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_twampd $(1)/usr/sbin/icwmp_twampd
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_twampd $(1)/etc/init.d/icwmp_twampd
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_twamp $(1)/etc/config
-endef
-
-define Package/icwmp_bulkdata/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_bulkdatad $(1)/usr/sbin/icwmp_bulkdatad
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_bulkdatad $(1)/etc/init.d/icwmp_bulkdatad
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_bulkdata $(1)/etc/config
-endef
-
-define Package/icwmp-$(BUILD_VARIANT)/postinst
+define Package/$(PKG_NAME)/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
@@ -246,7 +112,7 @@ define Package/icwmp-$(BUILD_VARIANT)/postinst
 	exit 0
 endef
 
-define Package/icwmp-$(BUILD_VARIANT)/prerm
+define Package/$(PKG_NAME)/prerm
 	#!/bin/sh
 	if [ -z "$${IPKG_INSTROOT}" ]; then
 		echo "Disabling rc.d symlink for icwmpd"
@@ -255,10 +121,4 @@ define Package/icwmp-$(BUILD_VARIANT)/prerm
 	exit 0
 endef
 
-$(eval $(call BuildPackage,icwmp-curl))
-$(eval $(call BuildPackage,icwmp_stun))
-$(eval $(call BuildPackage,icwmp_xmpp))
-$(eval $(call BuildPackage,icwmp_udpechoserver))
-$(eval $(call BuildPackage,icwmp_twamp))
-$(eval $(call BuildPackage,icwmp_bulkdata))
-$(eval $(call BuildPackage,icwmp-zstream))
+$(eval $(call BuildPackage,$(PKG_NAME)))

icwmp/README

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

@@ -0,0 +1,46 @@
+config acs 'acs'
+	option url ''
+	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 ParameterKey ''
+	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'
+	
+config lwn 'lwn'
+	option enable '1'
+	option hostname ''
+	option port '0'

icwmp/files/etc/firewall.cwmp

@@ -0,0 +1,21 @@
+#created by the icwmp package 
+zone_name=""
+port=""
+if [ "$zone_name" = "" ]; then
+	exit 0
+elif [ "$zone_name" = "icwmp" ]; then
+	iptables -nL zone_icwmp_input 2> /dev/null
+	if [ $? != 0 ]; then
+		iptables -N zone_icwmp_input
+		iptables -t filter -A INPUT -j zone_icwmp_input
+		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
+	else			
+		iptables -F zone_icwmp_input
+		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
+	fi			
+else
+	iptables -F zone_icwmp_input 2> /dev/null
+	iptables -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
+	iptables -X zone_icwmp_input 2> /dev/null
+fi
+#iptables -I FW_ZONE -p tcp -s ACS_ADDRESS --dport PORT -j ACCEPT --comment "Open ACS port"

icwmp/files/etc/init.d/icwmpd

@@ -0,0 +1,189 @@
+#!/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=10
+
+USE_PROCD=1
+PROG="/usr/sbin/icwmpd"
+
+EXTRA_HELP="	start	[GetRPCMethods] Start icwmpd service and send GetRPCMethods"
+
+validate_url() {
+	# SCHEMA_LIST: contain list of possible schemas that could be present in the acs url
+	# Example: SCHEMA_LIST="http https"
+	SCHEMA_LIST="http"
+
+	for schema in $SCHEMA_LIST;	do
+		dest=`echo $1 | sed 's/$schema:\/\///g' | cut -f1 -d \/ | cut -f1 -d:`
+		if [ "_$dest" != "_" ]; then
+			return 0
+		fi
+	done
+	return 1
+}
+
+get_acs_url() {
+	local default_acs="http://10.10.1.6:8000/openacs/acs"
+	local acs_dhcp_discovery="$(uci -q get cwmp.acs.dhcp_discovery)"
+	local url="$(uci -q get cwmp.acs.url)"
+	local dhcp_url="$(uci -P /var/state -q get cwmp.acs.dhcp_url)"
+
+	if [ "$acs_dhcp_discovery" == "enable" -a -n "$dhcp_url" -o -z "$url" ]; then
+		url="$dhcp_url"
+		echo "ACS URL from DHCP server: $url"
+		[ -n "$url" ] && uci -P /var/state -q set cwmp.acs.url="$url" || url="$default_acs"
+	elif [ -n "$url" ];then
+		url="$(uci -q get cwmp.acs.url)"
+		echo "ACS URL from configuration: $url"
+	else
+		url="$default_acs"
+		echo "Using default ACS URL: $url"
+		[ -n "$url" ] && uci -P /var/state -q set cwmp.acs.url="$url"
+	fi
+
+	validate_url "$url"
+	if [ "$?" != "0" ];then
+		echo "Invalid ACS URL: $url"
+		exit 1
+	fi
+}
+
+enable_dhcp_option43() {
+	local wan=$1
+	local discovery=0
+	case $2 in
+		enable|1) discovery=1 ;;
+	esac
+
+	### Ask for DHCP Option 43 only if CWMP is enabled ###
+	local enabled
+	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
+		ubus call network reload
+	fi
+	########################################################
+}
+
+wait_for_option43() {
+	local time=$1
+	local default_wan_interface dhcp_discovery url
+
+	config_get default_wan_interface cpe default_wan_interface "wan"
+	config_get dhcp_discovery acs dhcp_discovery "0"
+	config_get url acs url
+
+	enable_dhcp_option43 $default_wan_interface $dhcp_discovery
+
+	local tm=0
+
+	if [ "$dhcp_discovery" == "enable" -o "$dhcp_discovery" == "1" ]
+	then
+		echo "Waiting for discovery of ACS URL from dhcp server ..."
+		while [ $tm -le $time ]
+		do
+			acs_url=`uci -P /var/state -q get cwmp.acs.dhcp_url`
+			if [ "$acs_url" != "" ]
+			then
+				break
+			else
+				sleep 1
+			fi
+			tm=$((tm+1))
+		done
+	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 l3_device=""
+	local default_wan_interface=""
+
+	config_get default_wan_interface cpe default_wan_interface "wan"
+	json_load "$(ifstatus $default_wan_interface)"
+	json_get_var l3_device l3_device
+	if [ "$l3_device" != "" ];then
+		uci -q set cwmp.cpe.interface="$l3_device"
+		uci -q commit cwmp
+	fi
+}
+
+start_service() {
+	if [ ! -f /tmp/.icwmpd_boot ]; then
+		touch /etc/icwmpd/.icwmpd_boot
+		touch /tmp/.icwmpd_boot
+	else
+		[ -f /sbin/netifd ] && echo "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
+		[ -f /etc/config/wireless ] && echo "Waiting for WiFi to be started ..." && ubus -t 5 wait_for network.wireless
+		[ -f /usr/sbin/dnsmasq ] && echo "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
+		[ -f /etc/config/dhcp ] && echo "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
+		[ -f /usr/sbin/asterisk ] && echo "Waiting for Voice to be started ..." && ubus -t 5 wait_for asterisk
+
+		config_load cwmp
+		set_wan_interface
+		wait_for_option43 20
+		get_acs_url
+
+		procd_open_instance
+		procd_set_param command "$PROG"
+		if [ "$1" = "GetRPCMethods" ];then
+			procd_append_param command -g
+		elif [ -f /etc/icwmpd/.icwmpd_boot ]; then
+			procd_append_param command -b
+		fi
+		procd_set_param respawn "3" "7" "0"
+		procd_close_instance
+	fi
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_config_trigger "config.change" "cwmp"  /etc/init.d/icwmpd reload
+}
+

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

@@ -0,0 +1,32 @@
+# Copy defaults by the factory to the cwmp UCI user section.
+
+
+# Get factory base MAC.
+baseMac=$(db -q get hw.board.basemac)
+
+# Erase colon and space characters.
+baseMac=${baseMac//:/}
+baseMac=${baseMac// /}
+
+# Caseing and fixed length string.
+mac=$(printf "%12.12X" $((0x$baseMac)))
+
+# Get system serial number.
+serial=$(db -q get hw.board.serial_number)
+
+# 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="${mac:0:6}-${serial}"
+fi
+
+if [ -z "$cpe_userid" ]
+then
+    uci -q set cwmp.cpe.userid="${mac:0:6}-${serial}"
+fi
+
+# No need for commit here, it is done by uci_apply_defaults().

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

@@ -0,0 +1,12 @@
+#!/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/lib/upgrade/keep.d/icwmp

@@ -0,0 +1 @@
+/etc/icwmpd/.icwmpd_backup_session.xml

icwmp/files/lib/upgrade/post-rootfs-fixup.d/215-icwmp

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# As part of sysupgrade we copy CWMP Backup Session XML file.
+
+
+# Abort on any error.
+set -e
+
+
+# Do nothing if user want to discard old settings.
+if [ -n "$SAVE_CONFIG" ] && [ $SAVE_CONFIG -eq 0 ]; then
+	exit 0
+fi
+
+# Source functions.
+for f in /lib/upgrade/iopsys*.sh; do
+	[ -r "$f" -a -s "$f" ] || continue
+	source $f
+done
+
+
+if [ -s "${2}/etc/icwmpd/.icwmpd_backup_session.xml" ]; then
+	cat "${2}/etc/icwmpd/.icwmpd_backup_session.xml" > "/etc/icwmpd/.icwmpd_backup_session.xml"
+fi
+
+# Report success.
+log "post-hooks" "CWMP Backup Session XML file migrated"
+
+exit 0

ieee1905/Config.in

@@ -0,0 +1,29 @@
+if PACKAGE_ieee1905 || PACKAGE_lib1905al
+
+menu "developer/debug options"
+
+	config IEEE1905_MAP_COMPLETE_NETWORK
+		bool "Create network topology for complete network"
+		default n
+
+	config IEEE1905_SPEED_UP_DISCOVERY
+		bool "Speed up discovery of an AL in network"
+		default y
+
+	config IEEE1905_DO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS
+		bool "Do not accept M1/M2 messages from unknown AL(s)"
+		default y
+
+	choice
+		prompt "Select ALME support"
+		default IEEE1905_ALME_OVER_UBUS
+
+		config IEEE1905_ALME_OVER_UBUS
+			bool "ALME methods supported over ubus"
+
+		#config IEEE1905_ALME_OVER_TCP
+		#	bool "ALME server over TCP port"
+
+	endchoice
+endmenu
+endif

ieee1905/Makefile

@@ -0,0 +1,142 @@
+#
+# Copyright (C) 2019 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ieee1905
+PKG_VERSION:=2.1.44
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=33d05c2223023ce5b57001008555bd0f82e88541
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ieee1905
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=IEEE1905 daemon
+  DEPENDS:= +libuci +libjson-c +libieee1905 +ubox +libpcap +libopenssl +libwifi +libeasy
+endef
+
+define Package/ieee1905/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Package/ieee1905/description
+ IEEE1905 stack with extended functionalities.
+endef
+
+define Package/libieee1905
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=IEEE1905 cmdu tlv utility library
+endef
+
+define Package/libwsc
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Wifi Simple Configuration building and processing library
+  DEPENDS= +libopenssl +libuci +libubus
+endef
+
+define Package/lib1905hle
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=IEEE1905 hle stack library
+endef
+
+LIBS := \
+	$(if $(CONFIG_PACKAGE_libwsc),libwsc.so)
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-D_GNU_SOURCE \
+	-fstrict-aliasing \
+	-Wall \
+	-Wextra
+
+MAKE_FLAGS += \
+	LIBS="$(LIBS)"
+
+ifeq ($(CONFIG_IEEE1905_SPEED_UP_DISCOVERY),y)
+TARGET_CFLAGS += -DSPEED_UP_DISCOVERY
+endif
+ifeq ($(CONFIG_IEEE1905_DO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS),y)
+TARGET_CFLAGS += -DDO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS
+endif
+ifeq ($(CONFIG_IEEE1905_ALME_OVER_TCP),y)
+TARGET_CFLAGS += -DALME_OVER_TCP
+endif
+ifeq ($(CONFIG_IEEE1905_ALME_OVER_UBUS),y)
+TARGET_CFLAGS += -DALME_OVER_UBUS
+endif
+ifeq ($(CONFIG_IEEE1905_MAP_COMPLETE_NETWORK),y)
+TARGET_CFLAGS += -DIEEE1905_MAP_COMPLETE_NETWORK
+endif
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/ieee1905/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/ieee1905/install
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/ieee1905
+	$(INSTALL_DIR) $(1)/usr/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/etc/init.d/ieee1905 $(1)/etc/init.d/ieee1905
+	$(INSTALL_DATA) ./files/etc/config/ieee1905 $(1)/etc/config/ieee1905
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ieee1905d $(1)/usr/sbin/
+endef
+
+define Package/lib1905hle/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/lib1905hle.so $(1)/usr/lib/lib1905hle.so
+endef
+
+define Package/libieee1905/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/libieee1905.so $(1)/usr/lib/libieee1905.so
+endef
+
+define Package/libwsc/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/libwsc.so $(1)/usr/lib/libwsc.so
+endef
+
+define Build/InstallDev/libwsc.so
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwsc/include/wsc.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/lib/libwsc.so $(1)/usr/lib/
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/include/ieee1905
+	$(INSTALL_DIR) $(1)/usr/include/ieee1905
+	$(INSTALL_DIR) $(1)/usr/include/lib1905hle
+	$(CP) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/ieee1905/
+	$(CP) $(PKG_BUILD_DIR)/libieee1905/include/*.h $(1)/usr/include/ieee1905/
+	$(CP) $(PKG_BUILD_DIR)/lib1905hle/include/*.h $(1)/usr/include/lib1905hle/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/libieee1905.so $(1)/usr/lib
+	$(foreach lib,$(LIBS),$(call Build/InstallDev/$(lib),$(1),$(2));)
+endef
+
+$(eval $(call BuildPackage,libieee1905))
+$(eval $(call BuildPackage,lib1905hle))
+$(eval $(call BuildPackage,libwsc))
+$(eval $(call BuildPackage,ieee1905))

ieee1905/files/etc/config/ieee1905

@@ -0,0 +1,17 @@
+config ieee1905 'ieee1905'
+        option enabled '1'
+        option debug  true
+        option debug_level  2
+        option macaddress 'auto'
+        option registrar 0
+        option cmdu_event 1
+        option map_plugin 1
+
+config security 'security'
+        list method 'PBC'
+
+config al-iface
+        option enabled 1
+        option ifname 'br-lan'
+        option media 'bridge'
+

ieee1905/files/etc/init.d/ieee1905

@@ -0,0 +1,72 @@
+#!/bin/sh /etc/rc.common
+
+START=96
+STOP=22
+
+USE_PROCD=1
+PROG=/usr/sbin/ieee1905d
+
+validate_ieee1905_section()
+{
+	uci_validate_section ieee1905 ieee1905 "${1}" \
+		'debug:bool:false' \
+		'enabled:bool:false'
+}
+
+configure_ieee1905()
+{
+	local enabled debug
+
+	validate_ieee1905_section ${1} || {
+		echo "Validation of ieee1905 section failed"
+		exit 1;
+	}
+
+	if [ ${debug} -eq 1 ]; then
+		# Forward stdout of the command to logd
+		#procd_set_param stdout 1
+		# Same for stderr
+		procd_set_param stderr 1
+	fi
+
+	if [ ${enabled} -ne 1 ]; then
+		exit 0;
+	fi
+}
+
+configure_network()
+{
+	ebtables -L FORWARD|grep -iqE "1:80:C2:(0)+:(0)+:13.*-j.*DROP"
+	if [ "$?" -ne 0 ]; then
+		echo "Applying drop rule to drop pkts forwared by kernel to 1905.1 multicast mac"
+		ebtables -A FORWARD -d 01:80:c2:00:00:13 -j DROP
+	fi
+}
+
+service_running() {
+        ubus -t 2 wait_for wifi
+}
+
+start_service() {
+
+	[ -d /usr/lib/ieee1905 ] || mkdir -p /usr/lib/ieee1905
+
+	procd_open_instance ieee1905
+	procd_set_param command ${PROG}
+	configure_ieee1905 "ieee1905"
+	configure_network
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger "network"
+	procd_add_reload_trigger "wireless"
+	procd_add_reload_trigger "netmode"
+	procd_add_reload_trigger "ieee1905"
+}

ifbt/Makefile

@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2018 iopsys Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ifbt
-PKG_VERSION:=0.2
-
-PKG_SOURCE_VERSION:=f6edff47b6c0a154ab892301acf767d19ac8ad73
-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)
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=README
-
-include $(INCLUDE_DIR)/package.mk
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-TARGET_PLATFORM:=-DIOPSYS_BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-TARGET_PLATFORM:=-DIOPSYS_BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-TARGET_PLATFORM:=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-TARGET_PLATFORM:=-DIOPSYS_INTEL
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-TARGET_PLATFORM:=-DIOPSYS_MEDIATEK
-else
-$(info (UNEXPECTED CONFIG TARGET))
-endif
-
-export TARGET_PLATFORM
-
-define Package/ifbt
-	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c  +libwifi +libjson-c
-	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))

imonitor/Makefile

@@ -5,15 +5,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=imonitor
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 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:=532f4900862bcb45d8cd4bf37555fabda81750b6
+PKG_SOURCE_VERSION:=4beb1d5d6925507f1850a84c0b83aaf12a082f7f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1

inbd/Makefile

@@ -9,14 +9,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=inbd
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.2.2
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=53ca7f58edb87976b5897ccaf487bb0cbbf39d07
+PKG_SOURCE_VERSION:=10f765f3d0fcc226b6ecf0c481598c9e7f76315e
 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)
 

inotify-tools/Makefile

@@ -1,60 +0,0 @@
-#
-# 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)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
-# 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

@@ -1,13 +0,0 @@
-#! /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/config

@@ -6,21 +6,28 @@ CONFIG_DEVEL=y
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
-CONFIG_PACKAGE_alsa-lib=y
+CONFIG_PACKAGE_at=y
+CONFIG_PACKAGE_atftp=m
+CONFIG_PACKAGE_atftpd=m
+CONFIG_PACKAGE_bulkdata=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_easy-qos=y
-CONFIG_PACKAGE_gdb=m
+CONFIG_PACKAGE_ethtool=y
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
-CONFIG_PACKAGE_icwmp-curl=y
-CONFIG_PACKAGE_ifbt=y
-CONFIG_PACKAGE_imonitor=y
+CONFIG_PACKAGE_gre=y
+CONFIG_PACKAGE_icwmp=y
+CONFIG_PACKAGE_ieee1905=y
+CONFIG_PACKAGE_map-1905=y
+CONFIG_PACKAGE_map-topology=y
+CONFIG_PACKAGE_mosquitto-client-ssl=y
+CONFIG_PACKAGE_mosquitto-ssl=y
+CONFIG_PACKAGE_wfadatad=y
+CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_iopupgrade=y
 CONFIG_PACKAGE_ip-full=y
@@ -31,48 +38,16 @@ CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
 # CONFIG_PACKAGE_iwatchdog is not set
-CONFIG_PACKAGE_juci=y
-CONFIG_PACKAGE_juci-config-backup=y
-CONFIG_PACKAGE_juci-ddns=y
-CONFIG_PACKAGE_juci-diagnostics=y
-CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
-CONFIG_PACKAGE_juci-dropbear=y
-CONFIG_PACKAGE_juci-easyqos=y
-CONFIG_PACKAGE_juci-event=y
-CONFIG_PACKAGE_juci-firewall-fw3=y
-CONFIG_PACKAGE_juci-icwmp=y
-CONFIG_PACKAGE_juci-igmpinfo=y
-CONFIG_PACKAGE_juci-minidlna=y
-CONFIG_PACKAGE_juci-mod-status=y
-CONFIG_PACKAGE_juci-mod-system=y
-CONFIG_PACKAGE_juci-mwan3=y
-CONFIG_PACKAGE_juci-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-realtime-graphs=y
-CONFIG_PACKAGE_juci-samba=y
-CONFIG_PACKAGE_juci-snmpd=y
-CONFIG_PACKAGE_juci-sysupgrade=y
-CONFIG_PACKAGE_juci-upnp=y
-CONFIG_PACKAGE_juci-usb=y
-CONFIG_PACKAGE_juci-voice-client=y
-CONFIG_PACKAGE_juci-wifilife=y
-CONFIG_PACKAGE_juci-wireless=y
-CONFIG_PACKAGE_juci-theme-iopsys=y
-CONFIG_PACKAGE_kmod-siit=y
-CONFIG_PACKAGE_libcgroup-daemon=y
-CONFIG_PACKAGE_libcgroup=y
-# CONFIG_PACKAGE_libcgroup-utils is not set
-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_jq=y
+CONFIG_PACKAGE_libreswan=m
+CONFIG_PACKAGE_libwifi=y
+CONFIG_PACKAGE_lscpu=y
+CONFIG_PACKAGE_luci=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_map=y
 CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mwan3=y
 CONFIG_PACKAGE_nand-utils=y
@@ -87,9 +62,9 @@ CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
+CONFIG_PACKAGE_owsd=y
 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
@@ -103,45 +78,40 @@ CONFIG_PACKAGE_rdnssd=y
 CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rpcd-mod-rpcsys=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_swmodd=m
 CONFIG_PACKAGE_tcpdump=y
 CONFIG_PACKAGE_terminfo=y
-CONFIG_PACKAGE_tptest=y
 CONFIG_PACKAGE_traceroute6=y
+CONFIG_PACKAGE_uledd=y
 CONFIG_PACKAGE_umbim=y
 CONFIG_PACKAGE_uqmi=y
+CONFIG_PACKAGE_urlfilter=y
 CONFIG_PACKAGE_usb-modeswitch=y
-CONFIG_PACKAGE_usbreset=y
 CONFIG_PACKAGE_uspd=y
-CONFIG_PACKAGE_wget=y
+CONFIG_PACKAGE_vsftpd-tls=m
 CONFIG_PACKAGE_wwan=y
-CONFIG_PACKAGE_libwifi=y
-CONFIG_PACKAGE_wifilife=y
 CONFIG_PACKAGE_wifimngr=y
-CONFIG_PACKAGE_libwifix=y
-CONFIG_PACKAGE_wifixd=y
+CONFIG_PACKAGE_uuidgen=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=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=y
+# CONFIG_BUSYBOX_CONFIG_HTTPD is not set
 # CONFIG_BUSYBOX_CONFIG_INSMOD is not set
 # CONFIG_BUSYBOX_CONFIG_MODINFO is not set
 # CONFIG_BUSYBOX_CONFIG_MODPROBE is not set
@@ -185,14 +155,67 @@ 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_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_BUSYBOX_CONFIG_IP is not set
-LOCAL_MIRROR="http://download.iopsys.eu/iopsys/mirror/"
+CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
 
+# Generation of /etc/banner.
+CONFIG_IMAGEOPT=y
+CONFIG_VERSIONOPT=y
+CONFIG_VERSION_MANUFACTURER="iopsysWrt"
+CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
+
+# Disable as much as possible of OpenWrt messy "pre-init" stuff.
+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=""
+
+# Generate rootfs tar file
+CONFIG_TARGET_ROOTFS_TARGZ=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

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"
+             update_package update_feed_branches ssh_upgrade smoketest"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 

iop/scripts/extract_core.sh

@@ -6,13 +6,9 @@ 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 '
 
@@ -24,7 +20,13 @@ function extract_core {
 		echo ""
 		echo "Example: $0 extract_core"
 		echo "  -p package/utils/busybox"
-		echo "  -r feeds/lede_core"
+		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 "  -b devel"
 	}
 

iop/scripts/feeds_update.sh

@@ -28,11 +28,11 @@ function feeds_update {
 
     # replace core packages with iopsys versions
     if [ $override == 1 ]; then
-		./scripts/feeds install -f -p lede_core -a
+		./scripts/feeds install -f -p openwrt_core -a
     fi
 
     # targets need to be installed explicitly
-    targets="iopsys-brcm63xx-mips iopsys-brcm63xx-arm iopsys-ramips intel_mips"
+    targets="iopsys-brcm63xx-arm iopsys-ramips intel_mips iopsys-x86 iopsys-armvirt iopsys-bcm27xx iopsys-mediatek"
     for target in $targets
     do
 	rm -f target/linux/$target
@@ -57,6 +57,3 @@ function feeds_update {
 
 register_command "feeds_update" "Update feeds to point to commit hashes from feeds.conf"
 
-
-
-

iop/scripts/genconfig.sh

@@ -5,7 +5,7 @@ function genconfig {
 	export IMPORT=1
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
-	export THEMEDIR="themes"
+	export THEMEDIR="tmp/juci-themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
 	export CONFIGPATH="package/feeds/iopsys/iop"
 	CUSTPATH="customerconfigs"
@@ -13,11 +13,14 @@ function genconfig {
 	export VERBOSE=0
 	export DEVELOPER=0
 	target="bogus"
-	config_path=""
-	brcm63xx_mips="target/linux/iopsys-brcm63xx-mips"
+	target_config_path=""
+	bcm27xx="target/linux/iopsys-bcm27xx"
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
 	intel_mips="target/linux/intel_mips"
+	mediatek="target/linux/iopsys-mediatek"
+	x86="target/linux/iopsys-x86"
+	armvirt="target/linux/iopsys-armvirt"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -79,20 +82,51 @@ function genconfig {
 
 	# Takes a board name and returns the target name in global var $target
 	set_target() {
-	    local profile=$1
+		local profile=$1
 
+		[ -n "$profile" ] || return
+
+		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_mips/genconfig ] &&
-			iopsys_brcm63xx_mips=$(cd $brcm63xx_mips; ./genconfig)
 		[ -e $brcm63xx_arm/genconfig ] &&
 			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
 		[ -e $ramips/genconfig ] &&
 			iopsys_ramips=$(cd $ramips; ./genconfig)
+		[ -e $mediatek/genconfig ] &&
+			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 		[ -e $intel_mips/genconfig ] &&
 			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
+		[ -e $x86/genconfig ] &&
+			iopsys_x86=$(cd $x86; ./genconfig)
+		[ -e $armvirt/genconfig ] &&
+			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $bcm27xx/genconfig ] &&
+			iopsys_bcm27xx=$(cd $bcm27xx; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_mediatek iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -101,18 +135,10 @@ function genconfig {
 			return
 	    fi
 
-	    for p in $iopsys_brcm63xx_mips; do
-		if [ $p == $profile ]; then
-		    target="iopsys_brcm63xx_mips"
-			config_path="$brcm63xx_mips/config"
-		    return
-		fi
-	    done
-
 	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_arm"
-			config_path="$brcm63xx_arm/config"
+			target_config_path="$brcm63xx_arm/config"
 		    return
 		fi
 	    done
@@ -120,7 +146,15 @@ function genconfig {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			config_path="$ramips/config"
+			target_config_path="$ramips/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_mediatek; do
+		if [ $p == $profile ]; then
+		    target="iopsys_mediatek"
+			target_config_path="$mediatek/config"
 		    return
 		fi
 	    done
@@ -128,27 +162,45 @@ function genconfig {
 	    for p in $iopsys_intel_mips; do
 		if [ $p == $profile ]; then
 		    target="intel_mips"
-			config_path="$intel_mips/config"
+			target_config_path="$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
+
+	    for p in $iopsys_bcm27xx; do
+		if [ $p == $profile ]; then
+		    target="iopsys_bcm27xx"
+			target_config_path="$bcm27xx/config"
 		    return
 		fi
 	    done
 
 	}
 
-	git remote -v | grep -q http || {
+	git remote -v | grep -qE '(git@|ssh://)' && {
 		DEVELOPER=1
 
 		bcmAllowed=0
 		endptAllowed=0
-		natalieAllowed=0
-		mediatekAllowed=0
-		wifilifeAllowed=0
 
 		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
-		git ls-remote git@dev.iopsys.eu:mediatek/linux.git -q 2>/dev/null && mediatekAllowed=1
-		git ls-remote git@dev.iopsys.eu:dialog/natalie-dect-12.26.git -q 2>/dev/null && natalieAllowed=1
 		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
-		git ls-remote git@dev.iopsys.eu:iopsys/wifilife.git -q 2>/dev/null && wifilifeAllowed=1
 	}
 
 	v() {
@@ -162,6 +214,7 @@ function genconfig {
 		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
 		echo -e "  -v|--verbose\t\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
+		echo -e "  -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"
@@ -169,7 +222,7 @@ function genconfig {
 		echo -e "  -a|--list-all\t\tList all Customers and their board types"
 		echo -e "  -b|--boards\t\tList all board types"
 		echo
-		echo "Example ./iop genconfig dg200 TELIA"
+		echo "Example ./iop genconfig eg400 OPERATORX"
 		echo "(if no customerconfig is chosen, iopsys config will be used)"
 		echo
 		exit 0
@@ -220,28 +273,30 @@ 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()
 	{
-		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
+		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"
 			fi
-		else
-			echo "You do not have access to $CUSTREPO"
-		fi
+		}
 
 		if [ ! -d "$FILEDIR" ]; then
 			mkdir -p $FILEDIR
@@ -291,14 +346,16 @@ function genconfig {
 		v "cp $CONFIGPATH/config .config"
 		cp $CONFIGPATH/config .config
 
-		if [ -f $config_path/config ]; then
-		    cat $config_path/config >> .config
+		if [ -f $target_config_path/config ]; then
+		    cat $target_config_path/config >> .config
+		    echo "" >> .config
 		fi
-		if [ -f $config_path/$BOARDTYPE/config ]; then
-		    cat $config_path/$BOARDTYPE/config >> .config
+		if [ -f $target_config_path/$BOARDTYPE/config ]; then
+		    cat $target_config_path/$BOARDTYPE/config >> .config
+		    echo "" >> .config
 		fi
 
-		#special handling for intel_mips which use TARGET_DEVICES
+		#special handling for intel_mips/iopsys_ramips which use TARGET_DEVICES
 		if [ "$target" = "intel_mips" ]; then
 			subtarget="xrx500"
 			echo "CONFIG_TARGET_${target}=y" >> .config
@@ -307,6 +364,23 @@ function genconfig {
 			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
+		elif [ "$target" = "iopsys_ramips" ]; then
+			subtarget="mt7621"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
+		elif [ "$target" = "iopsys_mediatek" ]; then
+			subtarget="mt7622"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
+		elif [ "$target" = "iopsys_bcm27xx" ]; then
+			subtarget="iopsys_bcm2711"
+			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
+			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
@@ -333,10 +407,12 @@ function genconfig {
 				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
@@ -344,6 +420,8 @@ function genconfig {
 		# Set target version
 		local GIT_TAG=$(git describe --abbrev=0 --tags)
 		echo "CONFIG_TARGET_VERSION=\"${GIT_TAG}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${GIT_TAG}\"" >> .config
+		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
 		# Enable Pckage source tree override if selected
 		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
@@ -355,16 +433,10 @@ function genconfig {
 			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
 			[ $bcmAllowed -eq 0 ] && echo "CONFIG_BCM_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_BCM_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" ]
@@ -373,14 +445,14 @@ function genconfig {
 		fi
 
 		# Force regeneration of themes
-		touch package/feeds/juci/juci/Makefile
+		touch package/feeds/iopsys/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 inteno boardid name
+		# currently boardparms.c and boardparms_voice.c is the only place that is depending on 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
 
@@ -417,6 +489,7 @@ 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;;

iop/scripts/genconfig_min.sh

@@ -0,0 +1,457 @@
+#!/bin/bash
+
+function genconfig_min {
+	export CLEAN=0
+	export SRCTREEOVERR=0
+	export FILEDIR="files/"
+	CURRENT_CONFIG_FILE=".current_config_file"
+	export CONFIGPATH="package/feeds/iopsys/iop"
+	CUSTPATH="customerconfigs"
+	export CUSTCONF="customerconfigs/customers"
+	export VERBOSE=0
+	#always use the mirror
+	export DEVELOPER=0
+	target="bogus"
+	config_path=""
+	bcm27xx="target/linux/iopsys-bcm27xx"
+	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
+	ramips="target/linux/iopsys-ramips"
+	intel_mips="target/linux/intel_mips"
+	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
+	}
+
+	# Takes a board name and returns the target name in global var $target
+	set_target() {
+	    local profile=$1
+
+		[ -n "$profile" ] || return
+
+		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 '-' '_')"
+				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 $intel_mips/genconfig ] &&
+			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
+		[ -e $x86/genconfig ] &&
+			iopsys_x86=$(cd $x86; ./genconfig)
+		[ -e $armvirt/genconfig ] &&
+			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $bcm27xx/genconfig ] &&
+			iopsys_bcm27xx=$(cd $bcm27xx; ./genconfig)
+
+	    if [ "$profile" == "LIST" ]; then
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
+				echo "$list based boards:"
+				for b in ${!list}; do
+					echo -e "\t$b"
+				done
+			done
+			return
+	    fi
+
+	    for p in $iopsys_brcm63xx_arm; do
+		if [ $p == $profile ]; then
+		    target="iopsys_brcm63xx_arm"
+			config_path="$brcm63xx_arm/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_ramips; do
+		if [ $p == $profile ]; then
+		    target="iopsys_ramips"
+			config_path="$ramips/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_intel_mips; do
+		if [ $p == $profile ]; then
+		    target="intel_mips"
+			config_path="$intel_mips/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_x86; do
+		if [ $p == $profile ]; then
+		    target="iopsys_x86"
+			config_path="$x86/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_armvirt; do
+		if [ $p == $profile ]; then
+		    target="iopsys_armvirt"
+			config_path="$armvirt/config"
+		    return
+		fi
+	    done
+
+	    for p in $iopsys_bcm27xx; do
+		if [ $p == $profile ]; then
+		    target="iopsys_bcm27xx"
+		        config_path="$bcm27xx/config"
+		    return
+		fi
+	    done
+
+	}
+
+	git remote -v | grep -q http || {
+		DEVELOPER=1
+
+		bcmAllowed=0
+		endptAllowed=0
+
+		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
+		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
+	}
+
+	v() {
+		[ "$VERBOSE" -ge 1 ] && echo "$@"
+	}
+
+	usage() {
+		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 "  -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 "  -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
+		echo "Example ./iop genconfig dg400prime IOPSYS"
+		echo
+		exit 0
+	}
+
+	list_customers()
+	{
+		local ALL="$1"
+		local CUSTOMER="$2"
+		if [ "$CUSTOMER" -a -d "$CUSTCONF/$CUSTOMER" ]; then
+			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common )"
+			if [ "$boards" ]; then
+				echo "$CUSTOMER has following boards:"
+				for board in $boards; do
+					echo -e "\t$board"
+				done
+			else
+				echo "No boards found for $CUSTOMER"
+			fi
+		elif [ "$CUSTOMER" ]; then
+			echo "No customer called $CUSTOMER"
+			exit 1
+		elif [ -d $CUSTCONF ]; then
+			local customers="$(ls -1 $CUSTCONF)"
+			if [ "$customers" -a "$ALL" == 1 ]; then
+				for customer in $customers; do
+					echo $customer
+					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common )"
+					if [ "$boards" ]; then
+						for board in $boards; do
+							echo -e "\t$board"
+						done
+					else
+						echo "has no boards"
+					fi
+				done
+			elif [ "$customers" ]; then
+				echo -e "$customers"
+			else
+				echo "no customers found"
+			fi
+		else
+			echo "No $CUSTCONF folder found"
+		fi
+		exit 0
+	}
+
+
+	generate_config()
+	{
+	DIFFFILE="$1"
+	MASTERFILE="$2"
+	while read p; do
+		v "$p"
+		sed -r -i "$p" $MASTERFILE
+	done < $DIFFFILE
+	}
+
+	setup_dirs()
+	{
+
+		if [ ! -d "$FILEDIR" ]; then
+			mkdir -p $FILEDIR
+		elif [ -d "$FILEDIR" -a $CLEAN -eq 1 ]; then
+			v "rm -rf $FILEDIR*"
+			rm -rf $FILEDIR*
+		fi
+	}
+
+	create_and_copy_files()
+	{
+		local BOARDTYPE=$1
+		shift
+		local CUSTOMERS=$@
+
+		# Validate seleced board and customers
+		set_target $BOARDTYPE
+		if [ $target == "bogus" ]; then
+			echo "Hardware profile does not exist"
+			exit 1
+		elif [ -n "$CUSTOMERS" ]; then
+			for CUSTOMER in $CUSTOMERS; do
+				if [ ! -d "$CUSTCONF/$CUSTOMER/" ]; then
+					echo "Customer profile for '$CUSTOMER' does not exist"
+					exit 1
+				elif [ ! -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/" ]; then
+					echo "'$BOARDTYPE' board profile does not exist for customer '$CUSTOMER'"
+					if [ -f "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
+						echo "Common profile configuration will be used"
+					else
+						exit 1
+					fi
+				fi
+			done
+		fi
+
+		# Generate base config
+		rm -f .config
+		v "Config $BOARDTYPE selected"
+		v "cp $CONFIGPATH/config .config"
+		cp $CONFIGPATH/config .config
+
+		if [ -f $config_path/config ]; then
+		    cat $config_path/config >> .config
+		fi
+		if [ -f $config_path/$BOARDTYPE/config ]; then
+		    cat $config_path/$BOARDTYPE/config >> .config
+		fi
+
+		#special handling for intel_mips/iopsys_ramips 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
+		elif [ "$target" = "iopsys_ramips" ]; then
+			subtarget="mt7621"
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
+		elif [ "$target" = "iopsys_bcm27xx" ]; then
+			subtarget="iopsys_bcm2711"
+                        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_${BOARDTYPE}=y" >> .config
+		else
+			echo "CONFIG_TARGET_${target}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
+		fi
+
+		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
+
+		# Add customerconfig diff if a customer is selected
+		if [ -n "$CUSTOMERS" ]; then
+			for CUSTOMER in $CUSTOMERS; do
+				if [ -d "$CUSTCONF/$CUSTOMER/common/fs" ]; then
+					v "cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR"
+					cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR
+				fi
+				if [ -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/fs" ]; then
+					v "cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR"
+					cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR
+				fi
+				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
+					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
+					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
+				fi
+				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
+					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
+					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
+				fi
+			done
+		fi
+
+		# Set target version
+		local GIT_TAG=$(git describe --abbrev=0 --tags)
+		echo "CONFIG_TARGET_VERSION=\"${GIT_TAG}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${GIT_TAG}\"" >> .config
+		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
+
+
+		# Enable Package source tree override if selected
+		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
+
+		# developer mode selected ?
+		echo "CONFIG_DEVEL=y" >>.config
+
+		if [ -n "$BRCM_MAX_JOBS" ]
+		then
+		    echo "CONFIG_BRCM_MAX_JOBS=\"1\"" >>.config
+		fi
+
+		# 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
+		# so just touch that file.
+		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
+
+		# Store generated config
+		cp .config .genconfig.config
+
+		# Set default values based on selected parameters
+		v "$(make defconfig 2>&1)"
+
+		echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
+
+		# Clean base-file package to force rebuild when changing profile
+		v "$(make package/base-files/clean 2>&1)"
+
+		verify_config
+	}
+
+	####### main #####
+	if [ ! -e tmp/.iop_bootstrap ]; then
+		echo "You have not installed feeds. Running genconfig in this state would create a non functional configuration."
+		echo "Run: iop feeds_update"
+		exit 0
+	fi
+
+	if [ $# -eq 0 ]; then
+		echo Current profile:
+		cat $CURRENT_CONFIG_FILE
+		echo "Try ./iop genconfig -h' to get instructions if you want to change current config"
+		exit 0
+	else
+		while [ -n "$1" ]; do
+			case "$1" in
+
+			-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;;
+			-b|--boards)set_target LIST;exit 0;;
+			-*)
+				echo "Invalid option: $1 "
+				echo "Try -h or --help for more information."
+				exit 1
+				;;
+			*) break;;
+			esac
+			shift;
+		done
+
+		setup_dirs
+		create_and_copy_files "$@"
+	fi
+}
+
+register_command "genconfig_min" "Generate configuration for customer with manual board configuration"

iop/scripts/generate_tarballs.sh

@@ -1,40 +1,32 @@
 #!/bin/bash
-
+# shellcheck disable=SC2029
 
 build_bcmkernel_consumer() {
-	local tarfile bcmkernelcommith sdkversion
-	sdkversion=$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')
-	sdkversion=${sdkversion:0:4}${sdkversion:(-1)}
-	bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/broadcom/bcmkernel/${sdkversion:0:5}*.mk | cut -d'=' -f2)
-	# do not build bcmopen sdk if it was already built before
-	[ -n "$board" -a -n "$bcmkernelcommith" ] || return
-	ssh $SERVER "test -f $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz" && return
-	cd ./build_dir/target-*/bcmkernel-*-${sdkversion:0:4}*/bcm963xx/release
-	bash do_consumer_release -p $profile -y -F
-	tarfile='out/bcm963xx_*_consumer.tar.gz'
-	[ $(ls -1 $tarfile |wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
-	scp -pv $tarfile $SERVER:$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz
-	ssh $SERVER "[ -f $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz ] && ln -sf $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz $FPATH/bcmopen-$board-$majver.$minver-latest"
-	rm -f $tarfile
-	cd "$curdir"
-}
+	local tarfile bcmkernelcommith sdkversion serverpath serverlink
+
+	sdkversion="$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')"
+	sdkversion="${sdkversion:0:4}${sdkversion:(-1)}"
+	bcmkernelcommith="$(grep -w "PKG_SOURCE_VERSION:" "$curdir/feeds/broadcom/bcmkernel/${sdkversion:0:5}"*".mk" | cut -d'=' -f2)"
+
+	[ -n "$board" ] && [ -n "$bcmkernelcommith" ] || return
+
+	serverpath="$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz"
+	serverlink="$FPATH/bcmopen-$board-$majver.$minver-latest"
+
+	# do not build bcmopen sdk if it was already built before
+	# if it was, check if there's a symlink in place and create it if missing
+	ssh "$SERVER" "test -f '$serverpath' && { test -L '$serverlink' || ln -sf '$serverpath' '$serverlink'; }" && return
+
+	cd "./build_dir/target-"*"/bcmkernel-"*"-${sdkversion:0:4}"*"/bcm963xx/release"
+	bash do_consumer_release -p "$profile" -y -F
+
+	tarfile='out/bcm963xx_*_consumer.tar.gz'
+	[ $(ls -1 $tarfile | wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
+
+	scp -pv $tarfile "$SERVER":"$serverpath"
+	ssh "$SERVER" "test -f '$serverpath' && ln -sf '$serverpath' '$serverlink'"
+	rm -f $tarfile
 
-build_natalie_consumer() {
-	# create natalie-dect open version tar file
-	local natalieversion nataliecommith
-	grep -q "CONFIG_TARGET_NO_DECT=y" .config && return
-	natalieversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
-	nataliecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
-	[ -n "$profile" -a -n "$natalieversion" -a -n "$nataliecommith" ] || return
-	ssh $SERVER "test -f $FPATH/natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz" && return
-	cd ./build_dir/target-*/natalie-dect-$natalieversion/
-	mkdir natalie-dect-open-$natalieversion
-	cp -f ipkg-*/natalie-dect/lib/modules/*/extra/dect.ko natalie-dect-open-$natalieversion/dect.ko
-	tar -czv  natalie-dect-open-$natalieversion/ -f natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz
-	scp -pv natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $SERVER:$FPATH/
-	cp natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $curdir/
-	rm -rf natalie-dect-open-$natalieversion
-	rm -f natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz
 	cd "$curdir"
 }
 
@@ -44,7 +36,7 @@ build_endptmngr_consumer() {
 	grep -q "CONFIG_TARGET_NO_VOICE=y" .config && return
 	endptversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
 	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
-	[ -n "$profile" -a -n "$endptversion" -a -n "$endptcommith" ] || return
+	[ -n "$profile" ] && [ -n "$endptversion" ] && [ -n "$endptcommith" ] || return
 	ssh $SERVER "test -f $FPATH/endptmngr-$profile-$endptversion-$endptcommith.tar.gz" && return
 	cd ./build_dir/target-*/endptmngr-$endptversion/
 	mkdir endptmngr-open-$endptversion
@@ -59,52 +51,6 @@ build_endptmngr_consumer() {
 	cd "$curdir"
 }
 
-build_wifilife_consumer() {
-	local ver commit
-	ver=$(grep -w "PKG_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
-	commit=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
-	[ -n "$ver" -a -n "$commit" ] || return
-	ssh $SERVER "test -f $FPATH/wifilife-$target-${ver}_${commit}.tar.xz" && return
-	cd ./build_dir/target-*/wifilife-$ver/ipkg-* || cd ./build_dir/target-mips*musl-*/wifilife-$ver/ipkg-*
-	mkdir -p wifilife-$ver/src
-	cp -rf wifilife/usr/sbin/* wifilife-$ver/src/
-	tar Jcf wifilife-${target}-${ver}_${commit}.tar.xz wifilife-$ver
-	scp -pv wifilife-$target-${ver}_${commit}.tar.xz $SERVER:$FPATH/
-	cp wifilife-${target}-${ver}_${commit}.tar.xz $curdir/
-	rm -rf wifilife-$ver
-	rm -f wifilife-${target}-${ver}_${commit}.tar.xz
-	cd "$curdir"
-}
-
-build_mediatek_kernel() {
-	local mediatek_commit kernel_version kernel
-
-	mediatek_commit=$(grep CONFIG_KERNEL_GIT_COMMIT .config | cut -d '=' -f2 | tr -d '"')
-	kernel_version=$(grep KERNEL_PATCHVER target/linux/iopsys-ramips/Makefile  | cut -d '=' -f2)
-	kernel=linux-${kernel_version}.*
-	[ -n "$mediatek_commit" ] || return
-	ssh $SERVER "test -f $FPATH/mediatek-kernel-open-$mediatek_commit.tar.gz" && return
-	echo "Building mediatek kernel tarball from kernel commit:"	
-	echo $mediatek_commit
-	cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips*/$kernel
-
-	# Save Kconfig files to recreate the same kernel config,
-	# delete everyting else.
-	find drivers/net/wireless/mt_wifi -type f ! -name Kconfig | xargs rm
-	find drivers/net/wireless/rlt_wifi -type f ! -name Kconfig | xargs rm
-
-	# remove git repo
-	rm -rf .git
-
-	# patch kernel for openstk
-	ls consumer_release | while read line; do patch -p1 < consumer_release/$line; done
-	cd ..
-
-	tar -czv $kernel -f mediatek-kernel-open-$mediatek_commit.tar.gz
-	scp -pv mediatek-kernel-open-$mediatek_commit.tar.gz $SERVER:$FPATH/
-	cd "$curdir"
-}
-
 function print_usage {
 	echo "Usage: $0 generate_tarballs"
 	echo "  -t <target>"
@@ -118,8 +64,7 @@ function generate_tarballs {
     set -e
     git remote -v | grep -q http && return # do not continue if this is an open SDK environment
 
-    target=$(grep CONFIG_TARGET_BOARD .config | cut -d'=' -f2 | tr -d '"')
-    board=$(grep CONFIG_TARGET_IBOARDID .config | cut -d'=' -f2 | tr -d '"')
+    board=$(grep CONFIG_TARGET_FAMILY .config | cut -d'=' -f2 | tr -d '"')
     profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
     majver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f1 -d .)
     minver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f2 -d .)
@@ -143,19 +88,14 @@ function generate_tarballs {
 		esac
 	done
 
-	if [ ! -n "$stk_target" ]; then
+	if [ -z "$stk_target" ]; then
 		print_usage
 		exit 1
 	fi
 
 	if [ "$stk_target" == "broadcom" ]; then
 		build_bcmkernel_consumer
-		build_natalie_consumer
 		build_endptmngr_consumer
-		build_wifilife_consumer
-	elif [ "$stk_target" == "mediatek" ]; then
-		build_mediatek_kernel
-		build_wifilife_consumer
 	else
 		echo "Invalid target: $stk_target"
 		print_usage

iop/scripts/install_key.sh

@@ -9,8 +9,7 @@ function install_key {
 
     echo "::sysinit:/etc/init.d/rcS S boot" >files/etc/inittab
     echo "::shutdown:/etc/init.d/rcS K shutdown" >>files/etc/inittab
-    echo "tty/0::askfirst:/bin/ash --login" >>files/etc/inittab
-    echo "console::askfirst:/bin/cttyhack /bin/ash --login" >>files/etc/inittab
+    echo "console::askconsolelate:/bin/cttyhack /bin/ash --login" >>files/etc/inittab
 
     echo Done
 }

iop/scripts/iopupgrade.sh

@@ -230,7 +230,7 @@ function ssh_upgrade {
     upd_fw_base=""
     upd_fw=""
     upd_host="192.168.1.1"
-    upd_sysupgrade=0
+    upd_sysupgrade=1
     do_dialog=0
 
     while getopts "f:hnxt:iscb" opt; do
@@ -280,6 +280,14 @@ function ssh_upgrade {
 	set_config_string CONFIG_TARGET_BOARD
 	firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t *[0-9].y[3])
 
+	# if target uses pkgtb
+	if [ -z "$firmwares"]
+	then
+	    # pkgtb files can not be streamed so copy over the file witch scp
+	    use_scp=1
+	    firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t last.pkgtb)
+	fi
+
 	for upd_fw_base in $firmwares
 	do
 	    #echo "firmware $upd_fw"
@@ -313,10 +321,20 @@ function ssh_upgrade {
 	[ $upd_forceboot  -eq 1 ] && extra_args="$extra_args -b"
 
 	file_size_kb=`du -k "$upd_fw" | cut -f1`
-	cat $upd_fw | pv -s ${file_size_kb}k | ssh root@$upd_host "iopu $extra_args"
+	if [ "$use_scp" == "1" ]
+	then
+	    scp $upd_fw root@$upd_host:/tmp/ &&
+		ssh -o ConnectTimeout=60 root@$upd_host "iopu $extra_arg -f /tmp/$upd_fw_base"
+	else
+	    cat $upd_fw | pv -s ${file_size_kb}k | ssh root@$upd_host "iopu $extra_args"
+	fi
     else
+	extra_args=""
+	[ $upd_noreboot   -eq 1 ] && extra_args="$extra_args -d"
+	[ $upd_keepconf   -eq 0 ] && extra_args="$extra_args -n"
+
 	scp $upd_fw root@$upd_host:/tmp/ &&
-	    ssh -o ConnectTimeout=60 root@$upd_host "sysupgrade -v $3 /tmp/$upd_fw_base" &&
+	    ssh -o ConnectTimeout=60 root@$upd_host "sysupgrade -v $extra_args /tmp/$upd_fw_base" &&
 	    echo "sysupgrade done!"
     fi
 }

iop/scripts/licenses_gen.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+function license_report {
+    LICDIR="/tmp/licenses-generator/"
+    LICBIN="${LICDIR}/bin"
+
+
+    dpkg -s python3 python3-requests python3-yaml python3-mako python3-six &> /dev/null
+    if [ $? -ne 0 ]
+        then
+            echo "Missing dependencies"
+            sudo apt-get update
+            sudo apt-get install python3 python3-requests python3-yaml python3-mako python3-six
+
+        else
+            echo    "Dependecy check passed"
+    fi
+
+
+if [ -d "$LICDIR" ]; then
+  ### Take action if $DIR exists ###
+  echo "Creating json licences file and html formated report"
+else
+  ###  Control will jump here if $DIR does NOT exists ###
+  echo "Error: licenses-generator not found. getting from iopsys repo"
+  git clone git@dev.iopsys.eu:iopsys/licenses-generator.git $LICDIR
+fi
+  LICGET=`${LICBIN}/licenses-generator  gen-License bin/`
+  echo $LICGET
+  ${LICBIN}/licenses-generator gen-licrprt $LICGET
+exit 0
+
+}
+
+
+register_command "license_report" "Generate a Licence report on latest build in json format and html under reports"

iop/scripts/scp_changes.sh

@@ -1,70 +0,0 @@
-# this is a developer helper script to SCP changed files to remote host
-
-ROOT=build_dir/target-mips_uClibc-0.9.33.2/root-iopsys-brcm63xx-mips/
-ROOT_OLD=tmp/root_old/
-ROOT_TMP=tmp/root_tmp/
-
-function scp_changes_reset {
-	{ cd `dirname $0`
-		rm -rf "$ROOT_OLD"
-		mkdir -p "$ROOT_OLD"
-		cp -a "$ROOT"* "$ROOT_OLD"
-	}
-}
-
-function scp_changes {
-	if [ -z "$1" ] ; then
-		echo "usage: $0 scp_changes <host/-r(eset)/-p(retend)>"
-		echo "Error: host required"
-		exit 1
-	fi
-	{ cd `dirname $0`
-		if [ ! -d $ROOT ]; then
-			echo "$ROOT does not exist"
-			echo "please build the project first"
-			exit 1;
-		fi
-		if [ "$1" = "-r" ]; then
-			echo "reset changes"
-			scp_changes_reset
-			exit 0
-		fi
-		if [ ! -d $ROOT_OLD ]; then
-			echo "$ROOT_OLD does not exist"
-			echo "you didn't store state of previous buildroot"
-			#echo "please run ./scp_changes_reset.sh"
-			echo "doing it now"
-			scp_changes_reset
-			exit 1;
-		fi
-		FILES=`diff -rq "$ROOT" "$ROOT_OLD" 2>&1 | sed -ne "s?^Files .* and $ROOT_OLD\\(.*\\) differ?\\1?p" -ne "s?^Only in $ROOT\\(.*\\): \\(.*\\)?\\1/\\2?p"`
-		if [ "$1" = "-p" ]; then
-			echo "files that would be copied:"
-			echo $FILES
-			exit 0
-		fi
-		for f in $FILES
-		do
-			mkdir -p "$ROOT_TMP`dirname $f`"
-			cp -af "$ROOT$f" "$ROOT_TMP$f"
-		done
-		if [ -d "$ROOT_TMP" ]; then
-			echo "scp changed files to $1"
-			pushd "$ROOT_TMP" 2>&1 >/dev/null
-			scp -r * root@$1:/
-			RETVAL=$?
-			popd 2>&1 >/dev/null
-			rm -rf "$ROOT_TMP"
-			if [ "$RETVAL" -eq 0 ]; then
-				scp_changes_reset
-			else
-				echo "scp error"
-				exit $RETVAL
-			fi
-		else
-			echo "no change"
-		fi
-	}
-}
-
-register_command "scp_changes" "<host/-r(eset)/-p(retend)>  SCP only changed files to device"

iop/scripts/taas.sh

@@ -0,0 +1,95 @@
+
+# Shorthand command for doing a HIL runtime smoketest on the
+# latest built image. Does the image boot up correctly?
+# More info here:
+# https://dev.iopsys.eu/iopsys/iopsys-taas
+
+
+#--------------------------------------------------------------
+function taas-init() {
+	local f
+
+	# Path to TaaS binarys. Try some likely ones.
+	if ! which taas-smoketest >/dev/null; then
+		PATH="${PATH}:${PWD}/../iopsys-taas/bin"
+		PATH="${PATH}:${PWD}/../taas/bin"
+		PATH="${PATH}:${HOME}/iopsys-taas/bin"
+		PATH="${PATH}:${HOME}/taas/bin"
+		PATH="${PATH}:${HOME}/bin"
+		PATH="${PATH}:/opt/iopsys-taas/bin"
+		PATH="${PATH}:/opt/taas/bin"
+	fi
+
+	if ! which taas-smoketest >/dev/null; then
+		echo "Error; TaaS is missing! Install it with:"
+		echo "git clone git@dev.iopsys.eu:iopsys/iopsys-taas.git ../iopsys-taas"
+		exit 1
+	fi
+
+	# NAND erase block size.
+	nandBlkSz=$(grep CONFIG_TARGET_NAND_BLOCKSZ .config | \
+		tr -s "=\"" " " | cut -d " " -f 2)
+	nandBlkSz=$((nandBlkSz / 1024))
+
+	# Create a list of all images which might be of use.
+	for f in ${PWD}/bin/targets/iopsys-*/generic/last.* \
+			${PWD}/build_dir/target-arm*/bcmkernel/bcm963xx/targets/9*/bcm*_linux_raw_image_${nandBlkSz}.bin; do
+		[[ -s "$f" ]] && images+=("$f")
+	done
+
+	# Convert Iopsys target name to the TaaS product name format
+	# according to what is available in the remote lab for HIL.
+	# Also find a suitable image.
+	product=$(grep CONFIG_TARGET_PROFILE .config | \
+		tr -s "=\"" " " | cut -d " " -f 2) || exit
+	case "$product" in
+		smarthub3)
+			export product="SmartHub3a"
+			;;
+		dg400prime|eg400|ex600)
+			export product=$(echo -n "$product" | tr [[:lower:]] [[:upper:]])
+			;;
+		*)
+			echo "Unsupported target; skipping!"
+			exit 0
+			;;
+	esac
+
+	if [[ ${#images[@]} -eq 0 ]]; then
+		echo "No image found"
+		exit 1
+	fi
+}
+
+
+
+#--------------------------------------------------------------
+function taas-smoketest {
+	declare -a images
+
+	taas-init || return
+	echo "Testing a $product with ${images[@]}..."
+	command taas-smoketest "${images[@]}" "$product" "$@"
+}
+
+
+
+#--------------------------------------------------------------
+function taas-bootstrap {
+	declare -a images
+
+	if [[ -n "$1" ]]; then
+		taas-init || return
+		echo "Flashing $1..."
+		command taas-bootstrap "${images[@]}" "$@"
+	else
+		echo "Usage: ./iop taas-bootstrap dutX"
+		exit 1
+	fi
+}
+
+
+
+register_command "taas-bootstrap" "Write image to a remote lab device."
+register_command "taas-smoketest" "Write image to a remote lab device and test it."
+

iopupgrade/Makefile

@@ -17,6 +17,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopupgrade
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 

iopupgrade/files/sbin/iopu

@@ -25,6 +25,7 @@ log_stdout=1		# set to 0 to prevent the log to also print to stdout
 upd_noreboot=0		# set to 1 if we should not reboot after programming
 upd_forceimage=0	# set this to force upgrade even if image is for wrong board.
 upd_forceboot=0		# set this to force upgrade of boot loader
+upd_keepconfig=0	# set this to keep the current configuration.
 ###############################################################################
 # import external functions
 source /lib/upgrade/iopsys.sh
@@ -51,25 +52,41 @@ function log {
 # anyhting it calls as stdout/stderr might no longer exist
 function finish {
 
-    if [ "$run_cleanup" == "1" ]
+    if [ $run_cleanup -eq 1 ]
     then
 
 	function_call upd_cleanup
+	run_cleanup=0
 	log ""
     fi
 
-    if [ "$run_mount_cleanup" == "1" ]
+    if [ $run_mount_cleanup -eq 1 ]
     then
 	log "Cleaning up after mount"
 	umount_newroot
     fi
     # always kill the timeout process, will leave the sleep but that is harmless
     # as long as the kill will nerver be run.
-    kill $TIMEOUT_PID 2>/dev/null
+    if [ -n "$TIMEOUT_PID" ]; then
+        kill $TIMEOUT_PID 2>/dev/null
+        TIMEOUT_PID=""
+    fi
 
     lock -u /tmp/iopu.lock
 }
 
+function ctrl_c {
+
+    # on ctrl-c we remove the exit handler as it is called directly.
+    trap - EXIT
+
+    # call cleanup function
+    finish
+
+    # do not continue program
+    exit 1
+}
+
 function sig_pipe {
     log_stdout=0  # stdin,stdout,stderr do not exist anymore
     log "Got sigpipe. Turning of log printing to stdout"
@@ -77,7 +94,6 @@ function sig_pipe {
 
 # if a timout happens terminate
 function timeout {
-    finish
     exit 1
 }
 
@@ -133,6 +149,7 @@ function umount_newroot {
     umount /tmp/newroot_overlay/rom
     umount /tmp/newroot_overlay
     umount /tmp/newroot
+    rmdir /tmp/newroot_overlay /tmp/newroot
     run_mount_cleanup=0
 }
 
@@ -141,11 +158,82 @@ function usage {
     echo ""
     echo "opts:"
     echo ""
-    echo "	-n	Do not do the final reboot of the target board"
-    echo "	-c	Keep configuration"
-    echo "	-x	Force install even if firmware is not for this board"
-    echo "	-b	Force install of bootloader regardless of version installed"
-    echo "	-r	Jump into chroot env of other system"
+    echo "	-n		Do not do the final reboot of the target board"
+    echo "	-c		Keep configuration"
+    echo "	-x		Force install even if firmware is not for this board"
+    echo "	-b		Force install of bootloader regardless of version installed"
+    echo "	-r		Jump into chroot env of other system"
+    echo "	-f		Firmware file to use"
+    echo "	-C \"command\"	Execute command in chroot env of other system"
+}
+
+# Execute command in newroot(other system root)
+function newroot_exec {
+
+    upd_vol=$(get_flashbank_next)
+    mount_newroot
+    (ENV=/sbin/iopu_chroot_env chroot /tmp/newroot_overlay "$@")
+    echo ""
+    umount_newroot
+
+}
+
+function system_is_y_image {
+
+    # find out what rootfs volume is active.
+    cur_vol=$(get_flashbank_current)
+    upd_vol=$(get_flashbank_next)
+
+    # convert volume name "rootfs_$upd_vol" into ubi volume id
+    upd_ubi_id=$(ubinfo -d 0 -N rootfs_$upd_vol | awk "/Volume ID:/ {print \$3}")
+    log "installing Root Fileystem into UBI volume rootfs_$upd_vol"
+
+    # prepare to match dsl.
+    function_call upd_conf_dsl
+
+    log "now starting writing data to flash with [ iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id ]"
+    run_cleanup=1	# When we start to actually write data there might be some
+                        # things that need cleanup if we get an error/crash
+    if ! iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id; then
+	log "iopupgrade program Failed"
+	exit 1
+    fi
+
+    log "Firmware programmed to flash."
+
+    # Force upgrade of boot loader
+    [ $upd_forceboot -eq 1 ] && chroot_cmdline="$chroot_cmdline -b"
+
+    if [ $upd_keepconfig -eq 1 ]; then
+	log "Transfering configuration to new system."
+	chroot_cmdline="$chroot_cmdline -c"
+    fi
+
+    mount_newroot
+    if ! chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline; then
+	log "Configuration migration failed!"
+	exit 1
+    fi
+    umount_newroot
+
+    log "New firmware fully installed."
+    run_cleanup=0
+
+
+    # Now make sure that we actually boot the new system on the next reboot
+    upd_finnish
+
+}
+
+function system_is_FIT_image {
+
+    # prepare to match dsl.
+    #function_call upd_conf_dsl
+
+    #here we write data 
+    bcm_flasher $firmware_file
+    bcm_bootstate 1
+    log "Firmware programmed to flash."
 }
 
 ###############################################################################
@@ -161,10 +249,11 @@ then
 fi
 
 trap finish EXIT
+trap ctrl_c INT
 trap timeout SIGALRM
 trap sig_pipe SIGPIPE
 
-while getopts "nrxbh" opt; do
+while getopts "nrxbhcC:f:" opt; do
     case $opt in
 	n)
 	    upd_noreboot=1
@@ -175,13 +264,19 @@ while getopts "nrxbh" opt; do
 	b)
 	    upd_forceboot=1
 	    ;;
+	c)
+	    upd_keepconfig=1
+	    ;;
 	r)
-	    upd_vol=$(get_flashbank_next)
-	    mount_newroot
-	    (ENV=/sbin/iopu_chroot_env chroot /tmp/newroot_overlay /bin/sh)
-	    echo ""
-	    umount_newroot
-	    exit 0
+	    newroot_exec /bin/sh
+	    exit
+	    ;;
+	C)
+	    newroot_exec "${OPTARG}"
+	    exit
+	    ;;
+	f)
+	    firmware_file="${OPTARG}"
 	    ;;
 	h)
 	    usage
@@ -193,8 +288,7 @@ done
 # put a timeout on this if it takes longer than 120 seconds we should abort
 # and clean up
 (
-sleep 120	# if 2 minutes pass
-kill -ALRM $$	2>/dev/null # send it a SIGALRM signal
+	sleep 120 && kill -ALRM $$ 2>/dev/null		# send it a SIGALRM signal
 )&
 TIMEOUT_PID=$!
 
@@ -203,56 +297,18 @@ log "Firmware upgrade started"
 # Should board name be checked
 if [ $upd_forceimage -eq 0 ]
 then
-   board=$(db get hw.board.iopVerBoard)
+   board=$(db get hw.board.model_name)
    cmdline_match="board=$board"
 fi
 
-# find out what rootfs volume is active. 
-cur_vol=$(get_flashbank_current)
-upd_vol=$(get_flashbank_next)
-
-# convert volume name "rootfs_$upd_vol" into ubifs volume id
-upd_ubi_id=$(ubinfo -d 0 -N rootfs_$upd_vol | awk "/Volume ID:/ {print \$3}")
-log "installing Root Fileystem into UBI volume rootfs_$upd_vol"
-
-# prepare to match dsl.
-function_call upd_conf_dsl
-
-# prepare to update CFE if it exists
-function_call upd_conf_cfe
-
-# prepare to update kernel if it is stored in MTD/JFFS2 
-function_call upd_conf_kernel
-
-log "now starting writing data to flash with [ iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id ]"
-run_cleanup=1	# When we start to actually write data there might be some
-		# things that need cleanup if we get an error/crash
-iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id
-
-# in case of any error we abort
-if [ $? -ne 0 ]; then
-    log "iopupgrade program Failed"
-    exit 1
+# BUG: should probably read a config file.
+if [ -f /proc/nvram/boardid ]
+then
+    system_is_FIT_image
+else
+    system_is_y_image
 fi
 
-log "Firmware programmed to flash."
-
-
-log "Transfering configuration to new system."
-
-# Force upgrade of boot loader
-[ $upd_forceboot -eq 1 ] && chroot_cmdline="$chroot_cmdline -b"
-
-mount_newroot
-chroot /tmp/newroot_overlay /sbin/iopu_chroot $chroot_cmdline
-umount_newroot
-
-log "Update fully installed."
-run_cleanup=0
-
-# Now make sure that we actually boot the new system on the next reboot
-upd_finnish
-
 # spawn the reboot to a subshell to allow the main program to quit before reset
 # to avoid any hanged network connection like ssh
 if [ $upd_noreboot -eq 0 ]
@@ -271,8 +327,3 @@ else
 fi
 
 
-
-
-
-
-

iopupgrade/files/sbin/iopu_chroot

@@ -14,6 +14,7 @@
 # by functions declared in this script
 upd_forceboot=0
 log_stdout=1		# set to 0 to prevent the log to also print to stdout
+upd_keepconfig=0	# set this to keep the current configuration.
 
 ###############################################################################
 # import external functions
@@ -24,33 +25,36 @@ source /lib/upgrade/iopsys.sh
 
 # only call function if it exists
 function_call() {
-    if type "$1" 2>/dev/null >/dev/null
-    then
-	$1 $@
-    fi
+	if [ -n "$1" ] && type "$1" 2>/dev/null >/dev/null
+	then
+		$1 "$@" || exit
+	fi
 }
 # Cleanup and error handling functions.
 function log {
-    TIME=$(date)
-    [ $log_stdout -eq 1 ] && echo "$@"
-    echo "[$TIME] $@" >>/root/upd_log
+	TIME=$(date)
+	[ $log_stdout -eq 1 ] && echo "$@"
+	echo "[$TIME] $@" >>/root/upd_log
 }
 
 
-while getopts "hb" opt; do
-    case $opt in
-	h)
-	    upd_usage
-	    exit 1
-	    ;;
-	b)
-	    upd_forceboot=1
-	    ;;
-	\?)
-	    echo "Invalid option: -$OPTARG" >&2
-	    exit 1
-	    ;;
-    esac
+while getopts "hbc" opt; do
+	case $opt in
+		h)
+			upd_usage
+			exit 1
+			;;
+		c)
+			upd_keepconfig=1
+			;;
+		b)
+			upd_forceboot=1
+			;;
+		\?)
+			echo "Invalid option: -$OPTARG" >&2
+			exit 1
+			;;
+	esac
 done
 
 # copy old install log over
@@ -59,3 +63,9 @@ cp /tmp/oldroot/tmp/upd_log /root/upd_log
 # Upgrade boot loader if needed.
 function_call upd_program_boot
 
+# Let the new upgrade do whatever it needs,
+# such as configuration migration etc.
+if [ $upd_keepconfig -eq 1 -a -x /lib/upgrade/post-rootfs-fixup ]; then
+	(/lib/upgrade/post-rootfs-fixup /dev/null /tmp/oldroot) || exit
+fi
+

iup/Makefile

@@ -1,36 +0,0 @@
-#
-# Copyright (C) 2006-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=iup
-PKG_VERSION:=0.0.1
-PKG_RELEASE:=0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/iup
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=iup client
-  DEPENDS:=+libuci +uci +busybox
-endef
-
-define Package/iup/description
-	This package contains Inteno's IUP Client
-endef
-
-define Build/Compile
-	true
-endef
-
-define Package/iup/install
-	$(INSTALL_DIR) $(1)/sbin
-	cp -r ./files/*  $(1)/
-endef
-
-$(eval $(call BuildPackage,iup))

iup/files/etc/config/provisioning

@@ -1,17 +0,0 @@
-package 'provisioning'
-
-config 'general' 'polling'
-        option 'enabled' 'on'
-        option 'starttime' '03'
-        option 'interval' 'daily'
-
-config 'server' 'configserver'
-        option enabled 'off'
-
-
-config 'server' 'iup'
-        option 'enabled' 'on'
-
-config software 'uppgradeserver'
-        option enabled 'off'
-                              

iup/files/etc/init.d/iup

@@ -1,133 +0,0 @@
-#!/bin/sh /etc/rc.common
-# iup at boot
-# Copyright (C) 2007 OpenWrt.org
-
-START=98
-STOP=15
-USE_PROCD=1
-
-. /lib/functions.sh
-
-include /lib/network
-
-CRONPATH="/etc/crontabs/root"
-RANGE=60
-
-management_interfaces() {
-	local DHCP_IFACES=""
-
-	is_notbridged_dhcp() {
-		local config="$1"
-		local proto="$(uci -q get network.$config.proto)"
-		local typ="$(uci -q get network.$config.type)"
-		if [ "$proto" == "dhcp" -a "$typ" != "bridge" ]; then
-			DHCP_IFACES="$DHCP_IFACES $config"
-		fi
-	}
-
-	config_load network
-	config_foreach is_notbridged_dhcp interface
-	echo $DHCP_IFACES
-}
-
-init_iup() {
-	local polling_enabled
-	local interval
-	local starttime
-	local nummber
-	number=$RANDOM
-
-	[ -f $CRONPATH ] || touch $CRONPATH
-
-	config_load provisioning
-	config_get polling_enabled polling enabled on
-	config_get interval  polling  interval
-	config_get starttime  polling  starttime
-
-	### Ask for IUP related DHCP options only if IUP is enabled ###
-	new_reqopts() {
-		local net=$1
-		local enabled
-		local newreqopts=
-		local baseopts=
-		local reqopts="$(uci -q get network.$net.reqopts)"
-		local iupopts="66 67 128 224 225 226"
-		local ropt iopt
-		config_get enabled iup enabled "on"
-		for ropt in $reqopts; do
-			case $ropt in
-				66|67|128|224|225|226) ;;
-				*) baseopts="$baseopts $ropt" ;;
-			esac
-		done
-		ropt=""
-		reqopts="$baseopts $iupopts"
-		for ropt in $reqopts; do
-			case $ropt in
-				66|67|128|224|225|226) [ $enabled == "on" ] && newreqopts="$newreqopts $ropt" ;;
-				*) newreqopts="$newreqopts $ropt" ;;
-			esac
-		done
-
-		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		echo "$newreqopts"
-	}
-	for net in $(management_interfaces); do
-		uci -q set network.$net.reqopts="$(new_reqopts $net)"
-	done
-	uci commit network
-	ubus call network reload
-	#################################################################
-
-	if [ $polling_enabled == "off" ]; then
-		sed -i "/\/sbin\/iup/d" $CRONPATH
-		logger -s -t /etc/init.d/iup[$$] "Provisioning polling unscheduled" 2>/dev/console
-		return
-	fi
-
-	local log_hour=$starttime
-	local log_minute
-	local log_interval=$interval
-	if [ $interval == "weekly" ]; then
-		interval="0"
-		log_interval="$log_interval/sunday"
-	elif [ $interval == "hourly" ]; then
-		interval='*'
-		starttime='*'
-	else
-		interval='*'
-	fi
-        let "number %= $RANGE"
-	if ! grep -q "$starttime  \* \* \\$interval     /sbin/iup" "$CRONPATH" ; then
-		if grep -q "iup" "$CRONPATH" ; then
-			sed -i "/iup/d" $CRONPATH
-		fi
-		echo "$number $starttime * * $interval     /sbin/iup -v > /dev/null 2>&1" >> $CRONPATH
-		fsync $CRONPATH
-		/etc/init.d/cron restart
-	fi
-	log_minute=$(awk '/\/sbin\/iup/ {print $1}' /etc/crontabs/root)
-	logger -s -t /etc/init.d/iup[$$] "Provisioning is scheduled at $log_hour:$log_minute $log_interval" 2>/dev/console
-}
-
-start_service() {
-	init_iup
-
-	/sbin/iup -v &
-}
-
-stop_service() {
-	if [ -f "/tmp/run/iup.pid" ]; then
-		kill -9 $(cat /tmp/run/iup.pid)
-		rm -rf /tmp/run/iup.pid
-	fi
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers() {
-        procd_add_reload_trigger provisioning
-}

iup/files/etc/uci-defaults/85-iup-set-dhcp-reqopts

@@ -1,57 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-management_interfaces() {
-	local DHCP_IFACES=""
-
-	is_notbridged_dhcp() {
-		local config="$1"
-		local proto="$(uci -q get network.$config.proto)"
-		local typ="$(uci -q get network.$config.type)"
-		if [ "$proto" == "dhcp" -a "$typ" != "bridge" ]; then
-			DHCP_IFACES="$DHCP_IFACES $config"
-		fi
-	}
-
-	config_load network
-	config_foreach is_notbridged_dhcp interface
-	echo $DHCP_IFACES
-}
-
-set_iup_reqopts() {
-	### Ask for IUP related DHCP options only if IUP is enabled ###
-	new_reqopts() {
-		local net=$1
-		local enabled="$(uci -q get provisioning.iup.enabled)"
-		enabled="${enabled:-on}"
-		local newreqopts=
-		local baseopts=
-		local reqopts="$(uci -q get network.$net.reqopts)"
-		local iupopts="66 67 128 224 225 226"
-		local ropt iopt
-		local net
-		for ropt in $reqopts; do
-			case $ropt in
-				66|67|128|224|225|226) ;;
-				*) baseopts="$baseopts $ropt" ;;
-			esac
-		done
-		ropt=""
-		reqopts="$baseopts $iupopts"
-		for ropt in $reqopts; do
-			case $ropt in
-				66|67|128|224|225|226) [ $enabled == "on" ] && newreqopts="$newreqopts $ropt" ;;
-				*) newreqopts="$newreqopts $ropt" ;;
-			esac
-		done
-		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		echo "$newreqopts"
-	}
-	for net in $(management_interfaces); do
-		uci -q set network.$net.reqopts="$(new_reqopts $net)"
-	done
-	uci commit network
-}
-
-set_iup_reqopts

iup/files/lib/functions/dhcp_option_relay.sh

@@ -1,219 +0,0 @@
-#!/bin/sh
-
-# functions that take dhcp options received on the wan interface
-# and relay/repeat them for specific clients
-
-#config dhcp_option_relay
-#	option enable 1
-#	list dhcp_option 43
-#	list from_interface wan
-#	option vendorclass '*SDX*'
-
-# where:
-# dhcp_option_relay is the name of the section parsed by this script
-# enable/enabled - option, enable the uci section [default on]
-# dhcp_option/dhcp_options - list of dhcp options (0-255) to be relayed/repeated
-# overwrite - if same dhcp_option already exists in /etc/config/dhcp, overwrite it with this option [default off]
-# from_interface - list of interfaces (e.g. wan) to get the dhcp options from
-
-
-. /lib/functions.sh
-
-interface=""
-opt224=""
-opt225=""
-opt226=""
-opt43=""
-opt128=""
-opt66=""
-opt67=""
-opt132=""
-opt133=""
-newsectionid="0"
-
-function parse_the_json()
-{
-	local the_json="$@"
-
-	json_load "$the_json"
-	json_get_var interface interface
-	json_get_var opt224 privopt224
-	json_get_var opt225 privopt225
-	json_get_var opt226 privopt226
-	json_get_var opt43 vendorspecinf # option 43
-	json_get_var opt128 httpurl128
-	json_get_var opt66 tftp # option 66
-	json_get_var opt67 bootfile #option 67
-	json_get_var opt132 vlanid # option 132
-	json_get_var opt133 vlanpriority # option 133
-}
-
-function add_section_dhcp_vendorclass()
-{
-	local dhcp_option=$1
-	local dhcp_option_value=$2
-	local vendorclass=$3
-	local new=
-	newsectionid=$((newsectionid+1))
-
-	#echo "add_section_dchp_vendorclass $dhcp_option ${dhcp_option_value} $vendorclass"
-	new=$(uci add dhcp vendorclass)
-	uci set dhcp.$new.vendorclass="$vendorclass"
-	uci set dhcp.$new.networkid="dhcp_option_relay_$newsectionid"
-	uci add_list dhcp.$new.dhcp_option=$dhcp_option,\"${dhcp_option_value}\"
-
-	uci commit dhcp
-}
-
-function dhcp_option_relay()
-{
-	local section="$1"
-	local enable="" enabled=""
-	local dhcp_option="" dhcp_option_value=""
-	local vendorclass=""
-	#local overwrite=""
-	local from_interface
-
-	#echo "section: $section"
-
-	# parse only enabled sections
-	config_get_bool enabled $section enabled 1
-	config_get_bool enable  $section enable  1
-	#echo "enabled: $enabled"
-	#echo "enable : $enable"
-	if [ "$enable" == "0" -o "$enabled" == "0" ] ; then
-		#echo "section $section is not enabled"
-		return
-	fi
-	# todo: for disabled sections: run only the removal of the dhcp options
-
-	# option overwrite 1
-	#config_get_bool overwrite $section overwrite 0
-	config_get vendorclass $section vendorclass
-	if [ ${#vendorclass} -le 1 ]; then
-		#echo "vendorclass must not be empty"
-		return
-	fi
-
-	# list to_interface lan
-	# to_interface - list of interfaces (e.g. lan, guest) to advertise the dhcp options to
-	#foreach_to_interface() {
-	#	local to_interface=$1
-	#	echo ""
-	#	echo "  from_interface $from_interface"
-	#	echo "  dhcp_option $dhcp_option"
-	#	echo "  dhcp_option_value $dhcp_option_value"
-	#	echo "  overwrite $overwrite"
-	#	echo "  to_interface $to_interface"
-	#
-	#	if [ ! $(uci -q get dhcp.$to_interface) ] ; then
-	#		echo "to_interface $to_interface does not exist in dhcp uci config"
-	#		return
-	#	fi
-	#
-	#}
-
-
-	foreach_dhcp_option() {
-		dhcp_option=$1
-
-		echo "dhcp_option: $dhcp_option"
-		case $dhcp_option in
-		43) dhcp_option_value=$opt43 ;;
-		66) dhcp_option_value=$opt66 ;;
-		67) dhcp_option_value=$opt67 ;;
-		128) dhcp_option_value=$opt128 ;;
-		132) dhcp_option_value=$opt132 ;;
-		133) dhcp_option_value=$opt133 ;;
-		224) dhcp_option_value=$opt224 ;;
-		225) dhcp_option_value=$opt225 ;;
-		226) dhcp_option_value=$opt226 ;;
-		*) dhcp_option_value="unsupported" ;;
-		esac
-
-		if [ "${dhcp_option_value}" == "unsupported" ] ; then
-			echo "dhcp_option $dhcp_option is unsupported"
-			return
-		fi
-		if [ "${dhcp_option_value}" == "" ] ; then
-			echo "dhcp_option $dhcp_option is empty"
-			return
-		fi
-
-		#echo "dhcp_option: $dhcp_option dhcp_option_value: ${dhcp_option_value}"
-
-		#config_list_foreach $section to_interface foreach_to_interface
-
-		add_section_dhcp_vendorclass $dhcp_option ${dhcp_option_value} $vendorclass
-	}
-
-	foreach_from_interface() {
-		from_interface="$1"
-		#echo "from_interface: $from_interface"
-		if [ "$from_interface" != "$interface" ]; then
-			return
-		fi
-
-		dhcp_option=""
-		config_list_foreach $section dhcp_option foreach_dhcp_option
-		#config_list_foreach $section dhcp_options foreach_dhcp_option
-	}
-
-	from_interface=""
-	config_list_foreach $section from_interface foreach_from_interface
-}
-
-
-# in uci dhcp config:
-# remove all the vendorclass sections
-# that have previosly been configured by this script.
-# all are identified by "option networkid dhcp_option_relay_*"
-function dhcp_option_relay_clear_prev()
-{
-	local to_remove=""
-
-	foreach_vendorclass() {
-		local section="$1"
-		local networkid
-		config_get networkid $section networkid
-
-		case "$networkid"
-		in dhcp_option_relay*)
-			to_remove="$to_remove $section"
-			;;
-		esac
-	}
-
-	config_load dhcp
-	config_foreach foreach_vendorclass vendorclass
-
-	local sect
-	for sect in $to_remove ; do
-		uci_remove dhcp $sect
-	done
-	uci_commit dhcp
-}
-
-
-# the main function
-function dhcp_option_relay_parse()
-{
-	local the_json="$@"
-	parse_the_json "$the_json"
-
-	dhcp_option_relay_clear_prev
-
-	newsectionid="0"
-
-	config_load provisioning
-	config_foreach dhcp_option_relay dhcp_option_relay
-	#config_foreach dhcp_option_relay dhcp_options_relay
-	#config_foreach dhcp_option_relay dhcpoption_relay
-	#config_foreach dhcp_option_relay dhcpoptions_relay
-	#config_foreach dhcp_option_relay dhcp_optionrelay
-	#config_foreach dhcp_option_relay dhcp_optionsrelay
-	#config_foreach dhcp_option_relay dhcpoptionrelay
-	#config_foreach dhcp_option_relay dhcpoptionsrelay
-}
-
-#dhcp_option_relay_parse

iup/files/sbin/iup

@@ -1,595 +0,0 @@
-#!/bin/sh
-
-echo $$ > /var/run/iup.pid
-
-. /lib/functions.sh
-. /lib/functions/network.sh
-. /lib/functions/savecfg.sh
-. /lib/functions/dhcp_option_relay.sh
-. /usr/share/libubox/jshn.sh
-
-include /lib/upgrade
-include /lib/network
-
-export IUPCONFFILES=/tmp/iup/sysupgrade.conffiles.tar.gz
-export IUPMD5=/etc/configchecksums
-export CONFILESLURP='/tmp/iup/*.conf'
-export IUPTEMP="/tmp/iup"
-export INTERACTIVE=0
-export VERBOSE=0
-export CONF=1
-export DESKEY=
-export MAC=
-export RANGE=10
-export RETRYSTOP=5
-export SLEEP=10
-
-json_load "$(ubus call router.system info)"
-json_select system
-json_get_var MAC basemac
-json_select ..
-json_select keys
-json_get_var DESKEY des
-json_select ..
-
-# MAC lowercase to uppercase and remove ':'
-MAC=$(echo $MAC | tr '[a-z]' '[A-Z]' | tr -d ':')
-
-# Convert DESKEY to HEX format
-DESKEY=$(echo $DESKEY | tr -d '\n' | hexdump -e '16/1 "%02x"')
-
-
-# no verbose:	no output
-# -v		log to system log
-# -v -v		log to system log and console
-# -v -v -v	log to system log, console and stderr
-v() {
-	[ "$VERBOSE" -eq 0 ] && return
-	[ "$VERBOSE" -eq 1 ] && logger -t $0[$$] "$@" && return
-	[ "$VERBOSE" -eq 2 ] && logger -s -t $0[$$] "$@" >/dev/console 2>&1 && return
-	[ "$VERBOSE" -eq 3 ] && logger -s -t $0[$$] "$@" 2>&1 | tee /dev/console && return
-}
-
-vv() {
-	VERBOSE="$(($VERBOSE + 1))"
-	v "$@"
-	VERBOSE="$(($VERBOSE - 1))"
-
-}
-
-get_packages()
-{
-	local pack
-	pack=$(grep -w 'package' $1)
-	pack=${pack//package/}
-	#pack=${pack//[\'|\"]/}
-	echo $pack | tr -d '\"' | tr -d "'"
-}
-
-reload ()
-{
-	local pack
-	pack=$(get_packages $1)
-	v "Calling ubus call uci commit for $pack"
-	for packname in $pack
-	do
-		ubus call uci commit '{"config":"'$packname'"}'
-		sleep 1
-	done
-}
-
-save_usercfg()
-{
-	savecfg_save_config fw_redirect fw_parental wifi
-}
-
-apply_usercfg()
-{
-	# decide to save the user changes based on keepuserconfig received through provisioning
-	local keep
-	config_load provisioning
-	config_get_bool keep configserver keepuserconfig "0"
-	v "apply_usercfg(): keepuserconfig = $keep"
-	if [ "$keep" != "1" ] ; then
-		savecfg_rm_files
-		return
-	fi
-
-	savecfg_apply_config fw_redirect fw_parental wifi
-}
-
-handle_provisioning() {
-	local config="$1"
-	local default="$2"
-	local enabled
-	local url
-	local tftpfile
-	local host
-	local md5
-	local defaultreset
-	local pack
-	local packname
-	local number=$RANDOM
-	local retry=1
-	local number
-	local incsleep=$SLEEP
-	let "number %= $RANGE"
-	if [[ ! -e $IUPTEMP ]]; then
-		mkdir $IUPTEMP
-	fi
-	touch $IUPCONFFILES
-	config_get_bool enabled "$config" enabled "$default"
-	config_get_bool defaultreset "$config" defaultreset
-	config_get deckey "$config" deckey
-	if [ "$enabled" -eq 1	]; then
-		if [ "$config" == "iup" ]; then
-			v "Using url received in dhcp options"
-			config_get url "$config" urliup
-		else
-			config_get url "$config" url
-		fi
-		url=${url//\$MAC/$MAC}
-		v "Downloading from url \"$url\""
-
-		while [ $retry -le $RETRYSTOP ]
-		do
-		  if [ ${url%%:*} == "tftp" ]; then
-			tftpfile=${url#*\/\/}
-			host=${tftpfile%%\/*}
-			tftpfile=${tftpfile#*\/}
-
-			/usr/bin/tftp -l $IUPCONFFILES -r "$tftpfile" -g "$host"
-		  else
-			get_image "$url" "cat" > $IUPCONFFILES
-		  fi
-		  if [ -s $IUPCONFFILES ]; then
-			v "Download finished"
-			retry=$((RETRYSTOP + 1))
-		  else
-		  v "Download failed, retrying in $incsleep seconds"
-		  sleep $incsleep
-		  incsleep=$((incsleep * retry + number))
-		  retry=$((retry+1))
-		  fi
-		done
-	fi
-	if [ ! -s "$IUPCONFFILES" ] && [ "$enabled" -eq 1 ]; then
-		echo "File not Found"
-		reboot="off"
-		CONF=0
-	else
-		handle_Downloaded_file $deckey
-	fi
-}
-
-handle_Downloaded_file()
-{
-	local DECKEY
-	local KEY
-	[ -n "$1" ] && DECKEY=$(echo $1 | tr -d '\n' | hexdump -e '16/1 "%02x"')
-	KEY=${DECKEY:-$DESKEY}
-	local img_type
-	case "$(get_image_type "$IUPCONFFILES")" in
-                "INTENO") img_type=2 ;;
-                "CFE+FS") img_type=1 ;;
-                "FS")     img_type=0 ;;
-                *)      img_type="UNKNOWN";;
-        esac
-
-        if [ "$img_type" == "UNKNOWN" ] ; then
-		case "$(hexdump -v -n 2 -e '1/1 "%02x"' $IUPCONFFILES)" in
-			1f8b)
-				v "Downloaded file is an unencrypted config"
-				md5=$(md5sum $IUPCONFFILES)
-				md5="${md5%% *}" # remove the first space and everything after it
-				md5sum "$IUPCONFFILES" >> "$IUPMD5.temp"
-				if grep -q "$md5" "$IUPMD5"; then
-					v "Config is already up to date, nothing to do"
-					#because config is up to date we need to disable last step reboot if set
-					reboot="off"
-					rm -rf $IUPTEMP
-				else
-					save_usercfg
-					cd $IUPTEMP
-					tar xvzf $IUPCONFFILES
-					for f in $CONFILESLURP
-					do
-						v "File to be applied $f and config $(cat $f)"
-						uci -f $f import
-					done
-					pack=$(get_packages $CONFILESLURP)
-					v "Packages to be commited: $pack"
-					for packname in $pack
-					do
-						uci commit $packname
-					done
-					apply_usercfg
-					reboot=`uci -q  get provisioning.configserver.reboot`
-					if [ "$reboot" != "on" ]; then
-						sync
-						reload $CONFILESLURP
-					fi
-					rm -rf $IUPTEMP
-
-					cp /rom/etc/uci-defaults/* /etc/uci-defaults/
-					sync
-				fi
-			;;
-			*)
-				v "Downloaded file is an encrypted config"
-				if [ $KEY ]; then
-					openssl enc -d -des-ede -nosalt -K $KEY -iv "0000000000000000" -in $IUPCONFFILES -out $IUPCONFFILES.tmp
-					if [ $? -eq 0 ]; then
-						v "Decryption successful"
-						mv $IUPCONFFILES.tmp $IUPCONFFILES
-						handle_Downloaded_file
-					else
-						v "Decryption Failed! Exiting"
-						rm -rf $IUPTEMP
-						exit 1
-					fi
-				else
-					v "No Key Defined"
-					rm -rf $IUPTEMP
-					exit 1
-				fi
-			;;
-		esac
-	else
-		v "Downloaded file is a firmware, will start reflashing"
-		if [ "$defaultreset" -eq 1 ]; then
-			v "Not saving configuration over reflash"
-			 /sbin/sysupgrade -v -n $IUPCONFFILES
-		else
-			v "Saving configuration over reflash"
-			/sbin/sysupgrade -v $IUPCONFFILES
-		fi
-	fi
-}
-
-# function: change_to_vlan
-# arg 1 = vlan id
-# arg 2 = vlan priority
-# arg 3 = $INTERFACE
-change_to_vlan() {
-	# local variables.
-	local name="vlan$1"	# construct name = vlan + vlanid.
-	local base_dev		# varible holding device name of wan port.
-	local wan_if		# variable holding wan interfaces.
-	local new_wan_if	#
-
-	# extract device name.
-	network_get_device base_dev $3
-
-	# bring down old interface/device.
-	ifdown "${base_dev}"
-	v "option 132: bringing down old if: ${base_dev}"
-
-	# extract base name of device.
-	base_dev=$(echo ${base_dev} | cut -d. -f1)
-
-	# add "VLAN interface" to the "end of the file".
-	uci add network device
-	uci rename network.@device[-1]=${name}
-	uci set network.@device[-1].type=8021q
-	uci set network.@device[-1].ifname=${base_dev}
-	uci set network.@device[-1].name="${base_dev}.${1}"
-	uci set network.@device[-1].vid=${1}
-	uci set network.@device[-1].priority=${2}
-	# and commit the change.
-	uci commit network
-	v "option 132: committed update to file network"
-
-	# reload configuration files.
-	ubus call network reload
-	v "option 132: reload network config"
-
-	# replace old interface (like eth0.1 with new eth0.101).
-	wan_if=$(uci get network.$3.ifname)
-	v "option 132: old network.${3}.ifname: $wan_if"
-
-	# loop through the string, remove any word close to "base_dev".
-	for word in ${wan_if}; do
-	#echo $word
-	case $word in
-		${base_dev}*) # don't add if.
-		;;
-		*)	new_wan_if=${word}' '${new_wan_if}  # add if.
-			#new_wan_if+=" ${word}"  # probably not working in ash.
-		;;
-	esac
-	done
-	# append new interface.
-	new_wan_if=${new_wan_if}${base_dev}.${1}
-	uci set network.wan.ifname="${new_wan_if}"
-	# and commit the change.
-	uci commit network
-	v "option 132: committed update to file network: ifname=${new_wan_if}"
-
-	# reboot into new if configuration.
-	vv "Rebooting"
-	export REBOOT_REASON=iup
-	/sbin/reboot
-}
-
-handle_option224()
-{
-	if [ -z "$1" ] ; then
-		echo "No argument"
-		return 1
-	fi
-
-	if [ $(echo $1|grep -o "," | wc -l) -eq 0 ] ; then
-		url=$1
-	else
-		url=$(echo $1|cut -d',' -f1)
-		a=$(echo $1|cut -d',' -f2)
-		b=$(echo $1|cut -d',' -f3)
-		c=$(echo $1|cut -d',' -f4)
-	fi
-
-	currdate=$(date +"%Y-%m-%d")
-
-	active=0
-	if [ -z $a ] ; then
-		active=1
-	elif [ $a ] && [ $b ] && [ $a -lt 25 ] ; then
-		#Time
-		begin=$(date +%s -d"$currdate $a")
-		now=$(date +%s)
-		end=$((begin+3600*$b))
-		if [ $now -gt $begin ] && [ $now -lt $end ] ; then
-			active=1
-		fi
-	elif [ $a ] && [ $b ] && [ $c ] && [ $a -gt 25 ]  ; then
-		#Date
-		y=$(echo $a| cut -c1-4)
-		m=$(echo $a| cut -c5-6)
-		d=$(echo $a| cut -c7-8)
-		begin=$(date +%s -d"$y-$m-$d $b")
-		now=$(date +%s)
-		end=$((begin+3600*$c))
-		if [ $now -gt $begin ] && [ $now -lt $end ] ; then
-			active=1
-		fi
-	else
-		echo "Bad format"
-		return 1
-	fi
-
-	softwareminuspath=${url##*/}
-
-	if [ $url ] && [ $active -eq 1 ]; then
-		v "Software version to download \"$softwareminuspath\""
-		local sysinfo=$(ubus call router.system info)
-		json_load "$sysinfo"
-		json_select system
-		json_get_var firmware firmware
-		local firmware_new=${softwareminuspath%.*}	# remove extension (.w, .y or .y2) from filename
-		if [ "$firmware_new" != "$firmware" ] ; then
-			v "Firmware found $url will start flashing"
-			v "Currently running firmware: \"$firmware\""
-			v "Newly received firmware:    \"$firmware_new\""
-			wait_for_dns $url
-			v "Start flashing"
-			/sbin/sysupgrade -v $url &
-			return 1
-		else
-			v "Firmware is up to date, nothing to do"
-			return 0
-		fi
-	fi
-}
-
-
-parse_dhcp_options()
-{
-	local the_json="$@"
-
-	# process the dhcp_option_relay sections
-	dhcp_option_relay_parse "$the_json"
-
-	# Process IUP related DHCP options #
-	local privopt224 privopt225 privopt226 vendorspecinf httpurl128
-	local tftp bootfile vlanid vlanpriority interface
-
-	json_load "$the_json"
-	json_get_var interface interface
-	json_get_var privopt224 privopt224
-	json_get_var privopt225 privopt225
-	json_get_var privopt226 privopt226
-	json_get_var vendorspecinf vendorspecinf # option 43
-	json_get_var httpurl128 httpurl128
-	json_get_var tftp tftp # option 66
-	json_get_var bootfile bootfile #option 67
-	json_get_var vlanid vlanid # option 132
-	json_get_var vlanpriority vlanpriority # option 133
-
-	if [ $privopt224 ]; then
-		v "dhcp option 224 firmware url $privopt224"
-		handle_option224 $privopt224
-		[ $? -eq 1 ] && exit
-	fi
-
-	if [ $vendorspecinf ]; then
-		v "dhcp option 43 tr69 url $vendorspecinf"
-		url=${vendorspecinf%%,*}; rest=${vendorspecinf#*,}
-		provisioningcode=${rest%%,*};
-		[ -f /etc/config/cwmp ] && uci_set_state cwmp acs dhcp_url "$url"
-		uci_set_state provisioning iup urlcwmp "$url"
-		uci_set_state provisioning iup url "$url"
-		uci_set_state provisioning iup provisioningcode "$provisioningcode"
-	elif [ $httpurl128 ]; then
-		v "dhcp option 128 http config url $httpurl128"
-		uci_set_state provisioning iup urliup "$httpurl128"
-	elif [ $tftp ]; then
-		v "dhcp option 66 tftp config url $tftp"
-		if [ ${bootfile:0:1} == '/' ]; then
-			uci_set_state provisioning iup urliup "tftp://$tftp$bootfile"
-		else
-			uci_set_state provisioning iup urliup "tftp://$tftp/$bootfile"
-		fi
-	fi
-
-	# vlanid (and vlanpriority)
-	if [ -n "$vlanid" -a -n "$vlanpriority" ]; then
-		v "dhcp option 132 vlanid: ${vlanid} vlanpriority: ${vlanpriority}"
-		change_to_vlan ${vlanid} ${vlanpriority} ${interface}
-	elif [ -n "$vlanid" ]; then
-		v "dhcp option 132 vlanid: ${vlanid}"
-		change_to_vlan ${vlanid} 0 ${interface}
-	elif [ -n "$privopt225" ] || [ -n "$privopt226" ]; then
-		# opt225 and opt226 can be used together or separatly
-		if [ -n "$privopt225" ]; then
-			v "dhcp option 225: $privopt225"
-			# option225 is allowd to change only once per CPE
-			if [ "$(uci get -q ice.cloud.frozen)" != "1" ] ; then
-				uci set ice.cloud.frozen="1"
-				uci set ice.cloud.enabled="1"
-				uci set ice.cloud.server="$privopt225"
-			fi
-		fi
-		if [ -n "$privopt226" ]; then
-			v "dhcp option 226: $privopt226"
-			[ -z "$(uci get -q ice.dhcp)" ] && uci set ice.dhcp="dhcp"
-			uci set ice.dhcp.opt226connectionid="$privopt226"
-			ubus send dhcp.opt226connectionid '{"opt226connectionid":"","value":"'$privopt226'"}'
-		fi
-		uci commit
-	fi
-}
-
-# wait_for_default_gateway to become reachable
-# return 0 if the default gateway is reachable
-# return 1 if the default gateway is not reachable after $wait_time
-wait_for_default_gateway()
-{
-	local gateway
-	local device
-	local wait_time=120
-	local wait_interval=10
-
-	while [ true ] ; do
-
-		gateway=""
-		device=""
-		network_flush_cache
-		network_get_gateway gateway wan #true
-		network_get_device device wan
-		device="${device:+-I }$device"
-		if ping -q -w 1 -c 1 $device $gateway >/dev/null 2>&1 ; then
-			[ "$wait_time" -lt "60" ] && v "Default gateway $gateway is reachable"
-			sleep $wait_interval
-			return 0
-		fi
-
-		# try the nameservers too
-		for ns in $(grep nameserver /var/resolv.conf.auto | awk '{print $2}'); do
-			if ping -q -w 1 -c 1 $device $ns >/dev/null 2>&1 ; then
-				[ "$wait_time" -lt "60" ] && v "Name server $ns is reachable"
-				sleep $wait_interval
-				return 0
-			fi
-		done
-
-		v "Waiting for default gateway or name server. Countdown $wait_time seconds"
-		sleep $wait_interval
-		wait_time=$((wait_time - wait_interval))
-		[ "$wait_time" -le "0" ] && break # timer expired
-	done
-
-	return 1 # default gateway and name server are not reachable
-}
-
-
-main()
-{
-
-	while [ -n "$1" ]; do
-		case "$1" in
-			-v) export VERBOSE="$(($VERBOSE + 1))";;
-			-q) export VERBOSE="$(($VERBOSE - 1))";;
-			--dhcp-options)
-				shift
-				parse_dhcp_options "$@"
-				exit 0
-				;;
-			-*)
-				echo "Invalid option: $1"
-				exit 1
-			;;
-			*) break;;
-		esac
-		shift;
-	done
-
-	if ! wait_for_default_gateway ; then
-		v "Neither default gateway nor name server are reachable. Aborting iup."
-		exit 1
-	fi
-
-	if [ ! -f $IUPMD5 ]; then
-		v "Creating file $IUPMD5"
-		touch $IUPMD5
-	fi
-
-
-	local iupurl
-	local configurl
-	local software
-	local sofwareminuspath
-
-	config_load provisioning
-	#check if iup should be used or if its overridden by /etc/config
-	config_get configurl configserver	url
-	config_get reboot configserver reboot
-	config_get iupurl iup	urliup
-
-	if [ $configurl ]; then
-		handle_provisioning configserver "0"
-	elif [ $iupurl ]; then
-		handle_provisioning iup "1"
-	else
-		v "No provisioning server configured"
-		exit
-	fi
-
-	config_load provisioning
-	config_foreach handle_provisioning subconfig "0"
-	config_get software uppgradeserver url
-	sofwareminuspath=${software##*/}
-
-	if [ $software ]; then
-		v "Software version to download \"$sofwareminuspath\""
-		local sysinfo=$(ubus call router.system info)
-		json_load "$sysinfo"
-		json_select system
-		json_get_var firmware firmware
-		json_get_var filesystem filesystem
-	        if [ "$filesystem" == "JFFS2" ] ; then
-	                firmware=$firmware.w
-		else
-			firmware=$firmware.y3
-		fi
-		if [ "$sofwareminuspath" == "${sofwareminuspath/$firmware/}" ] ; then
-			v "Software \"$software\""
-			handle_provisioning uppgradeserver "0"
-		else
-			v "Will not update software, already up to date"
-		fi
-	fi
-
-	if [ $CONF -eq 1 ]; then
-		mv "$IUPMD5.temp" $IUPMD5
-	fi
-
-	if [ "$reboot" == "on" ]; then
-		vv "Rebooting"
-		export REBOOT_REASON=iup
-		/sbin/reboot
-	fi
-
-	rm -rf /var/run/iup.pid
-}
-
-main $@

json-editor/Makefile

@@ -0,0 +1,33 @@
+#
+# Copyright (C) 2019 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=json-editor
+PKG_RELEASE:=1.0.0
+
+PKG_SOURCE_VERSION:=44b32937a062ec4ffc9f7355841dc94ab6efa50f
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/json-editor.git
+PKG_MIRROR_HASH:=skip
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/json-editor
+  SECTION:=base
+  CATEGORY:=Libraries
+  DEPENDS:=+libjson-c +libblobmsg-json
+  TITLE:=JSON-editor
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/src/json-editor.h $(1)/usr/include/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libjson-editor.so $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,json-editor))

juci/Makefile

@@ -0,0 +1,122 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=juci
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/juci.git
+PKG_SOURCE_VERSION:=70b66bfc7f0e25e77b6920c3d44e5b05f4bfcf95
+PKG_VERSION:=2020-05-27
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
+
+PKG_RELEASE=$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/juci
+  $(Package/juci/default)
+  SECTION:=juci
+  CATEGORY:=JUCI
+  MENU=1
+  TITLE:=JUCI Core Package (select this to select default plugins)
+  DEPENDS:=+libubox +libubus +owsd +rpcd +rpcd-mod-file +questd
+endef
+
+define Build/InstallDev 
+	$(INSTALL_DIR) $(1)/usr/src/
+	ln -s $(PKG_BUILD_DIR) $(1)/usr/src/juci
+endef 
+
+define Build/Compile
+	$(call Build/Compile/Default,THEME_PATH="$(TOPDIR)/tmp/juci-themes/")
+endef
+
+define Package/juci/description
+ JUCI Javascript UCI Web interface.
+endef
+
+define Package/juci/install
+	$(INSTALL_DIR) $(1)/
+	$(CP) $(PKG_BUILD_DIR)/bin/juci/* $(1)/
+	$(CP) ./files/* $(1)/
+endef
+
+define Package/juci/postinst
+#!/bin/sh
+
+juci-update
+exit 0
+endef
+
+$(eval $(call BuildPackage,juci))
+
+####### Extensions / Themes and Plugins
+
+define RegisterAddonInner
+define Package/$(2)
+	SECTION:=juci
+	CATEGORY:=JUCI
+	TITLE:=default
+	SUBMENU:=$(1)
+	TITLE:=$(if $(3),$(3),JUCI $(2) plugin)
+	DEPENDS:=$(4)
+endef
+
+define Package/$(2)/install
+	$(INSTALL_DIR) $$(1)/
+	$(CP) $(PKG_BUILD_DIR)/bin/$(2)/* $$(1)/
+endef
+endef
+
+define RegisterAddon
+	$(eval $(call RegisterAddonInner,$(1),$(2),$(3),$(4),$(5)))
+	$(eval $(call BuildPackage,$(2)))
+endef
+
+$(eval $(call RegisterAddon,Plugins,juci-catv, CATV Module,@(PACKAGE_catv)))
+$(eval $(call RegisterAddon,Plugins,juci-cgroups, CGroups Module,@(PACKAGE_icgroupd)))
+$(eval $(call RegisterAddon,Plugins,juci-ddns, DDNS Configuration,@(PACKAGE_ddns-scripts)))
+$(eval $(call RegisterAddon,Plugins,juci-diagnostics, Simple Diagnostics,@(PACKAGE_busybox)))
+$(eval $(call RegisterAddon,Plugins,juci-ndt, NDT Speed Test client,@(PACKAGE_ndt)))
+$(eval $(call RegisterAddon,Plugins,juci-dnsmasq-dhcp, DHCP/DNSMasq Configuration,@(PACKAGE_dnsmasq||PACKAGE_dnsmasq-full)))
+$(eval $(call RegisterAddon,Plugins,juci-dropbear, Dropbear Configuration,@(PACKAGE_dropbear)))
+$(eval $(call RegisterAddon,Plugins,juci-easyqos, Easy QoS module,@(PACKAGE_easy-qos)))
+$(eval $(call RegisterAddon,Plugins,juci-event, Event Module,@(PACKAGE_owsd)))
+$(eval $(call RegisterAddon,Plugins,juci-firewall-fw3, Firewall Configuration,@(PACKAGE_firewall)))
+$(eval $(call RegisterAddon,Plugins,juci-icwmp, TR-069 Module,@(PACKAGE_icwmp)))
+$(eval $(call RegisterAddon,Plugins,juci-config-backup, Config Backup Module))
+$(eval $(call RegisterAddon,Plugins,juci-qos, QoS module,@(PACKAGE_qos-scripts)))
+$(eval $(call RegisterAddon,Plugins,juci-voice-client, Asterisk Voice Client Module,@(PACKAGE_asterisk)))
+$(eval $(call RegisterAddon,Plugins,juci-minidlna, MiniDLNA Configuration,@(PACKAGE_minidlna)))
+$(eval $(call RegisterAddon,Plugins,juci-mcproxy, Multicast Proxy Configuration,@(PACKAGE_mcproxy)))
+$(eval $(call RegisterAddon,Plugins,juci-mod-status, Status Reporting Module,@(PACKAGE_questd)))
+$(eval $(call RegisterAddon,Plugins,juci-mod-system, System Administration Module))
+$(eval $(call RegisterAddon,Plugins,juci-mwan3, mwan3 Configuration,@(PACKAGE_mwan3)))
+$(eval $(call RegisterAddon,Plugins,juci-natalie-dect, DECT Module,@(PACKAGE_dectmngr2)))
+$(eval $(call RegisterAddon,Plugins,juci-netmode, Netmode Module,@(PACKAGE_netmode)))
+$(eval $(call RegisterAddon,Plugins,juci-network-device, Network Device Configuration,@(PACKAGE_netifd)))
+$(eval $(call RegisterAddon,Plugins,juci-network-dsl, DSL Module))
+$(eval $(call RegisterAddon,Plugins,juci-network-netifd, Network Module,@(PACKAGE_netifd)))
+$(eval $(call RegisterAddon,Plugins,juci-network-port, Ethernet Port Configuration,@(PACKAGE_port-management)))
+$(eval $(call RegisterAddon,Plugins,juci-openvpn, OpenVPN configuration,@(PACKAGE_openvpn)))
+$(eval $(call RegisterAddon,Plugins,juci-owsd, OWSD configuration,@(PACKAGE_owsd)))
+$(eval $(call RegisterAddon,Plugins,juci-printer, p910nd Printer Server Configuration,@(PACKAGE_p910nd)))
+#$(eval $(call RegisterAddon,Plugins,juci-realtime-graphs, Realtime Graphs))
+$(eval $(call RegisterAddon,Plugins,juci-samba, Samba Configuration,@(PACKAGE_samba3)))
+$(eval $(call RegisterAddon,Plugins,juci-sfp, SFP Configuration,@(PACKAGE_peripheral_manager)))
+$(eval $(call RegisterAddon,Plugins,juci-snmpd, SNMP Module,@(PACKAGE_snmpd)))
+$(eval $(call RegisterAddon,Plugins,juci-sysupgrade, Sysupgrade Firmware Upgrade,@(PACKAGE_rpcd-mod-rpcsys)))
+$(eval $(call RegisterAddon,Plugins,juci-uhttpd, uHTTPD Configuration,@(PACKAGE_uhttpd)))
+$(eval $(call RegisterAddon,Plugins,juci-upnp, UPnP Configuration Module,@(PACKAGE_miniupnpd)))
+#$(eval $(call RegisterAddon,Plugins,juci-usb, USB Module))
+$(eval $(call RegisterAddon,Plugins,juci-wireless, Wireless Management Module))
+$(eval $(call RegisterAddon,Plugins,juci-wifilife, WiFi Life Module,@(PACKAGE_wifilife)))
+$(eval $(call RegisterAddon,Themes,juci-theme-iopsys))
+
+####### dynamically publish themes as packages #######
+$(foreach th,$(wildcard $(TOPDIR)/tmp/juci-themes/*),$(eval $(call RegisterAddon,Themes,$(notdir $(th)))))

juci/files/etc/config/juci

@@ -0,0 +1,66 @@
+config juci 'juci'
+	option homepage 'overview'
+	option theme 'juci-theme-iopsys'
+	option favicon 'favicon.ico'
+
+config login 'login'
+	option showusername '1'
+	option defaultuser 'user'
+
+config localization 'localization'
+	option default_language 'en'
+	list languages 'en'
+
+config wiki 'wiki'
+	option visible '0'
+	option version 'v4.2.x'
+
+config widget
+	list name 'overviewWidget11WAN'
+	list require 'ubus:network.interface'
+
+config widget
+	list name 'overviewWidget10Network'
+	list require 'ubus:network.interface'
+	list require 'ubus:router.network->hosts'
+
+config widget
+	list name 'overviewWidget00WiFi'
+	list require 'ubus:wifi'
+	list require 'ubus:wifi.wps'
+
+config menu
+	option path 'overview'
+	option page 'overview'
+
+config menu
+	option path 'system'
+	option page 'system'
+	option redirect 'first'
+
+config menu
+	option path 'status'
+	option page 'status'
+	option redirect 'first'
+
+config menu
+	option path 'status/system'
+	option page 'status-system'
+	list require 'ubus:router.system->info'
+
+config menu
+	option path 'status/network'
+	option page 'status-network'
+	list require 'ubus:network.interface'
+
+config menu
+	option path 'status/dsl'
+	option page 'network-dsl-status'
+	list require 'ubus:dsl->stats'
+	list require 'ubus:dsl->status'
+
+config menu
+	option path 'system/upgrade'
+	option page 'settings-upgrade'
+	list expose 'admin'
+

juci/files/etc/init.d/juci

@@ -0,0 +1,41 @@
+#!/bin/sh /etc/rc.common
+. /lib/functions.sh
+
+START=94
+STOP=06
+
+USE_PROCD=1
+NAME=juci
+
+start_service() {
+	mkdir -p /tmp/juci
+	touch /www/index.html.gz
+	chmod 755 /www/cgi-bin/luci
+	# this will simply update index.html to include any files that are for some reason not included
+	# a good way to make sure all plugins are properly included at each boot
+	config_load juci
+	local theme
+	config_get theme juci theme
+	if [ "$theme" ]
+	then
+		if [ -f /www/themes/theme.js.gz ] 
+			then
+			rm -f /www/themes/theme.js.gz
+		fi
+		if [ -f /www/themes/*$theme.js.gz ]
+			then
+			ln -s /www/themes/*$theme.js.gz /www/themes/theme.js.gz
+		fi
+	fi
+	juci-update
+}
+
+stop() {
+	service_stop /sbin/juci
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger juci
+}
+

juci/files/etc/uci-defaults/00-default-juci-rpcd-acl

@@ -0,0 +1,49 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+USER_SECTION=""
+USER_EXISTS=0
+
+find_user(){
+	local section="$1"
+	local user="$2"
+	config_get username $section username
+	if [ "$username" == "$user" ]; then
+		USER_SECTION="$section"
+		USER_EXISTS=1
+	fi
+}
+
+config_load rpcd
+
+USER_EXISTS=0
+config_foreach find_user login root
+if [ $USER_EXISTS -eq 1 ]; then
+	uci delete rpcd.$USER_SECTION
+fi
+
+USER_EXISTS=0
+config_foreach find_user login admin
+if [ $USER_EXISTS -eq 0 ]; then
+	uci -q add rpcd login >/dev/null
+	uci -q set rpcd.@login[-1].username="admin"
+	uci -q set rpcd.@login[-1].password="\$p\$admin"
+	uci -q add_list rpcd.@login[-1].read="enduser"
+	uci -q add_list rpcd.@login[-1].read="administrator"
+	uci -q add_list rpcd.@login[-1].write="enduser"
+	uci -q add_list rpcd.@login[-1].write="administrator"
+fi
+
+USER_EXISTS=0
+config_foreach find_user login user
+if [ $USER_EXISTS -eq 0 ]; then
+	uci -q add rpcd login >/dev/null
+	uci -q set rpcd.@login[-1].username="user"
+	uci -q set rpcd.@login[-1].password="\$p\$user"
+	uci -q add_list rpcd.@login[-1].read="enduser"
+	uci -q add_list rpcd.@login[-1].write="enduser"
+fi
+
+uci commit rpcd
+

juci/files/usr/share/rpcd/acl.d/administrator.json

@@ -0,0 +1,21 @@
+{
+	"administrator": {
+		"description": "Administrator Access Rights",
+		"read": {
+			"ubus": {
+				"file": [
+					"write"
+				],
+				"rpc-sys": [
+					"upgrade_start",
+					"upgrade_test"
+				]
+			}
+		},
+		"write": {
+			"file": {
+				"/tmp/firmware.bin": ["write"]
+			}
+		}
+	}
+}

juci/files/usr/share/rpcd/acl.d/enduser.json

@@ -0,0 +1,217 @@
+{
+	"enduser": {
+		"description": "End User Access Rights",
+		"read": {
+			"ubus": {
+				"dect": [
+					"state",
+					"handset",
+					"status",
+					"call"
+				],
+				"dsl": [
+					"status",
+					"stats"
+				],
+				"network.device": [
+					"status"
+				],
+				"network.interface*": [
+					"status",
+					"dump",
+					"up",
+					"down"
+				],
+				"router.network": [
+					"clients",
+					"hosts",
+					"dump"
+				],
+				"router.system": [
+					"info",
+					"memory",
+					"filesystem",
+					"process",
+					"processes"
+				],
+				"session": [
+					"access",
+					"list",
+					"destroy",
+					"login"
+				],
+				"system": [
+					"info",
+					"board",
+					"reboot"
+				],
+				"testnet": [
+					"status"
+				],
+				"uci": [
+					"*"
+				],
+				"voice.asterisk": [
+					"status",
+					"call_log",
+					"platform",
+					"supported_countries"
+				],
+				"wifi": [
+					"status"
+				],
+				"wifi.ap.*": [
+					"status",
+					"stats",
+					"assoclist",
+					"stations"
+				],
+				"wifi.radio.*": [
+					"status",
+					"stats",
+					"scan",
+					"scanresults",
+					"autochannel"
+				],
+				"wifi.wps": [
+					"start",
+					"stop",
+					"status",
+					"showpin"
+				]
+			},
+			"uci": [
+				"dhcp",
+				"firewall",
+				"juci",
+				"network",
+				"voice_client",
+				"wireless"
+			],
+			"owsd": [
+				"client",
+				"wifi.radio",
+				"wifi.sta",
+				"wifi.wps"
+			]
+		},
+		"write": {
+			"uci": [
+				"dhcp",
+				"firewall",
+				"network",
+				"wireless"
+			],
+			"uci_granular": {
+				"dhcp": [
+					{
+						"match": {
+							".type": "dhcp"
+						},
+						"option": [
+							"*"
+						]
+					},
+					{
+						"match": {
+							".type": "host"
+						},
+						"option": [
+							"*"
+						]
+					}
+				],
+				"firewall": [
+					{
+						"match": {
+							".type": "settings",
+							".name": "settings"
+						},
+						"option": [
+							"disabled"
+						]
+					},
+					{
+						"match": {
+							".type": "zone"
+						},
+						"option": [
+							"masq",
+							"name",
+							"network"
+						]
+					},
+					{
+						"match": {
+							".type": "redirect"
+						},
+						"option": [
+							"*"
+						]
+					},
+					{
+						"match": {
+							".type": "rule"
+						},
+						"option": [
+							"*"
+						]
+					},
+					{
+						"match": {
+							".type": "dmz"
+						},
+						"option": [
+							"enabled",
+							"host",
+							"ip6addr"
+						]
+					}
+				],
+				"network": [
+					{
+						"match": {
+							".type": "interface"
+						},
+						"option": [
+							"*"
+						]
+					}
+				],
+				"wireless": [
+					{
+						"match": {
+							".type": "wifi-status"
+						},
+						"option": [
+							"wps"
+						]
+					},
+					{
+						"match": {
+							".type": "wifi-iface",
+							"mode": "ap"
+						},
+						"option": [
+							"*"
+						]
+					},
+					{
+						"match": {
+							".type": "wifi-device"
+						},
+						"option": [
+							"channel"
+						]
+					}
+				]
+			},
+			"owsd": [
+				"client",
+				"wifi.radio",
+				"wifi.sta",
+				"wifi.wps"
+			]
+		}
+	}
+}

libcgroup/Makefile

@@ -1,105 +0,0 @@
-#
-# Copyright (C) 2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libcgroup
-PKG_VERSION:=0.41
-PKG_RELEASE:=1
-
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILES:=COPYING
-
-PKG_SOURCE_VERSION:=2186c97f60df7efe86ddadd5e3d9d36dd4923b98
-
-PKG_SOURCE_URL:=git://git.code.sf.net/p/libcg/libcg
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)+git$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-#PKG_BUILD_PARALLEL:=1
-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/libcgroup
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libpthread
-  TITLE:=Control group configuration library
-  URL:=https://sourceforge.net/p/libcg/
-endef
-
-define Package/libcgroup/description
-  Control groups, a new kernel feature in Linux 2.6.24 provides a file system
-  interface to manipulate and control the details on task grouping including
-  creation of new task groups (control groups), permission handling and task
-  assignment.
-endef
-
-define Package/libcgroup-daemon
-  SECTION:=base
-  CATEGORY:=Base system
-  DEPENDS:=+libcgroup +librt
-  TITLE:=Control group management daemon
-  URL:=https://sourceforge.net/p/libcg/
-endef
-
-define Package/libcgroup-utils
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libcgroup
-  TITLE:=Control group configuration utilities
-  URL:=https://sourceforge.net/p/libcg/
-endef
-
-#define Package/libcgroup/conffiles
-#	/etc/config/cgroups
-#endef
-
-CONFIGURE_ARGS += \
-		--disable-bindings \
-		--disable-pam \
-		--enable-static \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/libcgroup
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libcgroup/*.h $(1)/usr/include/libcgroup/
-
-	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libcgroup.* $(1)/usr/lib/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libcgroup.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libcgroup/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libcgroup.so* $(1)/usr/lib/
-endef
-
-define Package/libcgroup-daemon/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin
-
-	# move to its own package?
-	$(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d
-	$(INSTALL_CONF) ./files/cgroups.config $(1)/etc/config/cgroups
-	$(INSTALL_BIN) ./files/cgroups.init $(1)/etc/init.d/cgroups
-endef
-
-define Package/libcgroup-utils/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
-endef
-
-$(eval $(call BuildPackage,libcgroup))
-$(eval $(call BuildPackage,libcgroup-daemon))
-$(eval $(call BuildPackage,libcgroup-utils))

libcgroup/files/cgroups.config

@@ -1,40 +0,0 @@
-config cgroups cgroups
-	option enabled 1
-	option defgroup iopsys/normal
-
-config cgroup _root_
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup iopsys
-	list option cpu.shares=4096
-	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 memory.limit_in_bytes=-1
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup iopsys_high
-	list option cpu.shares=4096
-	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 memory.limit_in_bytes=75M
-	list option memory.move_charge_at_immigrate=1
-
-config cgroup 3prt_normal
-	list option cpu.shares=1024
-	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 memory.limit_in_bytes=75M
-	list option memory.move_charge_at_immigrate=1
-
-config procmap procmap
-	list procmap minidlna=3prt/normal
-

libcgroup/files/cgroups.init

@@ -1,123 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=01
-USE_PROCD=1
-#PROCD_DEBUG=1
-NAME=cgrulesengd
-
-CGBASEDIR=/sys/fs/cgroup
-CGCONFIG="cgroups"
-
-CGRULESCONF=/tmp/cgrules.conf
-CGCONFIGCONF=/tmp/cgconfig.conf
-
-
-cgroupinit_add_knob_val_to_list () {
-CG_KNOB_VAL_LIST="$CG_KNOB_VAL_LIST
-$1"
-}
-
-cgroupinit_create_group () {
-	local cgrp=$1
-	local dir curr
-
-	if [ "$cgrp" == "_root_" ]; then
-		dir=.
-	else
-		dir=$(echo $cgrp |tr '_' '/')
-	fi
-
-	echo -e "group $dir {" >> $CGCONFIGCONF
-
-	CG_KNOB_VAL_LIST=
-	config_list_foreach $cgrp option cgroupinit_add_knob_val_to_list
-	CG_KNOB_VAL_LIST=$(echo "$CG_KNOB_VAL_LIST" |sort)
-	curr="_none_"
-
-	for knob_val in $CG_KNOB_VAL_LIST ; do
-		local ctrlr knob val
-		
-		knob=$(echo $knob_val |awk -F= '{print $1}')
-		ctrlr=$(echo $knob |awk -F. '{print $1}')
-		val=$(echo $knob_val |awk -F= '{print $2}')
-
-		if [ "$curr" != "$ctrlr" ]; then
-			[ "$curr" == "_none_" ] || echo -e "\t}" >> $CGCONFIGCONF
-			curr=$ctrlr
-			echo -e "\t$curr {" >> $CGCONFIGCONF
-		fi
-
-		echo -e "\t\t$knob = \"$val\";" >> $CGCONFIGCONF
-	done
-
-	[ "$curr" == "_none_" ] || echo -e "\t}" >> $CGCONFIGCONF
-	echo -e "}\n" >> $CGCONFIGCONF
-}
-
-cgroupinit_add_to_rules () {
-	local name_grp=$1
-	local name grp
-
-	name=$(echo $name_grp |awk -F= '{print $1}')
-	grp=$(echo $name_grp |awk -F= '{print $2}')
-
-	echo -e "*:$name\t*\t$grp" >> $CGRULESCONF
-}
-
-cgroupinit_generate_config () {
-	local enab defgrp
-
-	config_load $CGCONFIG
-
-	config_get enab cgroups enabled "1"
-	[ $enab -eq 0 ] && return 1
-
-	config_get defgrp cgroups defgroup "_undef_"
-	[ "$defgrp" == "_undef_" ] && return 1
-
-	# mount here instead of in cgconfigparser to get all options right
-	# mounting without any controllers listed means mount all available
-	if ! grep -q " $CGBASEDIR cgroup " /proc/mounts; then
-		mount -t cgroup -o nodev,noexec,nosuid cgroup $CGBASEDIR
-		[ $? -eq 0 ] || return 1
-	fi
-
-	echo -n '' > $CGCONFIGCONF
-	config_foreach cgroupinit_create_group cgroup
-
-	echo -n '' > $CGRULESCONF
-	config_list_foreach procmap procmap cgroupinit_add_to_rules
-	echo -e "*\t*\t$defgrp" >> $CGRULESCONF
-
-	return 0
-}
-
-# cgrulesengd has hardcoded paths for configuration files
-# use symlinks to point to generated config files
-cgroupinit_cgrulesengd_fixup () {
-	[ -r /etc/cgrules.conf ] || ln -s $CGRULESCONF /etc/cgrules.conf
-	[ -r /etc/cgconfig.conf ] || ln -s $CGCONFIGCONF /etc/cgconfig.conf
-	[ -d /etc/cgconfig.d ] || mkdir /etc/cgconfig.d
-}
-
-start_service () {
-	cgroupinit_generate_config
-	[ $? -eq 0 ] || return
-
-	cgroupinit_cgrulesengd_fixup
-	/usr/sbin/cgconfigparser -l $CGCONFIGCONF || return
-
-	procd_open_instance
-	procd_set_param command /usr/sbin/cgrulesengd --nodaemon --syslog
-	procd_set_param respawn
-	procd_close_instance
-}
-
-stop_service () {
-	/usr/sbin/cgclear
-}
-
-service_triggers() {
-        procd_add_reload_trigger $CGCONFIG
-}
-

libmicroxml/Makefile

@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2012-2014 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:=libmicroxml
+PKG_VERSION:=2012-06-11
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/mirror/microxml.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=72965423184f24cc0b963d91c2d1863cdb01b6aa
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+PKG_LICENSE:=LGPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libmicroxml
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=XML library
+  MAINTAINER:=Luka Perkov <luka@openwrt.org>
+endef
+
+define Package/libmicroxml/description
+ A micro sized XML library
+endef
+
+CONFIGURE_ARGS += \
+	--disable-threads \
+	--enable-static \
+	--enable-shared
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/microxml.h $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_BUILD_DIR)/microxml.pc $(1)/usr/lib/pkgconfig
+endef
+
+define Package/libmicroxml/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,libmicroxml))

libmicroxml/patches/100-fix-memleak.patch

@@ -0,0 +1,130 @@
+diff --git a/mxml-file.c b/mxml-file.c
+index 02eca9d..f10d202 100644
+--- a/mxml-file.c
++++ b/mxml-file.c
+@@ -363,9 +363,12 @@ mxmlSaveFile(mxml_node_t    *node,	/* I - Node to write */
+   * Write the node...
+   */
+ 
+-  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc, global)) < 0)
++  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc, global)) < 0){
++    global_free(global);
+     return (-1);
+-
++  }
++  
++  global_free(global);
+   if (col > 0)
+     if (putc('\n', fp) < 0)
+       return (-1);
+@@ -1448,6 +1451,7 @@ mxml_load_data(
+   if ((buffer = malloc(64)) == NULL)
+   {
+     mxml_error("Unable to allocate string buffer!");
++    global_free(global);
+     return (NULL);
+   }
+ 
+@@ -2083,11 +2087,12 @@ mxml_load_data(
+ 		 node->parent ? node->parent->value.element.name : "(null)");
+ 
+       mxmlDelete(first);
+-
++      global_free(global);
+       return (NULL);
+     }
+   }
+ 
++  global_free(global);
+   if (parent)
+     return (parent);
+   else
+@@ -2102,7 +2107,7 @@ error:
+   mxmlDelete(first);
+ 
+   free(buffer);
+-
++  global_free(global);
+   return (NULL);
+ }
+ 
+diff --git a/mxml-private.c b/mxml-private.c
+index 4378ca3..ea6e452 100644
+--- a/mxml-private.c
++++ b/mxml-private.c
+@@ -41,6 +41,32 @@
+  * This code currently supports AIX, HP-UX, Linux, Mac OS X, Solaris, and
+  * Windows.  It might work on the BSDs and IRIX, but I haven't tested that.
+  */
++void *global_mem[16] = {0};
++
++static void *global_calloc(int x, int size)
++{
++  int i;
++  void *m = calloc(x, size);
++  for (i = ((sizeof(global_mem)/sizeof(global_mem[0])) - 1); i > 0; i--) {
++    global_mem[i] = global_mem[i-1];
++  }
++  global_mem[0] = m;
++  return m;
++}
++
++void global_free(void *m)
++{
++  int i;
++  if (m == NULL)
++    return;
++  for (i = ((sizeof(global_mem)/sizeof(global_mem[0])) - 1); i >= 0; i--) {
++    if (global_mem[i] == m) {
++      global_mem[i] = NULL;
++      free(m);
++      break;
++    }
++  }
++}
+ 
+ #if defined(__sun) || defined(_AIX)
+ #  pragma fini(_mxml_fini)
+@@ -148,7 +174,6 @@ mxml_real_cb(mxml_node_t *node)		/* I - Current node */
+   return (MXML_REAL);
+ }
+ 
+-
+ #ifdef HAVE_PTHREAD_H			/**** POSIX threading ****/
+ #  include <pthread.h>
+ 
+@@ -190,7 +215,6 @@ _MXML_FINI(void)
+   }
+ }
+ 
+-
+ /*
+  * '_mxml_global()' - Get global data.
+  */
+@@ -205,7 +229,7 @@ _mxml_global(void)
+ 
+   if ((global = (_mxml_global_t *)pthread_getspecific(_mxml_key)) == NULL)
+   {
+-    global = (_mxml_global_t *)calloc(1, sizeof(_mxml_global_t));
++    global = (_mxml_global_t *)global_calloc(1, sizeof(_mxml_global_t));
+     pthread_setspecific(_mxml_key, global);
+ 
+     global->num_entity_cbs = 1;
+@@ -288,7 +312,7 @@ _mxml_global(void)
+ 
+   if ((global = (_mxml_global_t *)TlsGetValue(_mxml_tls_index)) == NULL)
+   {
+-    global = (_mxml_global_t *)calloc(1, sizeof(_mxml_global_t));
++    global = (_mxml_global_t *)global_calloc(1, sizeof(_mxml_global_t));
+ 
+     global->num_entity_cbs = 1;
+     global->entity_cbs[0]  = _mxml_entity_cb;
+diff --git a/mxml-private.h b/mxml-private.h
+index c591208..72ed338 100644
+--- a/mxml-private.h
++++ b/mxml-private.h
+@@ -43,3 +43,4 @@ typedef struct _mxml_global_s
+ extern _mxml_global_t	*_mxml_global(void);
+ extern int		_mxml_entity_cb(const char *name);
+ 
++extern void global_free(void *m);

libpicoevent/Makefile

@@ -8,14 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.2
+PKG_VERSION:=0.3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libpicoevent.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7875222706cb6999af0361ef0aebdc85cd75c127
+PKG_SOURCE_VERSION:=f446f186102539cceedaa15a95a33547ac3c1fd7
 PKG_NAME:=libpicoevent
 
+PKG_LICENSE:=LGPL-2.1-only
+PKG_LICENSE_FILES:=LICENSE
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
 
 include $(INCLUDE_DIR)/package.mk
 

librpc/Makefile

@@ -0,0 +1,33 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=librpc
+PKG_RELEASE=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL=$(LEDE_GIT)/project/librpc-uclibc.git
+PKG_SOURCE_DATE:=2015-11-04
+PKG_SOURCE_VERSION:=a921e3ded051746f9f7cd5e5a312fb6771716aac
+PKG_MIRROR_HASH:=22c8dc55e1c4e8e31635a37708a3ce622a6ca33ebd918a4321b0be6ffce89b21
+CMAKE_INSTALL:=1
+PKG_USE_MIPS16:=0
+
+PKG_LICENSE:=LGPL-2.1
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/librpc
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=uClibc RPC library
+endef
+
+define Package/librpc/install
+	$(INSTALL_DIR) $(1)/lib/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/librpc.so $(1)/lib/
+endef
+
+$(eval $(call BuildPackage,librpc))

libtrace/Makefile

@@ -11,6 +11,7 @@ PKG_SOURCE_VERSION:=e4b4c5cce35a52da152776a00532aa0b80879c5b
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=COPYING
@@ -18,9 +19,10 @@ PKG_LICENSE_FILES:=COPYING
 PKG_INSTALL:=1
 PKG_FIXUP:=autoreconf
 
-include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
+CXX_DEPENDS:=libstdcpp
+
 define Package/libtrace/Default
   SECTION:=net
   CATEGORY:=Network
@@ -33,7 +35,7 @@ define Package/libtrace
   CATEGORY:=Libraries
   TITLE:=Libtrace library for packet trace processing
   URL:=http://research.wand.net.nz/software/libtrace.php
-  DEPENDS:=+libpcap +libpthread +zlib +libbz2 +liblzo +librt $(CXX_DEPENDS)
+  DEPENDS:=+libpcap +libpthread +zlib +libbz2 +liblzo +librt +liblzma +$(CXX_DEPENDS)
 endef
 
 define Package/libtrace/description

logrotate/Makefile

@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=logrotate
-PKG_VERSION:=3.7.1
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
-PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/l/logrotate
-PKG_MD5SUM:=552639142e163745f6bcd4f1f3816d8a
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/logrotate
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+libpopt
-  TITLE:=rotates, compresses, and mails system logs
-endef
-
-define Build/Compile
-	$(call Build/Compile/Default, \
-		RPM_OPT_FLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS)" \
-		LDFLAGS="$(EXTRA_LDFLAGS)" \
-		logrotate \
-	)
-endef
-
-define Package/logrotate/install	
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) ${PKG_BUILD_DIR}/logrotate $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc
-	$(CP) ./files/logrotate.conf $(1)/etc/
-	$(INSTALL_DIR) $(1)/etc/logrotate.d
-endef
-
-$(eval $(call BuildPackage,logrotate))

logrotate/files/logrotate.conf

@@ -1,30 +0,0 @@
-# rotate log files weekly
-weekly
-#daily
-
-# keep 4 weeks worth of backlogs
-rotate 4
-
-# create new (empty) log files after rotating old ones
-create
-
-notifempty
-nomail
-#olddir /var/log/backup/
-missingok
-#dateext
-
-# uncomment this if you want your log files compressed
-#compress
-
-# packages can drop log rotation information into this directory
-include /etc/logrotate.d
-
-# no packages own lastlog or wtmp -- we'll rotate them here
-#/var/log/wtmp {
-#    monthly
-#    create 0664 root utmp
-#    rotate 1
-#}
-
-# system-specific logs may be also be configured here.