iopsys-analytics: remove syslog-ng from depends

* this package is selected as backend by logmngr

bbfdm/Config_bbfdm.in

@@ -1,3 +1,4 @@
+if PACKAGE_libbbfdm
 config BBF_VENDOR_LIST
 	string "Vendor List"
 	default "iopsys"
@@ -6,14 +7,11 @@ config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
 	default "X_IOPSYS_EU_"
 
-config BBF_TR143
-	bool "Enable TR-143 Data Model Support"
-	default y
-
-config BBF_TR471
-	bool "Enable TR-471 Data Model Support"
-	default y
+config BBF_OBFUSCATION_KEY
+	string "Obfuscation key"
+	default "371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04"
 
 config BBF_MAX_OBJECT_INSTANCES
 	int "Maximum number of instances per object"
 	default 255
+endif

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.7.4
+PKG_VERSION:=1.9.16
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=57a3aedb8f6dea2a951d3edf1da0c868e252b27c
+PKG_SOURCE_VERSION:=93a6f6f51c3edb88aa63f150ef077d9f70cb883b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -37,8 +37,8 @@ define Package/libbbfdm
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api \
-	    +BBF_TR471:obudpst +libopenssl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +libopenssl
+  MENU:=1
 endef
 
 define Package/bbfdmd
@@ -46,19 +46,36 @@ define Package/bbfdmd
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Datamodel ubus backend
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +libbbfdm
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +libbbfdm +jq +bbf_configmngr
+endef
+
+define Package/bbf_configmngr
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:= BBF Config Manager
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
+  MENU:=1
 endef
 
 define Package/libbbfdm/config
 	source "$(SOURCE)/Config_bbfdm.in"
 endef
 
+define Package/bbf_configmngr/config
+	source "$(SOURCE)/bbf_configmngr.in"
+endef
+
 define Package/libbbfdm-api/description
  Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
 endef
 
 define Package/libbbfdm/description
- Library contains the data model tree. It includes TR181, TR143 data models
+ Library contains the data model tree, It includes basic TR181 nodes.
+endef
+
+define Package/bbf_configmngr/description
+ Daemon for handling bbf reload services via ubus bbf.config
 endef
 
 ifeq ($(USE_LOCAL),1)
@@ -69,17 +86,6 @@ endif
 
 CMAKE_OPTIONS += \
 	-DBBF_TR181=ON
-	-DBBF_WIFI_DATAELEMENTS=ON
-
-ifeq ($(CONFIG_BBF_TR143),y)
-CMAKE_OPTIONS += \
-	-DBBF_TR143=ON
-endif
-
-ifeq ($(CONFIG_BBF_TR471),y)
-CMAKE_OPTIONS += \
-	-DBBF_TR471=ON
-endif
 
 CMAKE_OPTIONS += \
 	-DBBF_VENDOR_LIST:String="$(CONFIG_BBF_VENDOR_LIST)" \
@@ -94,30 +100,37 @@ endif
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
+
+	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.secure $(1)/usr/libexec/rpcd/bbf.secure
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
+
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts/
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_api $(1)/usr/share/bbfdm/scripts/
+
+	$(INSTALL_DIR) $(1)/etc/bbfdm/certificates
+	echo "$(CONFIG_BBF_OBFUSCATION_KEY)" > $(1)/etc/bbfdm/.secure_hash
 endef
 
 define Package/libbbfdm/install
-	$(INSTALL_DIR) $(1)/lib
-	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
+
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/usr/share/bbfdm/libbbfdm.so
+
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/lib/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
-	$(INSTALL_BIN) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/95-portmap-firewall
-	$(INSTALL_BIN) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/97-firewall-service
-	$(INSTALL_BIN) ./files/etc/uci-defaults/99-link-core-plugins $(1)/etc/uci-defaults/99-link-core-plugins
-	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
-	$(INSTALL_BIN) ./files/etc/firewall.service $(1)/etc/firewall.service
+
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/etc/uci-defaults/91-fix-bbfdmd-enabled-option $(1)/etc/uci-defaults/
+
 ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
-	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/iopsys/libbbfdm_iopsys_ext.so)
-endif	
-ifeq ($(CONFIG_BBF_TR143),y)
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm/scripts/* $(1)/usr/share/bbfdm
-	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
+	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/iopsys/libbbfdm_iopsys_ext.so $(1)
 endif
+
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts/
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_activate_handler.sh $(1)/usr/share/bbfdm/scripts/
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/share/bbfdm/scripts/bbf_check_idle.sh $(1)/usr/share/bbfdm/scripts/
 endef
 
 define Package/libbbfdm/prerm
@@ -135,11 +148,24 @@ define Package/bbfdmd/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
 	$(INSTALL_DATA) ./files/etc/bbfdm/input.json $(1)/etc/bbfdm/
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
+	$(INSTALL_BIN) ./files/etc/init.d/bbfdm.services $(1)/etc/init.d/
 	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
-	$(INSTALL_BIN) ./files/etc/bbfdm/bbfdm_services.sh $(1)/etc/bbfdm/
 	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
 endef
 
+define Package/bbf_configmngr/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+ifeq ($(CONFIG_BBF_CONFIGMNGR_C_BACKEND),y)
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/bbf_configd $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/etc/init.d/bbf_configd $(1)/etc/init.d/bbf_configd
+endif
+ifeq ($(CONFIG_BBF_CONFIGMNGR_SCRIPT_BACKEND),y)
+	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
+	$(CP) $(PKG_BUILD_DIR)/utilities/files/usr/libexec/rpcd/bbf.config $(1)/usr/libexec/rpcd/bbf.config
+endif
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
@@ -148,6 +174,7 @@ define Build/InstallDev
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/*.h $(1)/usr/include/
 endef
 
+$(eval $(call BuildPackage,bbf_configmngr))
 $(eval $(call BuildPackage,libbbfdm-api))
 $(eval $(call BuildPackage,libbbfdm))
 $(eval $(call BuildPackage,bbfdmd))

bbfdm/README.md

@@ -0,0 +1,38 @@
+# BBFDM configuration options and utilities
+
+bbfdm provides few compile time configuration options and compile time help utility called [bbfdm.mk](./bbfdm.mk), this document aimed to explain the available usages and best practices.
+
+## Compilation options
+
+|  Configuration option    | Description   | Default Value |
+| -----------------------  | ------------- | ----------- |
+| CONFIG_BBF_VENDOR_LIST   | List of vendor extension directories | iopsys        |
+| CONFIG_BBF_VENDOR_PREFIX | Prefix for Vendor extension datamodel objects/parameters | X_IOPSYS_EU_  |
+| CONFIG_BBF_MAX_OBJECT_INSTANCES | Maximum number of instances per object | 255    |
+| BBF_OBFUSCATION_KEY      | Hash used to encode/decode in `bbf.secure` object | 371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04 |
+
+
+#### BBF_OBFUSCATION_KEY
+
+`bbfdm` provides an ubus object called `bbf.secure` to allow encoding/decoding the values, `bbf.secure` currently support following methods internally to encode/decode
+
+  - Encode/Decode using a predefined SHA512 Hash key
+  - Encode/Decode using a private/public RSA key pair
+
+The `BBF_OBFUSCATION_KEY` compile time configuration option used to defined the SHA512 HASH, if this option is undefined, then it usages a default value as mention in the above table.
+
+User must override this parameter with their own hash value, to generate a hash user can run below command and copy the hash value to this option.
+
+ex: User wants to use 'Sup3rS3cur3Passw0rd' as passkey, then can get the SHA512 sum with
+
+```bash
+$ echo -n "Sup3rS3cur3Passw0rd" | sha512sum
+371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04  -
+```
+
+> Note: Additionally, user can install RSA private key in '/etc/bbfdm/certificates/private_key.pem' path, if private key is present `bbf.secure` shall use rsa private certificate for encrypt/decrypt function. In case of key not present in the pre-defined path, hash will be used for the same.
+
+## Helper utility (bbfdm.mk)
+
+bbfdm provides a helper utility [bbfdm.mk](./bbfdm.mk) to install datamodel plugins in bbfdm core or in microservice directory.
+

bbfdm/bbf_configmngr.in

@@ -0,0 +1,19 @@
+if PACKAGE_bbf_configmngr
+choice
+	prompt "Select backend daemon for bbf.config"
+	default BBF_CONFIGMNGR_C_BACKEND
+	help
+		Select which backend daemon should be used for ubus bbf.config
+
+config BBF_CONFIGMNGR_SCRIPT_BACKEND
+	bool "Use shell script backend"
+	help
+		Enable this option to use shell script as the backend for bbf.config. This can be useful for quick and easy scripting of configuration tasks.
+
+config BBF_CONFIGMNGR_C_BACKEND
+	bool "Use C code backend"
+	help
+		Enable this option to use a C code implementation as the backend for bbf.config. This option is generally preferred for performance-critical tasks and scenarios requiring more robust and efficient handling.
+
+endchoice
+endif

bbfdm/bbfdm.mk

@@ -2,8 +2,113 @@
 # Copyright (C) 2023 IOPSYS
 #
 
+BBFDM_BASE_DM_PATH=/usr/share/bbfdm
+BBFDM_INPUT_PATH=/etc/bbfdm/micro_services
+BBFDM_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+
+#BBFDM_VERSION:=$(shell grep -oP '(?<=^PKG_VERSION:=).*' ${BBFDM_DIR}/Makefile)
+#BBFDM_TOOLS:=$(BUILD_DIR)/bbfdm-$(BBFDM_VERSION)/tools
+
+# Utility to install the plugin in bbfdm core path with priority.
+# Its now possible to overwrite/remove core datamodel with plugin, so, if some
+# datamodel objects/parameters are present in more than one plugin, order in
+# which they loaded into memory becomes crucial, this Utility help to configure
+# a priority order in which they gets loaded in memory.
+#
+# ARGS:
+#  $1 => Plugin artifact
+#  $2 => package install directory
+#  $3 => Priority of the installed plugin (Optional)
+#
+# Note:
+# - Last loaded plugin gets the highest priority
+#
+# Example:
+#  BBFDM_INSTALL_CORE_PLUGIN ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)
+#
+# Example to install plugin with priority:
+#  BBFDM_INSTALL_CORE_PLUGIN ./files/etc/bbfdm/json/CWMPManagementServer.json $(1) 01
+#
+BBFDM_INSTALL_CORE_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -p
+
+
+# Utility to install the micro-service datamodel
+# Use Case:
+# user wants to run a datamodel micro-service, it required to install the
+# DotSO/JSON plugin into a bbf shared directory, this utility helps in
+# installing the DotSO/JSON plugin in bbfdm shared directory, and auto-generate
+# input file for the micro-service
+#
+# ARGS:
+#  $1 => DotSo or Json plugin with complete path
+#  $2 => package install directory
+#  $3 => service name
+#
+# Note:
+# - There could be only one main plugin file, so its bind to PKG_NAME
+# - Micro-service input.json will be auto generated with this call
+# - Use -u (optional argument) to overwrite ubus object name
+#
+# Example:
+#  BBFDM_INSTALL_MS_DM $(PKG_BUILD_DIR)/libcwmp.so $(1) $(PKG_NAME)
+#
+BBFDM_INSTALL_MS_DM:=$(BBFDM_DIR)/tools/bbfdm.sh -m
+
+
+# Utility to install a plugins in datamodel micro-service
+#
+# ARGS:
+#  $1 => DotSo or Json plugin with complete path
+#  $2 => package install directory
+#  $3 => service name
+#
+# Note:
+# - Use the service_name/PKG_NAME of the service in which this has to run
+#
+# Example:
+#  BBFDM_INSTALL_MS_PLUGIN $(PKG_BUILD_DIR)/libxmpp.so $(1) icwmp
+#
+BBFDM_INSTALL_MS_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -m -p
+
+# Utility to install the helper scripts in default bbfdm script path
+#
+# Use Case:
+# User want to install some script for running diagnostics
+#
+# ARGS:
+#  $1 => Script with complete path
+#  $2 => package install directory
+#
+# Note:
+# - Use with -d option to install script in bbf.diag directory
+#
+# Example:
+#  BBFDM_INSTALL_SCRIPT $(PKG_BUILD_DIR)/download $(1)
+#  BBFDM_INSTALL_SCRIPT -d $(PKG_BUILD_DIR)/ipping $(1)
+#
+BBFDM_INSTALL_SCRIPT:=$(BBFDM_DIR)/tools/bbfdm.sh -s
+
+# Deprecated functions errors
+define BbfdmInstallPluginInMicroservice
+	$(warning # BbfdmInstallPluginInMicroservice function is deprecated, use BBFDM_INSTALL_MS_PLUGIN macro #)
+	$(INSTALL_DIR) $(1)
+	$(INSTALL_DATA) $(2) $(1)/
+endef
+
+define BbfdmInstallMicroServiceInputFile
+	$(warning # function BbfdmInstallMicroServiceInputFile deprecated, input file auto generated with BBFDM_INSTALL_MS_DM #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/micro_services
+	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/micro_services/$(PKG_NAME).json
+endef
 
 define BbfdmInstallPlugin
+	$(warning # function BbfdmInstallPlugin deprecated, use BBFDM_INSTALL_CORE_PLUGIN macro #)
 	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
 	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/plugins/
 endef
+
+define BbfdmInstallPluginWithPriority
+	$(warning # fucntion BbfdmInstallPluginWithPriority deprecated, use BBFDM_INSTALL_CORE_PLUGIN #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
+	$(INSTALL_DATA) $(3) $(1)/etc/bbfdm/plugins/$(2)_$(shell basename ${3})
+endef

bbfdm/files/etc/bbfdm/bbfdm_services.sh

@@ -1,47 +0,0 @@
-#!/bin/sh
-
-BBFDMD="/usr/sbin/bbfdmd"
-
-bbfdm_add_service()
-{
-	local name path
-
-	name="${1}"
-	path="${2}"
-
-	if [ -z "${name}" -o -z "$path" ]; then
-		return 0;
-	fi
-
-	ubus call service add "{'name':'bbfdm.services','instances':{'$name':{'command':['$BBFDMD','-m','$path']}}}"
-}
-
-bbfdm_stop_service()
-{
-	local name
-
-	name="${1}"
-	if [ -z "${name}" ]; then
-		return 0;
-	fi
-
-	if ubus call service list '{"name":"bbfdm.services"}' |grep -q "bbfdm.$name"; then
-		ubus call service delete "{'name':'bbfdm.services','instance':'bbfdm.$name'}"
-	fi
-}
-
-usages()
-{
-	echo "Usages $0: <OPTIONS>..."
-	echo
-	echo "    -h    show help"
-	echo "    -k    micro-service name to stop"
-	echo
-}
-
-while getopts "s:k:h" opts; do
-	case "$opts" in
-		h) usages; exit 0;;
-		k) bbfdm_stop_service "${OPTARG}";;
-	esac
-done

bbfdm/files/etc/bbfdm/input.json

@@ -4,8 +4,8 @@
                 },
                 "input": {
                         "type": "DotSo",
-                        "name": "/lib/libbbfdm.so",
-                        "plugin_dir": "/etc/bbfdm/plugins"
+                        "name": "/usr/share/bbfdm/libbbfdm.so",
+                        "plugin_dir": "/usr/share/bbfdm/plugins"
                 },
                 "output": {
                         "type": "UBUS",

bbfdm/files/etc/config/bbfdm

@@ -1,8 +1,11 @@
-
 config bbfdmd 'bbfdmd'
-	option enabled '1'
+	option enable '1'
 	option loglevel '1'
-	option refresh_time '10'
+	option refresh_time '120'
 	option transaction_timeout '30'
 	option subprocess_level '2'
 
+config micro_services 'micro_services'
+	option enable '1'
+	option enable_core '0'
+	option enable_respawn '1'

bbfdm/files/etc/init.d/bbf_configd

@@ -0,0 +1,15 @@
+#!/bin/sh /etc/rc.common
+
+START=64
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/bbf_configd
+
+start_service()
+{
+	procd_open_instance "bbf_configd"
+	procd_set_param command ${PROG}
+	procd_set_param respawn
+	procd_close_instance "bbf_configd"
+}

bbfdm/files/etc/init.d/bbfdm.services

@@ -0,0 +1,106 @@
+#!/bin/sh /etc/rc.common
+
+START=40
+STOP=8
+
+USE_PROCD=1
+PROG=/usr/sbin/bbfdmd
+
+BBFDM_MICROSERVICE_DIR="/etc/bbfdm/micro_services"
+
+. /usr/share/libubox/jshn.sh
+
+log() {
+	echo "${@}"|logger -t bbfdmd.services -p info
+}
+
+validate_bbfdm_micro_service_section()
+{
+	uci_validate_section bbfdm micro_services "micro_services" \
+		'enable:bool:true' \
+		'enable_core:bool:false' \
+		'enable_respawn:bool:true'
+}
+
+_add_microservice()
+{
+	local name path
+	local enable enable_core enable_respawn
+
+	# Check enable from micro-service
+	path="${1}"
+	enable_respawn="${2}"
+	enable_core="${3}"
+
+	name="$(basename ${path})"
+	name="${name//.json}"
+
+	enable="$(jq -r '.daemon.enable//1' ${path})"
+	if [ "${enable}" -eq "0" ]; then
+		log "datamodel micro-service ${name} not enabled"
+		return 0
+	fi
+
+	procd_open_instance "${name}"
+
+	procd_set_param command ${PROG}
+	procd_append_param command -m "${name}"
+
+	if [ "${enable_core}" -eq "1" ]; then
+		procd_set_param limits core="unlimited"
+		procd_set_param stdout 1
+		procd_set_param stderr 1
+	fi
+
+	if [ "${enable_respawn}" -eq "1" ]; then
+		procd_set_param respawn "3600" "5" "5"
+	fi
+	procd_close_instance "${name}"
+}
+
+configure_bbfdm_micro_services()
+{
+	local enable enable_core enable_respawn
+
+	config_load bbfdm
+	validate_bbfdm_micro_service_section || {
+		log "Validation of micro_service section failed"
+		return 1;
+	}
+
+	[ "${enable}" -eq "0" ] && return 0
+
+	if [ -d "${BBFDM_MICROSERVICE_DIR}" ]; then
+		FILES="$(ls -1 ${BBFDM_MICROSERVICE_DIR}/*.json)"
+
+		for file in $FILES;
+		do
+			[ -e "$file" ] || continue
+
+			_add_microservice $file "${enable_respawn}" "${enable_core}"
+		done
+	fi
+}
+
+_start_single_service()
+{
+	local service file
+
+	service="${1}"
+
+	if [ -d "${BBFDM_MICROSERVICE_DIR}" ]; then
+		file="$(ls -1 ${BBFDM_MICROSERVICE_DIR}/${service}.json)"
+		[ -e "$file" ] || return
+
+		_add_microservice $file "0" "0"
+	fi
+}
+
+start_service()
+{
+	if [ -n "${1}" ]; then
+		_start_single_service "${1}"
+	else
+		configure_bbfdm_micro_services
+	fi
+}

bbfdm/files/etc/init.d/bbfdmd

@@ -7,7 +7,9 @@ USE_PROCD=1
 PROG=/usr/sbin/bbfdmd
 
 BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
-BBFDM_TEMP_JSON="/tmp/bbfdm/input.json"
+BBFDM_TEMP_DIR="/tmp/bbfdm"
+
+. /usr/share/libubox/jshn.sh
 
 log() {
 	echo "${@}"|logger -t bbfdmd.init -p info
@@ -16,7 +18,7 @@ log() {
 validate_bbfdm_bbfdmd_section()
 {
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
-		'enabled:bool:true' \
+		'enable:bool:true' \
 		'sock:string' \
 		'debug:bool:false' \
 		'loglevel:uinteger:1' \
@@ -27,20 +29,19 @@ validate_bbfdm_bbfdmd_section()
 
 configure_bbfdmd()
 {
-	local enabled debug sock update
+	local enable debug sock
 	local jlog jrefresh jtimeout jlevel
 
-	update=0
 	config_load bbfdm
 	validate_bbfdm_bbfdmd_section || {
 		log "Validation of bbfdmd section failed"
 		return 1;
 	}
 
-	[ "${enabled}" -eq 0 ] && return 0
+	[ "${enable}" -eq 0 ] && return 0
 
 	if [ -f "${BBFDM_JSON_INPUT}" ]; then
-		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > ${BBFDM_TEMP_JSON}
+		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > "${BBFDM_TEMP_DIR}/input.json"
 	fi
 
 	procd_set_param command ${PROG}
@@ -56,18 +57,12 @@ configure_bbfdmd()
 
 start_service()
 {
-	mkdir -p /tmp/bbfdm
+	mkdir -p ${BBFDM_TEMP_DIR}
+
 	procd_open_instance "bbfdm"
 	configure_bbfdmd
 	procd_set_param respawn
 	procd_close_instance "bbfdm"
-
-	ubus call service state '{"name":"bbfdm.services", "spawn":true}'
-}
-
-stop_service()
-{
-	ubus call service state '{"name":"bbfdm.services", "spawn":false}'
 }
 
 service_triggers()

bbfdm/files/etc/uci-defaults/91-fix-bbfdmd-enabled-option

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# rename bbfdmd enabled option to enable
+val="$(uci -q get bbfdm.bbfdmd.enabled)"
+if [ -n "${val}" ]; then
+	uci -q set bbfdm.bbfdmd.enabled=""
+	uci -q set bbfdm.bbfdmd.enable="${val}"
+fi
+
+exit 0
+

bbfdm/files/etc/uci-defaults/99-link-core-plugins

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-UNIFIED_PATH="/etc/bbfdm/plugins/"
-
-# Link JSON plugins
-for f in `ls -1 /etc/bbfdm/json/*.json`; do
-	echo "# BBFDM JSON plugin ${f} not aligned #"
-	ln -s ${f} "${UNIFIED_PATH}"
-done
-
-# Link DotSo plugins
-for f in `ls -1 /usr/lib/bbfdm/*.so`; do
-	echo "# BBFDM DotSO plugin ${f} not aligned #"
-	ln -s ${f} "${UNIFIED_PATH}"
-done
-
-exit 0
-

bbfdm/tools/bbfdm.sh

@@ -0,0 +1,169 @@
+#!/bin/bash
+
+BBFDM_BASE_DM_PATH="usr/share/bbfdm"
+BBFDM_INPUT_PATH="etc/bbfdm/micro_services"
+INPUT_TEMPLATE='{"daemon":{"enable":"1","service_name":"template","config":{"loglevel":"1"}}}'
+OUT_NAME=""
+
+MICRO_SERVICE=0
+SCRIPT=0
+DIAG=0
+PLUGIN=0
+DEST=""
+TOOLS="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+SRC=""
+
+while getopts ":mpsdu:" opt; do
+	case ${opt} in
+	  m)
+	  	MICRO_SERVICE=1
+		;;
+	  p)
+	  	PLUGIN=1
+		;;
+	  s)
+	  	SCRIPT=1
+		;;
+	  d)
+	  	DIAG=1
+		;;
+	  u)
+	  	OUT_NAME="${OPTARG}"
+		;;
+	  ?)
+	  	echo "Invalid option: ${OPTARG}"
+		exit 1
+		;;
+	esac
+done
+shift $((OPTIND-1))
+
+SRC="${1}"
+shift
+DEST="${1}"
+shift
+DATA="${1}"
+
+install_bin() {
+	if ! install -m0755 ${1} ${2}; then
+		echo "Failed to install bin ${1} => ${2}"
+		exit 1
+	fi
+}
+
+install_dir() {
+	if ! install -d -m0755 ${1}; then
+		echo "Failed to create directory ${1}"
+		exit 1
+	fi
+}
+
+install_data() {
+	if ! install -m0644 ${1} ${2}; then
+		echo "Failed to install ${1} => ${2}"
+		exit 1
+	fi
+}
+
+# Installing datamodel
+bbfdm_install_dm()
+{
+	local src dest minfile
+
+	src="$1"
+	dest="$2"
+	minfile=""
+
+	if [ -z ${src} ] || [ -z "${dest}" ] || [ -z "${TOOLS}" ]; then
+		echo "Invalid input option for install dm $@"
+		exit 1
+	fi
+
+	if [ "${src##*.}" = "json" ]; then
+		echo "Compacting BBFDM JSON file"
+		minfile=$(mktemp)
+		jq -c 'del(..|.description?)' ${src} > ${minfile}
+
+		src=${minfile}
+		if dpkg -s python3-jsonschema >/dev/null 2>&1; then
+			echo "Verifying bbfdm Datamodel JSON file"
+			if ! ${TOOLS}/validate_plugins.py ${src}; then
+				echo "Validation of the plugin failed ${src}"
+				exit 1
+			fi
+		else
+			echo "## Install python3-jsonschema to verify datamodel plugins"
+		fi
+	fi
+
+	install_bin ${src} ${dest}
+
+	if [ -f "${minfile}" ]; then
+		rm ${minfile}
+	fi
+}
+
+bbfdm_generate_input()
+{
+	local dest ser
+
+	dest_dir=${1}
+	ser=${2}
+	dest=${dest_dir}/${ser}.json
+
+	if [ -n "${OUT_NAME}" ]; then
+		echo ${INPUT_TEMPLATE} | jq --arg service "${ser}" --arg OUT "${OUT_NAME}" '.daemon |= (.service_name = $service |.output.name = $OUT)' > ${dest}
+	else
+		echo ${INPUT_TEMPLATE} | jq --arg service "${ser}" '.daemon.service_name = $service' > ${dest}
+	fi
+
+	chmod 466 ${dest}
+}
+
+if [ -z "$SRC" ] || [ -z "${DEST}" ] ; then
+	echo "# BBFDM Null value in src[${SRC}], dest[${DEST}]"
+	exit 1
+fi
+
+if [ "${SCRIPT}" -eq "1" ]; then
+	if [ "${DIAG}" -eq "1" ]; then
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/scripts/bbf_diag
+		install_bin ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/scripts/bbf_diag/
+	else
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/scripts
+		install_bin ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/scripts/
+	fi
+	exit 0
+fi
+
+if [ "${MICRO_SERVICE}" -eq "1" ]; then
+	if [ -z "${DATA}" ]; then
+		echo "# service_name[${DATA}] not provided"
+		exit 1
+	fi
+
+	if [ "${PLUGIN}" -ne "1" ]; then
+		extn="$(basename ${SRC})"
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services
+		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}.${extn##*.}
+
+		# main micro-service datamodel plugin, create an input file as well
+		install_dir ${DEST}/${BBFDM_INPUT_PATH}
+		bbfdm_generate_input ${DEST}/${BBFDM_INPUT_PATH}/ ${DATA}
+	else
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}
+		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}/$(basename ${SRC})
+	fi
+else
+	if [ "${PLUGIN}" -eq "1" ]; then
+		priority="${DATA:-0}"
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/plugins
+		if [ "${priority}" -gt "0" ]; then
+			# install with priority if defined
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/${priority}_$(basename ${SRC})
+		else
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/$(basename ${SRC})
+		fi
+	fi
+fi
+

bbfdm/tools/validate_plugins.py

@@ -0,0 +1,330 @@
+#!/usr/bin/python3
+
+# Copyright (C) 2024 iopsys Software Solutions AB
+# Author: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
+
+import sys
+import json
+from jsonschema import validate
+
+JSON_PLUGIN_VERSION = 0
+
+obj_schema = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"object"
+			]
+		},
+		"map_type_t": {
+			"type": "string",
+			"enum": [
+				"uci",
+				"ubus"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"cwmp",
+				"usp"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"version" : {"type": "string"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
+		"uniqueKeys" : {"type" : "array"},
+		"access" : {"type" : "boolean"},
+		"array" : {"type" : "boolean"},
+		"mapping" : {"type" : "object", "properties" : {
+				"type" : {"$ref": "#/definitions/map_type_t"},
+				"uci" : {"type" : "object", "properties" : {
+						"file" : {"type": "string"},
+						"section" : {"type": "object", "properties" : {
+								"type" : {"type": "string"}
+							}
+						},
+						"dmmapfile" : {"type": "string"}
+					}
+				},
+				"ubus" : {"type" : "object", "properties" : {
+						"object" : {"type": "string"},
+						"method" : {"type": "string"},
+						"args" : {"type": "object"},
+						"key" : {"type": "string"}
+					}
+				}
+			}
+		}
+	},
+	"required": [
+		"type",
+		"protocols",
+		"array",
+		"access"
+	]
+}
+
+obj_schema_v1 = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"object"
+			]
+		},
+		"map_type_t": {
+			"type": "string",
+			"enum": [
+				"uci",
+				"ubus"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"cwmp",
+				"usp",
+				"none"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"version" : {"type": "string"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
+		"uniqueKeys" : {"type" : "array"},
+		"access" : {"type" : "boolean"},
+		"array" : {"type" : "boolean"},
+		"mapping" : {"type" : "array", "items" : {
+			"type" : "object", "properties" : {
+				"type" : {"$ref": "#/definitions/map_type_t"},
+					"uci" : {"type" : "object", "properties" : {
+							"file" : {"type": "string"},
+							"section" : {"type": "object", "properties" : {
+									"type" : {"type": "string"}
+								}
+							},
+							"dmmapfile" : {"type": "string"}
+						}
+					},
+					"ubus" : {"type" : "object", "properties" : {
+							"object" : {"type": "string"},
+							"method" : {"type": "string"},
+							"args" : {"type": "object"},
+							"key" : {"type": "string"}
+						}
+					}
+				}
+			}
+		}
+	},
+	"required": [
+		"type",
+		"protocols",
+		"array",
+		"access"
+	]
+}
+
+param_schema = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"string",
+				"unsignedInt",
+				"unsignedLong",
+				"int",
+				"long",
+				"boolean",
+				"dateTime",
+				"hexBinary",
+				"base64",
+				"decimal"
+			]
+		},
+		"map_type_t": {
+			"type": "string",
+			"enum": [
+				"uci",
+				"ubus",
+				"procfs",
+				"sysfs",
+				"json",
+				"uci_sec"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"cwmp",
+				"usp",
+				"none"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
+		"read" : {"type" : "boolean"},
+		"write" : {"type" : "boolean"},
+		"mapping" : {"type" : "array", "items" : {"type": "object", "properties" : {
+					"type" : {"$ref": "#/definitions/map_type_t"},
+					"uci" : {"type" : "object", "properties" : {
+							"file" : {"type": "string"},
+							"section" : {"type": "object", "properties" : {
+									"type" : {"type": "string"},
+									"index" : {"type": "string"}
+								}
+							},
+							"option" : {"type": "object", "properties" : {
+									"name" : {"type": "string"}								}
+							}
+						}
+					},
+					"ubus" : {"type" : "object", "properties" : {
+							"object" : {"type": "string"},
+							"method" : {"type": "string"},
+							"args" : {"type": "object"},
+							"key" : {"type": "string"}
+						}
+					},
+					"procfs" : {"type" : "object", "properties" : {
+							"file" : {"type": "string"}
+						}
+					},
+					"sysfs" : {"type" : "object", "properties" : {
+							"file" : {"type": "string"}
+						}
+					}
+				}
+			}
+		}
+	},
+	"required": [
+		"type",
+		"protocols",
+		"read",
+		"write"
+	]
+}
+
+event_schema = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"event"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"usp"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"version" : {"type": "string"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}}
+	},
+	"required": [
+		"type",
+		"protocols"
+	]
+}
+
+command_schema = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"command"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"usp"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"async" : {"type" : "boolean"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
+		"input" : {"type" : "object"},
+		"output" : {"type" : "object"}
+	},
+	"required": [
+		"type",
+		"async",
+		"protocols"
+	]
+}
+
+def print_validate_json_usage():
+    print("Usage: " + sys.argv[0] + " <dm json file>")
+    print("Examples:")
+    print("  - " + sys.argv[0] + " datamodel.json")
+    print("    ==> Validate the json file")
+    print("")
+    exit(1)
+
+def parse_value( key , value ):
+
+    if key.endswith('.') and not key.startswith('Device.'):
+        print(key + " is not a valid path")
+        exit(1)
+
+    if key.endswith('.') and (JSON_PLUGIN_VERSION == 1 or JSON_PLUGIN_VERSION == 2):
+        __schema = obj_schema_v1
+    elif key.endswith('.'):
+        __schema = obj_schema
+    elif key.endswith('!'):
+        __schema = event_schema
+    elif key.endswith('()'):
+        __schema = command_schema
+    else:
+        __schema = param_schema
+    
+    validate(instance = value, schema = __schema)
+    
+    for k, v in value.items():
+        if k != "list" and k != "mapping" and k != "input" and k != "output" and isinstance(v, dict):
+            parse_value(k, v)
+
+### main ###
+if len(sys.argv) < 2:
+    print_validate_json_usage()
+    
+json_file = open(sys.argv[1], "r", encoding='utf-8')
+try:
+    json_data = json.loads(json_file.read())
+except ValueError:
+    print(sys.argv[1] + " file has a wrong JSON format!!!!!")
+    exit(1)
+
+for __key, __value in json_data.items():
+
+    if __key == "json_plugin_version":
+
+        if not isinstance(__value, int) or __value not in [0, 1, 2]:
+            raise ValueError("Invalid value for json_plugin_version")
+
+        JSON_PLUGIN_VERSION = __value
+        continue
+
+    parse_value(__key , __value)
+
+print("JSON File is Valid")

bridgemngr/Config.in

@@ -0,0 +1,11 @@
+if PACKAGE_bridgemngr
+
+menu "Configuration"
+
+config BRIDGEMNGR_BRIDGE_VLAN
+	bool "Use bridge-vlan backend"
+	help
+	   Set this option to use bridge-vlan as backend for VLAN objects.
+
+endmenu
+endif

bridgemngr/Makefile

@@ -0,0 +1,61 @@
+#
+# Copyright (C) 2020-2024 iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bridgemngr
+PKG_VERSION:=1.0.5
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/bridgemngr
+PKG_SOURCE_VERSION:=c0f2e17f6d4f96aecfe72ab90be885939413176d
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
+
+define Package/bridgemngr
+ CATEGORY:=Utilities
+ TITLE:=Bridge Manager
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
+endef
+
+define Package/bridgemngr/description
+	Package to add Device.Bridging. data model support.
+endef
+
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+MAKE_PATH:=src
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VLAN),y)
+	TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND
+endif
+
+define Package/bridgemngr/install
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libbridgemngr.so $(1) $(PKG_NAME)
+ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libbridgeext.so $(1) $(PKG_NAME)
+endif
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) ~/git/bridgemngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+$(eval $(call BuildPackage,bridgemngr))

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.5
+PKG_VERSION:=2.1.11
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=f03fb8682aa7efe760294e54c422f2eab856e08c
+PKG_SOURCE_VERSION:=5dd9cd3cfc95e9dce5f64fe9cadd274bb31b8fa6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -22,6 +22,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/$(PKG_NAME)
   SECTION:=utils
@@ -43,10 +44,14 @@ endif
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/	
-	$(INSTALL_DIR) $(1)/etc/bulkdata
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bulkdata
-	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
+	$(INSTALL_DATA) ./files/etc/config/bulkdata $(1)/etc/config/
+	$(INSTALL_BIN) ./files/etc/init.d/bulkdatad $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/95-bulkdata-translation-options $(1)/etc/uci-defaults/
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/bbf_plugin/bulkdata.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

bulkdata/bulkdata/usr/share/bbfdm/micro_services/bulkdata.json

@@ -0,0 +1,960 @@
+{
+	"json_plugin_version": 2,
+	"Device.BulkData.": {
+		"type": "object",
+		"protocols": [
+			"cwmp",
+			"usp"
+		],
+		"access": false,
+		"array": false,
+		"Enable": {
+			"type": "boolean",
+			"read": true,
+			"write": true,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"datatype": "boolean",
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "bulkdata",
+						"section": {
+							"name": "bulkdata"
+						},
+						"option": {
+							"name": "enable"
+						}
+					}
+				}
+			]
+		},
+		"Status": {
+			"type": "string",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"datatype": "string",
+			"enumerations": [
+				"Enabled",
+				"Disabled",
+				"Error"
+			],
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "bulkdata",
+						"section": {
+							"name": "bulkdata"
+						},
+						"option": {
+							"name": "enable"
+						}
+					}
+				}
+			]
+		},
+		"MinReportingInterval": {
+			"type": "unsignedInt",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "0",
+			"datatype": "unsignedInt",
+			"unit": "seconds"
+		},
+		"Protocols": {
+			"type": "string",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "HTTP",
+			"list": {
+				"datatype": "string",
+				"enumerations": [
+					"Streaming",
+					"File",
+					"HTTP",
+					"MQTT"
+				]
+			}
+		},
+		"EncodingTypes": {
+			"type": "string",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "JSON,CSV",
+			"list": {
+				"datatype": "string",
+				"enumerations": [
+					"XML",
+					"XDR",
+					"CSV",
+					"JSON"
+				]
+			}
+		},
+		"ParameterWildCardSupported": {
+			"type": "boolean",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "1",
+			"datatype": "boolean"
+		},
+		"MaxNumberOfProfiles": {
+			"type": "int",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "-1",
+			"datatype": "int",
+			"range": [
+				{
+					"min": -1
+				}
+			]
+		},
+		"MaxNumberOfParameterReferences": {
+			"type": "int",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "-1",
+			"datatype": "int",
+			"range": [
+				{
+					"min": -1
+				}
+			]
+		},
+		"ProfileNumberOfEntries": {
+			"type": "unsignedInt",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"datatype": "unsignedInt",
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "bulkdata",
+						"section": {
+							"type": "profile"
+						},
+						"option": {
+							"name": "@Count"
+						}
+					}
+				}
+			]
+		},
+		"Device.BulkData.Profile.{i}.": {
+			"type": "object",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"access": true,
+			"array": true,
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "bulkdata",
+						"section": {
+							"type": "profile"
+						},
+						"dmmapfile": "dmmap_bulkdata"
+					}
+				}
+			],
+			"Enable": {
+				"type": "boolean",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "boolean",
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "enable"
+					}
+				]
+			},
+			"Alias": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "Alias",
+				"range": [
+					{
+						"max": 64
+					}
+				],
+				"flags": [
+					"Unique"
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "alias"
+					}
+				]
+			},
+			"Name": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "string",
+				"range": [
+					{
+						"max": 255
+					}
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "name"
+					}
+				]
+			},
+			"NumberOfRetainedFailedReports": {
+				"type": "int",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "int",
+				"range": [
+					{
+						"min": -1
+					}
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "nbre_of_retained_failed_reports"
+					}
+				]
+			},
+			"Protocol": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "string",
+				"enumerations": [
+					"Streaming",
+					"File",
+					"HTTP"
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "protocol"
+					}
+				]
+			},
+			"EncodingType": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "string",
+				"enumerations": [
+					"XML",
+					"XDR",
+					"CSV",
+					"JSON"
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "encoding_type"
+					}
+				]
+			},
+			"ReportingInterval": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "unsignedInt",
+				"range": [
+					{
+						"min": 1
+					}
+				],
+				"unit": "seconds",
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "reporting_interval"
+					}
+				]
+			},
+			"TimeReference": {
+				"type": "dateTime",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "dateTime",
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "time_reference"
+					}
+				]
+			},
+			"ParameterNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "unsignedInt",
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "bulkdata",
+							"section": {
+								"type": "profile_parameter"
+							},
+							"option": {
+								"name": "@Count"
+							}
+						}
+					}
+				]
+			},
+			"Device.BulkData.Profile.{i}.Parameter.{i}.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": true,
+				"array": true,
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "bulkdata",
+							"section": {
+								"type": "profile_parameter"
+							},
+							"dmmapfile": "dmmap_bulkdata"
+						}
+					}
+				],
+				"Name": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 64
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "name"
+						}
+					]
+				},
+				"Reference": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "reference"
+						}
+					]
+				}
+			},
+			"Device.BulkData.Profile.{i}.CSVEncoding.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": false,
+				"array": false,
+				"FieldSeparator": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_field_separator"
+						}
+					]
+				},
+				"RowSeparator": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_row_separator"
+						}
+					]
+				},
+				"EscapeCharacter": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_escape_character"
+						}
+					]
+				},
+				"ReportFormat": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"ParameterPerRow",
+						"ParameterPerColumn"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_report_format"
+						}
+					]
+				},
+				"RowTimestamp": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"Unix-Epoch",
+						"ISO-8601",
+						"None"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_row_time_stamp"
+						}
+					]
+				}
+			},
+			"Device.BulkData.Profile.{i}.JSONEncoding.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": false,
+				"array": false,
+				"ReportFormat": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"ObjectHierarchy",
+						"NameValuePair"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "json_encoding_report_format"
+						}
+					]
+				},
+				"ReportTimestamp": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"Unix-Epoch",
+						"ISO-8601",
+						"None"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "json_encoding_report_time_stamp"
+						}
+					]
+				}
+			},
+			"Device.BulkData.Profile.{i}.HTTP.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": false,
+				"array": false,
+				"URL": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "URL",
+					"range": [
+						{
+							"max": 2048
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_url"
+						}
+					]
+				},
+				"Username": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_username"
+						}
+					]
+				},
+				"Password": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					],
+					"flags": [
+						"Secure"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_password"
+						}
+					]
+				},
+				"CompressionsSupported": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"default": "GZIP",
+					"list": {
+						"datatype": "string",
+						"enumerations": [
+							"GZIP",
+							"Compress",
+							"Deflate"
+						]
+					}
+				},
+				"Compression": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"GZIP",
+						"Compress",
+						"Deflate"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_compression"
+						}
+					]
+				},
+				"MethodsSupported": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"default": "POST,PUT",
+					"list": {
+						"datatype": "string",
+						"enumerations": [
+							"POST",
+							"PUT"
+						]
+					}
+				},
+				"Method": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"POST",
+						"PUT"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_method"
+						}
+					]
+				},
+				"UseDateHeader": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_use_date_header"
+						}
+					]
+				},
+				"RetryEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_retry_enable"
+						}
+					]
+				},
+				"RetryMinimumWaitInterval": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 1,
+							"max": 65535
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_retry_minimum_wait_interval"
+						}
+					]
+				},
+				"RetryIntervalMultiplier": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 1000,
+							"max": 65535
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_retry_interval_multiplier"
+						}
+					]
+				},
+				"RequestURIParameterNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"mapping": [
+						{
+							"type": "uci",
+							"uci": {
+								"file": "bulkdata",
+								"section": {
+									"type": "profile_http_request_uri_parameter"
+								},
+								"option": {
+									"name": "@Count"
+								}
+							}
+						}
+					]
+				},
+				"PersistAcrossReboot": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_persist_across_reboot"
+						}
+					]					
+				},
+				"Device.BulkData.Profile.{i}.HTTP.RequestURIParameter.{i}.": {
+					"type": "object",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"access": true,
+					"array": true,
+					"mapping": [
+						{
+							"type": "uci",
+							"uci": {
+								"file": "bulkdata",
+								"section": {
+									"type": "profile_http_request_uri_parameter"
+								},
+								"dmmapfile": "dmmap_bulkdata"
+							}
+						}
+					],
+					"Name": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"datatype": "string",
+						"range": [
+							{
+								"max": 64
+							}
+						],
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "uci_sec",
+								"key": "name"
+							}
+						]
+					},
+					"Reference": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"datatype": "string",
+						"range": [
+							{
+								"max": 256
+							}
+						],
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "uci_sec",
+								"key": "reference"
+							}
+						]
+					}
+				}
+			}
+		}
+	}
+}

bulkdata/files/etc/bulkdata/input.json

@@ -1,15 +0,0 @@
-{
-	"daemon": {
-		"input": {
-			"type": "JSON",
-			"name": "/etc/bulkdata/bulkdata.json"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.bulkdata",
-			"parent_dm": "Device.",
-			"object": "BulkData",
-			"root_obj": "bbfdm"
-		}
-	}
-}

bulkdata/files/etc/init.d/bulkdatad

@@ -3,11 +3,8 @@
 START=60
 STOP=10
 
-. /etc/bbfdm/bbfdm_services.sh
-
 USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
-BULKDATA_JSON_INPUT="/etc/bulkdata/input.json"
 
 start_service() {
 	local enable
@@ -15,14 +12,21 @@ start_service() {
 	config_load bulkdata
 	config_get_bool enable bulkdata enable 1
 
-	[ "$enable" -eq "1" ] && {
+	if [ ! -f "/var/state/bulkdatad" ]; then
+		touch /var/state/bulkdatad
+		uci -q -c /var/state set bulkdatad.global='global'
+		uci -q -c /var/state commit bulkdatad
+	fi
+
+	if [ "$enable" -eq "1" ]; then
 		procd_open_instance "bulkdata"
 		procd_set_param command "$PROG"
 		procd_set_param respawn
 		procd_close_instance "bulkdata"
-	}
-
-	bbfdm_add_service "bbfdm.bulkdata" "${BULKDATA_JSON_INPUT}"
+	else
+		uci -q -c /var/state set bulkdatad.global.status='Disabled'
+		uci -q -c /var/state commit bulkdatad
+	fi
 }
 
 reload_service() {

csmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=csmngr
-PKG_VERSION:=0.0.5
+PKG_VERSION:=1.0.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=dcdaba75b85bf8758c34d3ae4a1be0ba09359331
+PKG_SOURCE_VERSION:=5e50fe388fff29b08d895c1c580152cccfa290ad
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/csmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

ddnsmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddnsmngr
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/ddnsmngr.git
-PKG_SOURCE_VERSION:=d0d37df44644ef2c1a0b11d3a4f92dc694ae1010
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ddnsmngr.git
+PKG_SOURCE_VERSION:=4b0c679c4dc3e3725de5c0c55ed60f24b87c6edd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -21,6 +21,7 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_CONFIG_DEPENDS:=CONFIG_DDNSMNGR_BACKEND_DDNSSCRIPT CONFIG_DDNSMNGR_BACKEND_INADYN
 
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/$(PKG_NAME)
   SECTION:=utils
@@ -48,17 +49,13 @@ endef
 endif
 
 define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/etc/ddnsmngr
 	$(INSTALL_DIR) $(1)/etc/ddnsmngr/ddns
 	$(INSTALL_DIR) $(1)/etc/ddnsmngr/servers
-	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ddnsmngr
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/libddnsmngr.so $(1)/etc/ddnsmngr/
-	$(INSTALL_DATA) ./files/etc/ddnsmngr/input.json $(1)/etc/ddnsmngr/
 	$(INSTALL_DATA) ./files/etc/config/ddnsmngr $(1)/etc/config/ddnsmngr
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-ddns-config-migrate $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/init.d/ddnsmngr $(1)/etc/init.d/ddnsmngr
@@ -73,6 +70,7 @@ ifeq ($(CONFIG_DDNSMNGR_BACKEND_INADYN),y)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/inadyn/server/* $(1)/etc/ddnsmngr/servers
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/inadyn/usr/libexec/rpcd/ddnsmngr $(1)/usr/libexec/rpcd/ddnsmngr
 endif
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libddnsmngr.so $(1) $(PKG_NAME)
 endef
 
 

ddnsmngr/files/etc/ddnsmngr/input.json

@@ -1,15 +0,0 @@
-{
-	"daemon": {
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/ddnsmngr/libddnsmngr.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.ddnsmngr",
-			"parent_dm": "Device.",
-			"object": "DynamicDNS",
-			"root_obj": "bbfdm"
-		}
-	}
-}

ddnsmngr/files/etc/init.d/ddnsmngr

@@ -3,14 +3,11 @@
 START=80
 STOP=10
 USE_PROCD=1
-DM_INPUT="/etc/ddnsmngr/input.json"
 
-. /etc/bbfdm/bbfdm_services.sh
 . /usr/lib/ddnsmngr/ddnsmngr_service.sh
 
 start_service() {
 	start_ddnsmngr_service
-	bbfdm_add_service "bbfdm.ddnsmngr" "${DM_INPUT}"
 }
 
 stop_service() {

decollector/Config.in

@@ -2,6 +2,6 @@ menu "Configuration"
 
 config DECOLLECTOR_EASYMESH_VERSION
 	int "Support Easymesh version"
-	default 4
+	default 6
 
 endmenu

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=4.2.1.3
+PKG_VERSION:=6.0.0.13
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0fe317cbe2b2e37c25a6d6d4e6f5c1d6964f9e50
+PKG_SOURCE_VERSION:=d75639d9ae82538103123b32fc0de9280e84cabb
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dectmngr/Makefile

@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.6.5
+PKG_VERSION:=3.6.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=192e74db2082e3f89f6defe9d752d752b0b09079
+PKG_SOURCE_VERSION:=85c173d1fac535726b2e750be8c282b74fb7dbca
 PKG_MIRROR_HASH:=skip
 endif
 

dectmngr/files/etc/init.d/dectmngr

@@ -11,8 +11,6 @@ LOG_PATH=/var/log/dectmngr
 DB_PATH=/etc/dect
 DCX81_UART_DT_ALIAS=/proc/device-tree/aliases/dcx81-uart
 
-DECT_GPIO="$(gpiofind DCX81_RSTN | cut -d ' ' -f 2 2>/dev/null)"
-
 # Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
 stop_and_wait_dectmngr() {
 	dect_pid=$(pidof $PROG)
@@ -64,8 +62,6 @@ start_service() {
 		dcx81_uart_device=/dev/ttyH0
 	fi
 
-	[ -n "$DECT_GPIO" ] && echo 1 > /sys/class/gpio/gpio${DECT_GPIO}/value
-
 	rfpi=$(db -q get hw.board.dect_rfpi)
 	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"
 
@@ -112,7 +108,6 @@ start_service() {
 stop_service() {
 	has_dect || return 0
 
-	[ -n "$DECT_GPIO" ] && echo 0 > /sys/class/gpio/gpio${DECT_GPIO}/value
 	stop_and_wait_dectmngr
 }
 
@@ -126,11 +121,6 @@ service_triggers() {
 }
 
 boot() {
-	[ -n "$DECT_GPIO" ] && {
-		echo ${DECT_GPIO} > /sys/class/gpio/export
-		echo out > /sys/class/gpio/gpio${DECT_GPIO}/direction
-	}
-
 	[ ! -d $LOG_PATH ] && mkdir -p $LOG_PATH
 	[ ! -d $DB_PATH ] && mkdir -p $DB_PATH
 	start

dhcpmngr/Makefile

@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2024 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dhcpmngr
+PKG_VERSION:=1.0.2
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dhcpmngr.git
+PKG_SOURCE_VERSION:=4c89a3f12686343e3cca23819255744ac06dfb22
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
+
+MAKE_PATH:=src
+
+define Package/dhcpmngr
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Package to add Device.DHCPv4 and v6 data model support.
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +dnsmasq
+endef
+
+define Package/dhcpmngr/description
+  Package to add Device.DHCPv4. and Device.DHCPv6. data model support.
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/dhcpmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/dhcpmngr/install
+	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
+	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_lease_start_time.user $(1)/etc/udhcpc.user.d/udhcpc_lease_start_time.user
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdhcpmngr.so $(1) $(PKG_NAME)
+endef
+
+$(eval $(call BuildPackage,dhcpmngr))

dhcpmngr/files/etc/udhcpc.user.d/udhcpc_lease_start_time.user

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+leasestarttime="$(awk -F'.' '{print $1}' /proc/uptime 2> /dev/null)"
+target_file=/tmp/dhcp_client_info
+target_str="$INTERFACE $lease $leasestarttime"
+
+# if this interface is present in file, then replace it
+if grep -q "$INTERFACE" "$target_file" 2> /dev/null; then
+	# replace the whole line if pattern matches
+	sed -i "/${INTERFACE}/c\\${target_str}" "$target_file"
+else
+	# interface info was not present, append it to the file
+	echo "$target_str" >> "$target_file"
+fi

dnsmngr/Makefile

@@ -0,0 +1,49 @@
+#
+# Copyright (C) 2022-2024 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dnsmngr
+PKG_VERSION:=1.0.7
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
+PKG_SOURCE_VERSION:=f6223f6034a57753ae9d1552ab1334194b1deaff
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
+
+MAKE_PATH:=src
+
+define Package/dnsmngr
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +dnsmasq +umdns
+  TITLE:=Package to add Device.DNS. datamodel support
+endef
+
+define Package/dnsmngr/description
+  Package to add Device.DNS. datamodel support.
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/dnsmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/dnsmngr/install
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdnsmngr.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_SCRIPT) -d $(PKG_BUILD_DIR)/scripts/nslookup $(1)
+endef
+
+$(eval $(call BuildPackage,dnsmngr))

dslmngr/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.2.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cb8b8fd2549751bcd38808391b76a1a9a908c4de
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
+PKG_SOURCE_VERSION:=2b1ecbd2079dbd88ed6d58b277b91dcf5038d869
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_MIRROR_HASH:=skip
@@ -26,6 +26,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 
 include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
@@ -39,7 +40,7 @@ define Package/dslmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
 endef
 
 define Package/dslmngr/description
@@ -69,12 +70,14 @@ define Build/Compile
 endef
 
 define Package/dslmngr/install
+	$(INSTALL_DIR) $(1)/etc/dsl
 	$(CP) ./files/common/* $(1)/
 ifeq ($(CONFIG_TARGET_brcmbca),y)
 	$(CP) ./files/broadcom/* $(1)/
 endif
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfdsl.so $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,dslmngr))

dslmngr/files/broadcom/lib/dsl/broadcom.sh

@@ -211,8 +211,8 @@ create_ptm_devices() {
 
 prioritize_arp()
 {
-      ebtables -t nat -D POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
-      ebtables -t nat -A POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
+      ebtables --concurrent -t nat -D POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
+      ebtables --concurrent -t nat -A POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
 }
 
 xtm_remove_devices() {

easy-qos/Makefile

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

easy-qos/files/etc/firewall.easyqos

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

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

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

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

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

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

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

ebtables-extensions/Makefile

@@ -0,0 +1,80 @@
+#
+# Copyright (C) 2024 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ebtables-extensions
+PKG_VERSION:=1.0.4
+PKG_LICENSE:=GPL-2.0
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=35fb79f95c47d90e3791c7e126048b451f078f24
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ebtables-extensions.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/vlantranslation
+  SUBMENU:=Other modules
+  TITLE:=Kernel module for ebtables VLAN translation
+  FILES:=$(PKG_BUILD_DIR)/src/ebt_vlantranslation.ko
+  DEPENDS+=+kmod-ebtables
+  AUTOLOAD:=$(call AutoLoad,30,ebt_vlantranslation,1)
+  KCONFIG:=
+endef
+
+define KernelPackage/dscp2pbit
+  SUBMENU:=Other modules
+  TITLE:=Kernel module for DSCP-to-Pbit mapping
+  DEPENDS+=+kmod-ebtables
+  FILES:=$(PKG_BUILD_DIR)/src/ebt_dscp2pbit.ko
+  AUTOLOAD:=$(call AutoLoad,30,ebt_dscp2pbit,1)
+  KCONFIG:=
+endef
+
+define KernelPackage/vlantranslation/description
+	Kernel module to enable VLAN translation for ebtables
+endef
+
+define KernelPackage/dscp2pbit/description
+	Kernel module to enableDSCP-to-Pbit mapping for ebtables
+endef
+
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+	include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+endif
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ./src/* $(PKG_BUILD_DIR)/
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_vlantranslation.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_dscp2pbit.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
+endef
+else
+define Build/Prepare
+	$(Build/Prepare/Default)
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_vlantranslation.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_dscp2pbit.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/
+endef
+endif
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/include/uapi/linux/netfilter_bridge/
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_vlantranslation.h $(1)/include/uapi/linux/netfilter_bridge/
+	$(CP) $(PKG_BUILD_DIR)/src/ebt_dscp2pbit.h $(1)/include/uapi/linux/netfilter_bridge/
+endef
+
+KERNEL_MAKE_FLAGS += -I$(LINUX_DIR)/include
+
+define Build/Compile
+	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src" modules
+endef
+
+$(eval $(call KernelPackage,vlantranslation))
+$(eval $(call KernelPackage,dscp2pbit))

ethmngr/Config.in

@@ -0,0 +1,9 @@
+if (PACKAGE_ethmngr)
+
+menu "Configurations"
+
+config TR181_VENDOR_EXTENSIONS_MACVLAN
+	bool "Use TR181 vendor extension MACVLAN"
+	default y
+endmenu
+endif

ethmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.2
+PKG_VERSION:=2.1.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e5cccdd45a93d969d51c4085cb52b543df544811
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git
+PKG_SOURCE_VERSION:=2d35e86cc8dfd7ef4e0d8579f5d314e90faadc90
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -21,12 +21,13 @@ PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
 
 define Package/ethmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ethernet status and configration utility
-  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
+  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
 endef
 
 define Package/ethmngr/description
@@ -35,6 +36,10 @@ define Package/ethmngr/description
  It uses APIs from the libethernet.so library.
 endef
 
+define Package/$(PKG_NAME)/config
+       source "$(SOURCE)/Config.in"
+endef
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ./ethmngr/* $(PKG_BUILD_DIR)/
@@ -44,7 +49,12 @@ endif
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
+	-D_GNU_SOURCE \
+	-DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+
+ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y)
+TARGET_CFLAGS += -DTR181_VENDOR_EXTENSIONS_MACVLAN
+endif
 
 ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
 define Build/Compile
@@ -53,9 +63,15 @@ endif
 
 define Package/ethmngr/install
 	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/ethmngr
+	$(INSTALL_DIR) $(1)/etc/ethmngr/plugins
 ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
+endif
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfethernet.so $(1) $(PKG_NAME)
+ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/libbbfethernetmacvlan.so $(1) $(PKG_NAME)
 endif
 endef
 

ethmngr/files/etc/hotplug.d/ethernet/ethport-deprecated-ubus-event

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+[ -n "$PORT" -a -n "$LINK" ] || exit 0
+
+case "$PORT" in
+	# do not generate ethport ubus event
+	# for wifi, dsl and brige devices
+	wl*|wds*|atm*|ptm*|br-*)
+		exit 0
+	;;
+esac
+
+speed=0
+duplex=full
+
+if [ "$LINK" = "up" ]; then
+	devspeed="$(ubus -t 2 call network.device status "{\"name\":\"$PORT\"}" | jsonfilter -e @.speed)"
+	speed=${devspeed:0:-1}
+	duplex=${devspeed:0-1}
+	[ "$duplex" == "H" ] && duplex="half" || duplex="full"
+fi
+
+ubus send ethport "{\"ifname\":\"$PORT\",\"link\":\"$LINK\",\"speed\":\"$speed\",\"duplex\":\"$duplex\"}"

ethmngr/files/etc/ruleng/ethport.json

@@ -0,0 +1,20 @@
+{
+	"ethport_update": {
+		"if" : [
+			{
+				"event": "network.device"
+			}
+		],
+		"then" : [
+			{
+				"cli": "/sbin/hotplug-call ethernet",
+				"envs": {
+					"PORT": "&network.device->ifname",
+					"LINK": "&network.device->link"
+				},
+				"timeout": 1
+			}
+		]
+	}
+}
+

ethmngr/files/etc/uci-defaults/ruleng.ethport

@@ -0,0 +1,2 @@
+uci -q set ruleng.ethport=rule
+uci -q set ruleng.ethport.recipe='/etc/ruleng/ethport.json'

firewallmngr/Config.in

@@ -0,0 +1,12 @@
+if PACKAGE_firewallmngr
+
+menu "Configuration"
+
+config FIREWALLMNGR_PORT_TRIGGER
+	bool "Include Device.NAT.PortTrigger"
+	default y
+	help
+	   Set this option to include support for PortTrigger object.
+
+endmenu
+endif

firewallmngr/Makefile

@@ -0,0 +1,74 @@
+#
+# Copyright (C) 2024 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=firewallmngr
+PKG_VERSION:=1.0.5
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/firewallmngr.git
+PKG_SOURCE_VERSION:=94246676dc2e2db29b94fcffec1be3cee3ec8e9f
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
+
+MAKE_PATH:=src
+
+define Package/firewallmngr
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Package to add Device.Firewall and Device.NAT. data model support.
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +firewall
+  DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:kmod-ipt-trigger +FIREWALLMNGR_PORT_TRIGGER:kmod-ip6t-trigger
+  DEPENDS+=+FIREWALLMNGR_PORT_TRIGGER:iptables-mod-nfqueue
+endef
+
+define Package/firewallmngr/description
+  Package to add Device.Firewall. and Device.NAT. data model support.
+endef
+
+define Package/$(PKG_NAME)/config
+        source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/firewallmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+ifeq ($(CONFIG_FIREWALLMNGR_PORT_TRIGGER),y)
+	TARGET_CFLAGS += -DINCLUDE_PORT_TRIGGER
+endif
+
+define Package/firewallmngr/install
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+ifeq ($(CONFIG_FIREWALLMNGR_PORT_TRIGGER),y)
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/lib/port-trigger
+
+	$(INSTALL_BIN) ./files/port-trigger/etc/init.d/port-trigger $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/port-trigger/etc/config/port-trigger $(1)/etc/config/
+	$(INSTALL_DATA) ./files/port-trigger/lib/port-trigger/port_trigger.sh $(1)/lib/port-trigger/
+endif
+	$(INSTALL_BIN) ./files/firewall.portmap $(1)/etc/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/
+
+	$(INSTALL_BIN) ./files/firewall.service $(1)/etc/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/
+
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libfirewallmngr.so $(1) $(PKG_NAME)
+endef
+
+$(eval $(call BuildPackage,firewallmngr))

firewallmngr/files/port-trigger/etc/config/port-trigger

@@ -0,0 +1 @@
+#port trigger uci file

firewallmngr/files/port-trigger/etc/init.d/port-trigger

@@ -0,0 +1,21 @@
+#!/bin/sh /etc/rc.common
+
+START=65
+STOP=20
+USE_PROCD=1
+
+. /lib/port-trigger/port_trigger.sh
+
+start_service() {
+	port_trigger_handling
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger firewall
+	procd_add_reload_trigger port-trigger
+}
+
+reload_service() {
+	start
+}

firewallmngr/files/port-trigger/lib/port-trigger/port_trigger.sh

@@ -0,0 +1,157 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+process_port_trigger() {
+	local rule_id="$1"
+	local is_enabled=""
+	local duration=""
+	local trigger_dport=""
+	local trigger_dport_end=""
+	local protocol=""
+	local interface=""
+	local open_dport=""
+	local open_dport_end=""
+	local open_protocol=""
+	local ptg_id=""
+	local IP_RULE=""
+	local IP6_RULE=""
+	local IP_RULE_FWD=""
+
+	get_port_trigger() {
+		local ptg_name
+		config_get ptg_name "$1" "name"
+		if [ "$ptg_name" == "$2" ]; then
+			ptg_id="$1"
+			return
+		fi
+	}
+
+	ptg_id=""
+	config_get name "$rule_id" "port_trigger"
+	config_foreach get_port_trigger  "port_trigger" "$name"
+	[ -z "$ptg_id" ] && return
+
+	is_enabled=$(uci -q get port-trigger."$ptg_id".enable)
+
+	if [ -z "$is_enabled" ] || [ "$is_enabled" = "0" ]; then
+		return
+	fi
+
+	protocol=$(uci -q get port-trigger."$ptg_id".protocol)
+	[ -z "$protocol" ] && return
+
+	if [ "$protocol" = "UDP" ] || [ "$protocol" = "udp" ]; then
+		IP_RULE="$IP_RULE -p udp"
+		IP6_RULE="$IP6_RULE -p udp"
+		IP_RULE_FWD="$IP_RULE_FWD -p udp"
+	elif [ "$protocol" = "TCP" ] || [ "$protocol" = "tcp" ]; then
+		IP_RULE="$IP_RULE -p tcp"
+		IP6_RULE="$IP6_RULE -p tcp"
+		IP_RULE_FWD="$IP_RULE_FWD -p tcp"
+	else
+		return
+	fi
+
+	trigger_dport=$(uci -q get port-trigger."$ptg_id".port)
+	[ -z "$trigger_dport" ] && return
+	IP_RULE="$IP_RULE --dport $trigger_dport"
+	IP6_RULE="$IP6_RULE --dport $trigger_dport"
+
+	trigger_dport_end=$(uci -q get port-trigger."$ptg_id".end_port_range)
+	if [ -n "$trigger_dport_end" ]; then
+		IP_RULE="$IP_RULE:$trigger_dport"
+		IP6_RULE="$IP6_RULE:$trigger_dport"
+	fi
+
+	config_get open_protocol "$rule_id" "protocol"
+	if [ "$open_protocol" = "UDP" ] || [ "$open_protocol" = "udp" ]; then
+		IP_RULE="$IP_RULE -j TRIGGER --trigger-type out --trigger-proto udp"
+		IP6_RULE="$IP6_RULE -j TRIGGER --trigger-type out --trigger-proto udp"
+	elif [ "$open_protocol" = "TCP" ] || [ "$open_protocol" = "tcp" ]; then
+		IP_RULE="$IP_RULE -j TRIGGER --trigger-type out --trigger-proto tcp"
+		IP6_RULE="$IP6_RULE -j TRIGGER --trigger-type out --trigger-proto tcp"
+	else
+		return
+	fi
+
+	config_get open_dport "$rule_id" "port"
+	[ -z "$open_dport" ] && return
+	IP_RULE="$IP_RULE --trigger-match $open_dport"
+	IP6_RULE="$IP6_RULE --trigger-match $open_dport"
+	IP_RULE_FWD="$IP_RULE_FWD --dport $open_dport"
+
+	config_get open_dport_end "$rule_id" "end_port_range"
+	if [ -z "$open_dport_end" ]; then
+		IP_RULE="$IP_RULE --trigger-relate $open_dport"
+		IP6_RULE="$IP6_RULE --trigger-relate $open_dport"
+	else
+		IP_RULE="$IP_RULE-$open_dport_end --trigger-relate $open_dport-$open_dport_end"
+		IP6_RULE="$IP6_RULE-$open_dport_end --trigger-relate $open_dport-$open_dport_end"
+		IP_RULE_FWD="$IP_RULE_FWD:$open_dport_end"
+	fi
+
+	duration=$(uci -q get port-trigger."$ptg_id".auto_disable_duration)
+        if [ -n "$duration" ]; then
+                IP_RULE="$IP_RULE --trigger-timeout $duration"
+                IP6_RULE="$IP6_RULE --trigger-timeout $duration"
+        fi
+
+	interface=$(uci -q get port-trigger."$ptg_id".src)
+	[ -z "$interface" ] && return
+	device=$(uci -q get network.$interface.device)
+       	IP_RULE_1="iptables -w -t nat -A prerouting_porttrigger -i $device $IP_RULE"
+       	echo "$IP_RULE_1">>/tmp/port_trigger_iptables
+
+       	IP_RULE_1="ip6tables -w -t nat -A prerouting_porttrigger -i $device $IP6_RULE"
+       	echo "$IP_RULE_1">>/tmp/port_trigger_ip6tables
+
+        if [ -n "$duration" ]; then
+		echo "iptables -w -t filter -A forwarding_wan_porttrigger $IP_RULE_FWD -j TRIGGER --trigger-type in --trigger-timeout $duration">>/tmp/port_trigger_iptables
+		echo "ip6tables -w -t filter -A forwarding_wan_porttrigger $IP_RULE_FWD -j TRIGGER --trigger-type in --trigger-timeout $duration">>/tmp/port_trigger_ip6tables
+
+		echo "iptables -w -t nat -A prerouting_wan_porttrigger $IP_RULE_FWD -j TRIGGER --trigger-type dnat --trigger-timeout $duration">>/tmp/port_trigger_iptables
+	else
+		echo "iptables -w -t filter -A forwarding_wan_porttrigger $IP_RULE_FWD -j TRIGGER --trigger-type in">>/tmp/port_trigger_iptables
+		echo "ip6tables -w -t filter -A forwarding_wan_porttrigger $IP_RULE_FWD -j TRIGGER --trigger-type in">>/tmp/port_trigger_ip6tables
+
+		echo "iptables -w -t nat -A prerouting_wan_porttrigger $IP_RULE_FWD -j TRIGGER --trigger-type dnat">>/tmp/port_trigger_iptables
+	fi
+}
+
+port_trigger_handling() {
+	rm /tmp/port_trigger_iptables 2> /dev/null
+	rm /tmp/port_trigger_ip6tables 2> /dev/null
+	touch /tmp/port_trigger_iptables
+	touch /tmp/port_trigger_ip6tables
+
+	echo "iptables -w -t nat -F prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	echo "iptables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	echo "iptables -w -t nat -F prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	echo "ip6tables -w -t nat -F prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
+	echo "ip6tables -w -t filter -F forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
+
+	echo "iptables -w -t nat -N prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	ret=$?
+	[ $ret -eq 0 ] && echo "iptables -w -t nat -I PREROUTING -j prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	echo "iptables -w -t filter -N forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	ret=$?
+	[ $ret -eq 0 ] && echo "iptables -w -t filter -I forwarding_wan_rule -j forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	echo "iptables -w -t nat -N prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+	ret=$?
+	[ $ret -eq 0 ] && echo "iptables -w -t nat -I prerouting_wan_rule -j prerouting_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_iptables
+
+	echo "ip6tables -w -t nat -N prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
+	ret=$?
+	[ $ret -eq 0 ] && echo "ip6tables -w -t nat -I PREROUTING -j prerouting_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
+	echo "ip6tables -w -t filter -N forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
+	ret=$?
+	[ $ret -eq 0 ] && echo "ip6tables -w -t filter -I forwarding_wan_rule -j forwarding_wan_porttrigger 2> /dev/null">>/tmp/port_trigger_ip6tables
+
+	# Load /etc/config/port-trigger UCI file
+	config_load port-trigger
+	config_foreach process_port_trigger rule
+
+	sh /tmp/port_trigger_iptables
+	sh /tmp/port_trigger_ip6tables
+}

fluent-bit/Makefile

@@ -0,0 +1,176 @@
+#
+# Copyright (C) 2024 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fluent-bit
+PKG_VERSION:=3.1.0
+PKG_RELEASE:=1
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/fluent/fluent-bit.git
+PKG_SOURCE_VERSION=v$(PKG_VERSION)
+PKG_MIRROR_HASH:=9bedfabf859b88a2cfcf51cc17669b83a170e85427ce562131366cb1542b52ae
+endif
+
+PKG_LICENSE:=Apache-2.0
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/fluent-bit
+	CATEGORY:=Utilities
+	DEPENDS:= +libyaml +libopenssl +libcurl +libatomic +musl-fts +flex +bison
+	TITLE:=Fluent-Bit
+	URL:=https://fluentbit.io/
+endef
+
+define Package/fluent-bit/description
+	Fluent Bit is a super fast, lightweight, and highly scalable logging and metrics processor and forwarder.
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ./fluent-bit/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+# General options
+TARGET_LDFLAGS +=-lfts -latomic
+
+CMAKE_OPTIONS+= \
+	-DFLB_RELEASE=Yes \
+	-DFLB_SMALL=No \
+	-DEXCLUDE_FROM_ALL=true \
+	-DFLB_SHARED_LIBS=Yes \
+	-DFLB_DEBUG=Yes \
+	-DFLB_ALL=No \
+	-DFLB_JEMALLOC=No \
+	-DFLB_EXAMPLES=No \
+	-DFLB_CHUNK_TRACE=No \
+	-DFLB_BACKTRACE=No \
+	-DFLB_WASM=No \
+	-DFLB_LUAJIT=No
+
+# In plugins
+CMAKE_OPTIONS += \
+	-DFLB_IN_SYSLOG=Yes \
+	-DFLB_IN_CPU=Yes \
+	-DFLB_IN_MEM=Yes \
+	-DFLB_IN_DISK=Yes \
+	-DFLB_IN_EXEC=Yes \
+	-DFLB_IN_HEAD=Yes \
+	-DFLB_IN_FORWARD=No \
+	-DFLB_IN_KMSG=No \
+	-DFLB_IN_PROC=No \
+	-DFLB_IN_RANDOM=No \
+	-DFLB_IN_SERIAL=No \
+	-DFLB_IN_MQTT=No \
+	-DFLB_IN_STDIN=No \
+	-DFLB_IN_SYSTEMD=No \
+	-DFLB_IN_TAIL=No \
+	-DFLB_IN_TCP=No \
+	-DFLB_IN_THERMAL=No \
+	-DFLB_IN_UDP=No \
+	-DFLB_IN_DOCKER=No \
+	-DFLB_IN_EXEC_WASI=No \
+	-DFLB_IN_EVENT_TYPE=No \
+	-DFLB_IN_FLUENTBIT_METRICS=No \
+	-DFLB_IN_KUBERNETES_EVENTS=No \
+	-DFLB_IN_KAFKA=No \
+	-DFLB_IN_LIB=No \
+	-DFLB_IN_SYSTEMD=No \
+	-DFLB_IN_DUMMY=No \
+	-DFLB_IN_NETIF=No \
+	-DFLB_IN_COLLECTD=No \
+	-DFLB_IN_PROMETHEUS_SCRAPE=No \
+	-DFLB_IN_STATSD=No \
+	-DFLB_IN_STORAGE_BACKLOG=No \
+	-DFLB_IN_PODMAN_METRICS=No \
+	-DFLB_IN_OPENTELEMETRY=No \
+	-DFLB_IN_ELASTICSEARCH=No \
+	-DFLB_IN_CALYPTIA_FLEET=No \
+	-DFLB_IN_SPLUNK=No
+	-DFLB_IN_HEALTH=No \
+	-DFLB_IN_WINLOG=No \
+	-DFLB_IN_WINEVTLOG=No
+
+
+# Filter options
+CMAKE_OPTIONS += 
+	-DFLB_FILTER_AWS=No \
+	-DFLB_FILTER_ECS=No \
+	-DFLB_FILTER_KUBERNETES=No \
+	-DFLB_FILTER_LUA=No \
+	-DFLB_FILTER_NEST=No \
+	-DFLB_FILTER_RECORD_MODIFIER=No \
+	-DFLB_FILTER_THROTTLE=No \
+	-DFLB_FILTER_TYPE_CONVERTER=No \
+	-DFLB_FILTER_WASM=No \
+	-DFLB_FILTER_TENSORFLOW=No \
+	-DFLB_FILTER_GEOIP2=No \
+	-DFLB_FILTER_NIGHTFALL=No
+
+# out plugins
+CMAKE_OPTIONS += \
+	-DFLB_OUT_EXIT=Yes \
+	-DFLB_OUT_FORWARD=Yes \
+	-DFLB_OUT_HTTP=Yes \
+	-DFLB_OUT_NATS=Yes \
+	-DFLB_OUT_TCP=Yes \
+	-DFLB_OUT_UDP=Yes \
+	-DFLB_OUT_FILE=Yes \
+	-DFLB_OUT_STDOUT=Yes \
+	-DFLB_OUT_SYSLOG=Yes \
+	-DFLB_OUT_NULL=Yes \
+	-DFLB_OUT_PLOT=No \
+	-DFLB_OUT_AZURE=No \
+	-DFLB_OUT_AZURE_BLOB=No \
+	-DFLB_OUT_AZURE_LOGS_INGESTION=No \
+	-DFLB_OUT_AZURE_KUSTO=No \
+	-DFLB_OUT_BIGQUERY=No \
+	-DFLB_OUT_CALYPTIA=No \
+	-DFLB_OUT_COUNTER=No \
+	-DFLB_OUT_DATADOG=No \
+	-DFLB_OUT_ES=No \
+	-DFLB_OUT_GELF=No \
+	-DFLB_OUT_INFLUXDB=No \
+	-DFLB_OUT_NRLOGS=No \
+	-DFLB_OUT_OPENSEARCH=No \
+	-DFLB_OUT_TD=No \
+	-DFLB_OUT_SKYWALKING=No \
+	-DFLB_OUT_SLACK=No \
+	-DFLB_OUT_SPLUNK=No \
+	-DFLB_OUT_STACKDRIVER=No \
+	-DFLB_OUT_LIB=No \
+	-DFLB_OUT_FLOWCOUNTER=No \
+	-DFLB_OUT_LOGDNA=No \
+	-DFLB_OUT_LOKI=No \
+	-DFLB_OUT_KAFKA=No \
+	-DFLB_OUT_KAFKA_REST=No \
+	-DFLB_OUT_CLOUDWATCH_LOGS=No \
+	-DFLB_OUT_KINESIS_FIREHOSE=No \
+	-DFLB_OUT_KINESIS_STREAMS=No \
+	-DFLB_OUT_OPENTELEMETRY=No \
+	-DFLB_OUT_PROMETHEUS_EXPORTER=No \
+	-DFLB_OUT_PROMETHEUS_REMOTE_WRITE=No \
+	-DFLB_OUT_S3=No \
+	-DFLB_OUT_VIVO_EXPORTER=No \
+	-DFLB_OUT_WEBSOCKET=No \
+	-DFLB_OUT_ORACLE_LOG_ANALYTICS=No \
+	-DFLB_OUT_CHRONICLE=No \
+	-DFLB_OUT_PGSQL=No
+
+define Package/fluent-bit/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/fluent-bit
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/fluent-bit $(1)/usr/sbin/
+	$(INSTALL_DATA) ./files/fluent-bit.conf $(1)/etc/fluent-bit/fluent-bit.conf
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/parsers.conf $(1)/etc/fluent-bit/parsers.conf
+endef
+
+$(eval $(call BuildPackage,fluent-bit))

fluent-bit/files/fluent-bit.conf

@@ -0,0 +1,15 @@
+[SERVICE]
+    flush           3
+    daemon          Off
+    log_level       info
+    parsers_file    /etc/fluent-bit/parsers.conf
+
+[INPUT]
+    name            syslog
+    tag             syslog
+    path            /dev/log
+
+[OUTPUT]
+    name            null
+    match           *
+

fluent-bit/patches/0001-fix_out_file_plugin.patch

@@ -0,0 +1,14 @@
+diff --git a/plugins/out_file/file.c b/plugins/out_file/file.c
+index 2e47c9666..42ace24c6 100644
+--- a/plugins/out_file/file.c
++++ b/plugins/out_file/file.c
+@@ -45,6 +45,9 @@
+ #define NEWLINE "\n"
+ #endif
+ 
++#undef PATH_MAX
++#define PATH_MAX 256
++
+ struct flb_file_conf {
+     const char *out_path;
+     const char *out_file;

gryphon-led-module/Makefile

@@ -28,7 +28,7 @@ define KernelPackage/$(PKG_NAME)
   FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
   AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  DEPENDS:= +(TARGET_brcmbca):bcmkernel
+  DEPENDS:= +(TARGET_brcmbca):bcm963xx-bsp
   PKG_LICENSE:=GPLv2
   PKG_LICENSE_URL:=
 endef

hostmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.2.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b4990b384461f2d1ff75a122a7fa5d9276f211bb
+PKG_SOURCE_VERSION:=aa365710b227ba82b1c43f9cdf497261edb21852
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/hostmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -22,7 +22,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/hostmngr
   SECTION:=utils
@@ -58,14 +58,12 @@ endif
 MAKE_PATH:=src
 
 define Package/hostmngr/install
-	$(CP) ./files/* $(1)/
+	$(CP) ./files/etc $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/hostmngr/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/hostmngr $(1)/usr/sbin/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1)/etc/hostmngr/
-	$(INSTALL_DATA) ./files/etc/hostmngr/input.json $(1)/etc/hostmngr/	
 	$(INSTALL_DIR) $(1)/usr/share/hostmngr
 	$(INSTALL_DATA) ./files/scripts/hosts_acl.sh $(1)/usr/share/hostmngr/
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1) $(PKG_NAME)
 endef
 
 ifeq ($(LOCAL_DEV),1)

hostmngr/files/etc/hostmngr/input.json

@@ -1,16 +0,0 @@
-{
-	"daemon": {
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/hostmngr/libhostmngr.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.hosts",
-			"parent_dm": "Device.",
-			"object": "Hosts",
-			"root_obj": "bbfdm"
-		}
-	}
-}
-

hostmngr/files/etc/init.d/hostmngr

@@ -3,12 +3,8 @@
 START=65
 STOP=20
 
-. /etc/bbfdm/bbfdm_services.sh
-
 USE_PROCD=1
 
-HOSTS_JSON_INPUT="/etc/hostmngr/input.json"
-
 start_service() {
 	procd_open_instance
 	procd_set_param command "/usr/sbin/hostmngr" "--config hosts" "-o"  "/tmp/hostmngr.log" "-f"
@@ -18,7 +14,6 @@ start_service() {
 #	procd_set_param stderr 1
 	procd_close_instance
 	
-	bbfdm_add_service "bbfdm.hosts" "${HOSTS_JSON_INPUT}"
 	sh /usr/share/hostmngr/hosts_acl.sh
 }
 

hostmngr/files/scripts/hosts_acl.sh

@@ -277,11 +277,15 @@ touch $ACL_FILE
 echo "iptables -w -F hosts_forward" >> $ACL_FILE
 echo "ip6tables -w -F hosts_forward" >> $ACL_FILE
 
-hosts_forward=$(iptables -t filter --list | grep hosts_forward)
-if [ -z "$hosts_forward" ]; then
+hosts_ipv4_forward=$(iptables -t filter --list -n | grep hosts_forward)
+if [ -z "$hosts_ipv4_forward" ]; then
 	echo "iptables -w -t filter -N hosts_forward" >> $ACL_FILE
 	ret=$?
 	[ $ret -eq 0 ] && echo "iptables -w -t filter -I FORWARD -j hosts_forward" >> $ACL_FILE
+fi
+
+hosts_ipv6_forward=$(ip6tables -t filter --list -n | grep hosts_forward)
+if [ -z "$hosts_ipv6_forward" ]; then
 	echo "ip6tables -w -t filter -N hosts_forward" >> $ACL_FILE
 	ret=$?
 	[ $ret -eq 0 ] && echo "ip6tables -w -t filter -I FORWARD -j hosts_forward" >> $ACL_FILE

icwmp/Config.in

@@ -0,0 +1,6 @@
+menu "Configuration"
+
+config ICWMP_MGMT_FROM_USP
+	bool "Support configuration of ManagementServer from USP"
+	default y
+endmenu

icwmp/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.6.8
+PKG_VERSION:=9.8.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=7ff419cefc314156a0ac518972096ef0dfb87162
+PKG_SOURCE_VERSION:=798dfcf2a206b2603d64e92a9ce8cc69dd481ced
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -32,8 +32,21 @@ define Package/icwmp
   SUBMENU:=TRx69
   TITLE:=TR069 CWMP client
   DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api +libopenssl
+  MENU:=1
 endef
 
+define Package/icwmp/description
+ TR069 client implementation with bbfdm backend for TR181 support
+endef
+
+define Package/icwmp/config
+	source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(CONFIG_ICWMP_MGMT_FROM_USP),y)
+EXTRA_CFLAGS += -DCWMP_DUAL_SUPPORT=BBFDM_BOTH
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/icwmp/* $(PKG_BUILD_DIR)/
@@ -58,8 +71,8 @@ define Package/icwmp/install
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
-	$(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/json/CWMPManagementServer.json)
-	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libcwmpdm.so)
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libcwmpdm.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_PLUGIN) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,icwmp))

icwmp/files/etc/bbfdm/json/CWMPManagementServer.json

@@ -1,8 +1,7 @@
 {
-	"json_plugin_version": 1,
+	"json_plugin_version": 2,
 	"Device.CWMPManagementServer.": {
 		"type": "object",
-		"version": "2.15",
 		"protocols": [
 			"usp"
 		],
@@ -11,7 +10,6 @@
 		"dependency": "file:/etc/config/cwmp",
 		"EnableCWMP": {
 			"type": "boolean",
-			"version": "2.15",
 			"read": true,
 			"write": true,
 			"protocols": [

icwmp/files/etc/config/cwmp

@@ -5,7 +5,7 @@ config acs 'acs'
 	option periodic_inform_interval '1800'
 	option periodic_inform_time '0001-01-01T00:00:00Z'
 	option dhcp_discovery 'enable'
-	option ssl_capath "/etc/ssl/certs"
+	#option ssl_capath "/etc/icwmpd/ca.pem"
 	# compression possible configs: GZIP, Deflate, Disabled
 	option compression 'Disabled'
 	#­ possible configs interval :[1:65535]
@@ -41,6 +41,7 @@ config cpe 'cpe'
 	option active_notif_throttle '0'
 	option disable_gatewayinfo '0'
 	option fw_upgrade_keep_settings '1'
+	option clock_sync_timeout '128'
 	
 config lwn 'lwn'
 	option enable '0'

icwmp/files/etc/firewall.cwmp

@@ -6,7 +6,7 @@ log() {
 }
 
 get_firewall_zone() {
-	zone="$(uci show firewall|grep network|grep ${1}|cut -d. -f 2)"
+	zone="$(uci show firewall|grep network|grep -w ${1}|cut -d. -f 2)"
 	zone="${zone:-wan}" # defaults to wan zone
 	echo "$zone"
 }

icwmp/files/etc/init.d/icwmpd

@@ -9,6 +9,7 @@ PROG="/usr/sbin/icwmpd"
 
 . /lib/functions.sh
 . /usr/share/libubox/jshn.sh
+
 include /lib/network
 
 log() {
@@ -16,7 +17,15 @@ log() {
 }
 
 regenerate_ssl_link() {
-	local cert_dir="${1%/}"
+	local cert_dir
+
+	cert_dir="${1%/}"
+	if [ -f "${cert_dir}" ]; then
+		return 0
+	fi
+
+	# do not generate the c_rehash if its system default cert path
+	# ca-certificate package already generates c_rehash on compilation
 	[ ! -d "${cert_dir}" ] || [ "${cert_dir}" = "/etc/ssl/certs" ] && return 0
 
 	generate_links() {
@@ -25,14 +34,15 @@ regenerate_ssl_link() {
 		for cfile in ${files}; do
 			if [ -f "${cfile}" ]; then
 				rehash="$(openssl x509 -hash -noout -in "${cfile}")"
-				[ -f "${cert_dir}/${rehash}.0" ] || \
+				if [ ! -f "${cert_dir}/${rehash}.0" ]; then
+					log "Generating c_rehash for ${cfile}=>${rehash}.0"
 					ln -s "${cfile}" "${cert_dir}/${rehash}.0"
+				fi
 			fi
 		done
 	}
 
 	generate_links "pem"
-	generate_links "crt"
 }
 
 enable_dhcp_option43() {

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.3.7
+PKG_VERSION:=8.5.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a7303fc23b812dde4259cbf75c1cecfc7b6af1cd
+PKG_SOURCE_VERSION:=b0e9ef0934888281ba7db7843738e56e6541665a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -22,6 +22,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 
 define Package/ieee1905/Default
@@ -38,7 +39,7 @@ define Package/libieee1905
   $(call Package/ieee1905/Default)
   TITLE:=libieee1905.so (library for CMDU and TLV handling)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json
+	   +libjson-c +libblobmsg-json +libwifiutils
 endef
 
 define Package/ieee1905
@@ -46,7 +47,8 @@ define Package/ieee1905
   TITLE:=ieee1905d (daemon implementing 1905.1 and provides cli)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ubus +libpthread \
-	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi
+	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi \
+	   +libwifiutils +libbbfdm-api
 endef
 
 include $(wildcard plugins/*.mk)
@@ -107,6 +109,7 @@ define Package/ieee1905/install
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/ieee1905d $(1)/usr/sbin/
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/tr181/ieee1905dm.so $(1) $(PKG_NAME)
 endef
 
 define Package/libieee1905/install

ieee1905/plugins/map.mk

@@ -12,7 +12,7 @@ define Package/ieee1905-map-plugin/config
 
 		config MULTIAP_EASYMESH_VERSION
 		int "Easymesh version"
-		default 4
+		default 6
 
 		config MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
 		bool "Sync configuration between dynamic controllers in the network"

iop/config

@@ -1,335 +0,0 @@
-############
-# Generic #
-##########
-
-# Build #
-CONFIG_BUILD_LOG=y
-CONFIG_CCACHE=y
-CONFIG_DEBUG=y
-CONFIG_DEVEL=y
-# CONFIG_USE_SSTRIP is not set
-CONFIG_USE_STRIP=y
-# CONFIG_SIGNED_PACKAGES is not set
-
-CONFIG_JSON_CYCLONEDX_SBOM=y
-CONFIG_INCLUDE_CONFIG=y
-
-# Image #
-CONFIG_TARGET_CUSTOMER="IOPSYS"
-CONFIG_TARGET_ROOTFS_TARGZ=y
-
-# Although UBIFS and EXT4 images work on all non-secure-boot devices,
-# squashfs is the only officially supported rootfs filesystem.
-# A writable rootfs is useful for developping an debugging preinit code.
-# CONFIG_TARGET_ROOTFS_UBIFS is not set
-# CONFIG_TARGET_ROOTFS_EXT4FS is not set
-
-# /etc/banner and /etc/device_info #
-CONFIG_IMAGEOPT=y
-CONFIG_VERSIONOPT=y
-CONFIG_VERSION_MANUFACTURER="IOPSYS"
-CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
-CONFIG_VERSION_DIST="IOWRT"
-
-# OpenWrt is given by CONFIG_VERSION_NUMBER which we do not want to override.
-# disabling CONFIG_VERSION_FILENAMES will hide the OpenWrt version from the image filename
-# CONFIG_VERSION_FILENAMES is not set
-
-# CONFIG_VERSION_CODE is set to the IOWRT version instead by the genconfig-script and
-# CONFIG_VERSION_CODE_FILENAMES will put it into the image filename.
-CONFIG_VERSION_CODE_FILENAMES=y
-
-CONFIG_VERSION_HOME_URL="https://iopsys.eu"
-CONFIG_VERSION_BUG_URL="https://iopsys.eu"
-CONFIG_VERSION_SUPPORT_URL="https://iopsys.eu"
-
-# /lib/preinit #
-CONFIG_PREINITOPT=y
-# CONFIG_TARGET_PREINIT_SUPPRESS_STDERR is not set
-CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE=y
-CONFIG_TARGET_PREINIT_TIMEOUT=1
-# CONFIG_TARGET_PREINIT_SHOW_NETMSG is not set
-# CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG is not set
-CONFIG_TARGET_PREINIT_IFNAME=""
-CONFIG_TARGET_PREINIT_IP=""
-CONFIG_TARGET_PREINIT_NETMASK=""
-CONFIG_TARGET_PREINIT_BROADCAST=""
-
-# Mirror #
-CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
-
-
-##################
-# IOWRT Add-ons #
-################
-
-# EasySoC HAL #
-CONFIG_PACKAGE_qosmngr=y
-CONFIG_PACKAGE_libwifiutils=y
-CONFIG_PACKAGE_wifimngr=y
-
-# Multi-AP #
-CONFIG_PACKAGE_ieee1905=y
-CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y
-CONFIG_PACKAGE_ieee1905-topology-plugin=y
-CONFIG_PACKAGE_decollector=y
-CONFIG_PACKAGE_map-agent=y
-CONFIG_PACKAGE_map-controller=y
-
-# Network #
-CONFIG_PACKAGE_hostmngr=y
-CONFIG_PACKAGE_netmode=y
-CONFIG_PACKAGE_urlfilter=y
-
-# System #
-CONFIG_PACKAGE_imonitor=m
-CONFIG_PACKAGE_questd=y
-CONFIG_PACKAGE_rulengd=y
-CONFIG_PACKAGE_usermngr=y
-
-# TR-x69 #
-CONFIG_PACKAGE_libbbfdm=y
-CONFIG_PACKAGE_bbfdmd=y
-CONFIG_PACKAGE_icwmp=y
-CONFIG_PACKAGE_obuspa=y
-CONFIG_PACKAGE_bulkdata=y
-CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc=y
-CONFIG_PACKAGE_swmodd=y
-CONFIG_PACKAGE_twamp=y
-CONFIG_PACKAGE_udpecho-client=y
-CONFIG_PACKAGE_udpecho-server=y
-CONFIG_PACKAGE_userinterface=y
-CONFIG_PACKAGE_xmppc=y
-CONFIG_PACKAGE_timemngr=y
-CONFIG_PACKAGE_self-diagnostics=y
-
-# WebGUI #
-CONFIG_PACKAGE_sulu=y
-
-
-############
-# Network #
-##########
-
-# Protocols #
-CONFIG_PACKAGE_6in4=y
-CONFIG_PACKAGE_6rd=y
-CONFIG_PACKAGE_6to4=y
-CONFIG_PACKAGE_chat=y
-CONFIG_PACKAGE_comgt=y
-CONFIG_PACKAGE_comgt-directip=y
-CONFIG_PACKAGE_comgt-ncm=y
-CONFIG_PACKAGE_ds-lite=y
-CONFIG_PACKAGE_firewall=y
-# CONFIG_PACKAGE_firewall4 is not set
-CONFIG_PACKAGE_gre=y
-CONFIG_PACKAGE_map=y
-CONFIG_PACKAGE_ntfs-3g=y
-CONFIG_PACKAGE_ntpd=y
-CONFIG_PACKAGE_odhcp6c=y
-CONFIG_PACKAGE_odhcpd=y
-CONFIG_PACKAGE_ppp-mod-pppoa=y
-CONFIG_PACKAGE_ppp-mod-pppoe=y
-CONFIG_PACKAGE_ppp-mod-pppol2tp=y
-CONFIG_PACKAGE_ppp-mod-pptp=y
-CONFIG_PACKAGE_ppp-multilink=y
-# CONFIG_PACKAGE_ppp is not set
-CONFIG_PACKAGE_relayd=y
-CONFIG_PACKAGE_umbim=y
-CONFIG_PACKAGE_uqmi=y
-CONFIG_PACKAGE_wwan=y
-CONFIG_PACKAGE_xl2tpd=y
-
-# Services #
-CONFIG_PACKAGE_atftpd=y
-CONFIG_PACKAGE_ddns-scripts=y
-CONFIG_PACKAGE_dnsmasq=y
-CONFIG_PACKAGE_ssdpd=y
-CONFIG_PACKAGE_miniupnpd-iptables=y
-CONFIG_PACKAGE_mosquitto-client-ssl=y
-CONFIG_PACKAGE_mosquitto-ssl=y
-CONFIG_PACKAGE_nginx=y
-CONFIG_PACKAGE_openvpn-easy-rsa=y
-CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
-# CONFIG_PACKAGE_qos-scripts is not set
-CONFIG_PACKAGE_rdnssd=y
-CONFIG_PACKAGE_vsftpd-tls=y
-
-# Tools and Utilities #
-CONFIG_PACKAGE_curl=y
-CONFIG_PACKAGE_libcurl=y
-CONFIG_LIBCURL_CRYPTO_AUTH=y
-# CONFIG_LIBCURL_MBEDTLS is not set
-CONFIG_LIBCURL_OPENSSL=y
-CONFIG_PACKAGE_ethtool=y
-CONFIG_PACKAGE_ip-bridge=y
-CONFIG_PACKAGE_ip-full=y
-CONFIG_PACKAGE_iperf3=y
-CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_ip6tables-zz-legacy=y
-CONFIG_PACKAGE_iptables-zz-legacy=y
-CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
-CONFIG_PACKAGE_iptables-mod-extra=y
-CONFIG_PACKAGE_iptables-mod-filter=y
-CONFIG_PACKAGE_iptables-mod-ipmark=y
-CONFIG_PACKAGE_iptables-mod-ipopt=y
-CONFIG_PACKAGE_iptables-mod-nflog=y
-CONFIG_PACKAGE_iptables-mod-nfqueue=y
-CONFIG_PACKAGE_iputils-arping=y
-CONFIG_PACKAGE_iputils-ping=y
-CONFIG_PACKAGE_ndisc6=y
-CONFIG_PACKAGE_rdisc6=y
-CONFIG_PACKAGE_resolveip=y
-CONFIG_PACKAGE_socat=y
-CONFIG_PACKAGE_tcpdump=y
-CONFIG_PACKAGE_traceroute6=y
-
-
-############
-# System  #
-##########
-
-CONFIG_PACKAGE_at=y
-CONFIG_PACKAGE_ca-certificates=y
-CONFIG_PACKAGE_crun=y
-CONFIG_PACKAGE_getopt=y
-CONFIG_PACKAGE_gpiod-tools=y
-# CONFIG_PACKAGE_iwatchdog is not set
-CONFIG_PACKAGE_jq=y
-CONFIG_PACKAGE_libcap-bin=y
-CONFIG_PACKAGE_libustream-openssl=y
-# CONFIG_PACKAGE_libustream-wolfssl is not set
-CONFIG_PACKAGE_lscpu=y
-CONFIG_PACKAGE_nand-utils=y
-CONFIG_PACKAGE_openssl-util=y
-CONFIG_OPENSSL_WITH_COMPRESSION=y
-CONFIG_PACKAGE_procd-ujail=m
-CONFIG_PACKAGE_quota=y
-CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_rpcd-mod-rpcsys=y
-CONFIG_PACKAGE_rpcd-mod-rrdns=y
-CONFIG_PACKAGE_strace=y
-CONFIG_PACKAGE_terminfo=y
-CONFIG_PACKAGE_uledd=y
-# The urandom-seed package is very strange. It seeds urandom with urandom...
-# Disable it. Most SoCs nowadays has HW random generators anyway.
-# CONFIG_PACKAGE_urandom-seed is not set
-# CONFIG_PACKAGE_urngd is not set
-CONFIG_PACKAGE_usb-modeswitch=y
-CONFIG_PACKAGE_uuidgen=y
-CONFIG_PACKAGE_zoneinfo-core=y
-CONFIG_PACKAGE_zoneinfo-europe=y
-
-
-################
-# LuCI WebGUI #
-##############
-
-# BEGIN: luci-nginx metapackage with some changes
-# We do not want libiwinfo-lua on non-WiFi targets, but it is already
-# depended on by other luci-packages, so no need to take it in explicitly
-CONFIG_PACKAGE_luci-mod-admin-full=y
-CONFIG_PACKAGE_luci-app-firewall=y
-CONFIG_PACKAGE_luci-app-opkg=y
-CONFIG_PACKAGE_luci-proto-ppp=y
-CONFIG_PACKAGE_luci-proto-ipv6=y
-# CONFIG_LUCI_JSMIN is not set
-# CONFIG_LUCI_CSSTIDY is not set
-CONFIG_PACKAGE_luci-mod-dashboard=y
-CONFIG_PACKAGE_luci-theme-openwrt-2020=y
-CONFIG_PACKAGE_nginx-mod-luci=y
-
-
-############
-# BusyBox #
-##########
-
-CONFIG_BUSYBOX_CUSTOM=y
-CONFIG_BUSYBOX_CONFIG_ADDUSER=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_FEATURE_UDHCP_8021Q=y
-CONFIG_BUSYBOX_CONFIG_FIRST_SYSTEM_ID=100
-# 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
-CONFIG_BUSYBOX_CONFIG_FEATURE_MODPROBE_BLACKLIST=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_MODUTILS_ALIAS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_MODUTILS_SYMBOLS=y
-CONFIG_BUSYBOX_CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-# CONFIG_BUSYBOX_CONFIG_IP is not set
-CONFIG_BUSYBOX_CONFIG_LAST_SYSTEM_ID=999
-CONFIG_BUSYBOX_CONFIG_LOGIN=y
-# CONFIG_BUSYBOX_CONFIG_LSMOD is not set
-CONFIG_BUSYBOX_CONFIG_LSPCI=y
-CONFIG_BUSYBOX_CONFIG_LSUSB=y
-CONFIG_BUSYBOX_CONFIG_MICROCOM=y
-# CONFIG_BUSYBOX_CONFIG_RMMOD is not set
-CONFIG_BUSYBOX_CONFIG_STTY=y
-CONFIG_BUSYBOX_CONFIG_TFTP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_CGI=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_GZIP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_PROXY=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_NOLOGIN is not set
-CONFIG_BUSYBOX_CONFIG_FEATURE_SECURETTY=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
-# CONFIG_BUSYBOX_CONFIG_WGET is not set
-# CONFIG_BUSYBOX_CONFIG_LOGIN_SCRIPTS is not set
-# CONFIG_BUSYBOX_CONFIG_LOGIN_SESSION_AS_CHILD is not set
-# CONFIG_BUSYBOX_CONFIG_PAM is not set
-# CONFIG_BUSYBOX_CONFIG_TFTP_DEBUG is not set
-# CONFIG_BUSYBOX_CONFIG_NTPD is not set
-CONFIG_BUSYBOX_CONFIG_MOUNTPOINT=y
-CONFIG_BUSYBOX_CONFIG_RUN_PARTS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_RUN_PARTS_FANCY=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_GZIP_LEVELS=y
-CONFIG_BUSYBOX_CONFIG_GZIP_FAST=2
-CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_BUSYBOX_CONFIG_FLOAT_DURATION=y
-CONFIG_BUSYBOX_CONFIG_USLEEP=y
-CONFIG_BUSYBOX_CONFIG_REALPATH=y
-CONFIG_BUSYBOX_CONFIG_TTY=y
-CONFIG_BUSYBOX_CONFIG_BLOCKDEV=y
-CONFIG_BUSYBOX_CONFIG_PARTPROBE=y
-CONFIG_BUSYBOX_CONFIG_LFS=y
-CONFIG_BUSYBOX_CONFIG_FDISK=y
-CONFIG_BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_GPT_LABEL=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED=y
-CONFIG_BUSYBOX_CONFIG_IONICE=y
-CONFIG_BUSYBOX_CONFIG_RENICE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_BTRFS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_F2FS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
-CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
-CONFIG_BUSYBOX_CONFIG_NOHUP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="sha512"
-# CONFIG_BUSYBOX_CONFIG_ARPING is not set
-# CONFIG_BUSYBOX_CONFIG_PING is not set
-# CONFIG_BUSYBOX_CONFIG_PING6 is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_PING is not set

iop/iop.completion

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

iop/scripts/feeds_update-legacy.sh

@@ -1,88 +0,0 @@
-#!/bin/bash
-
-function feeds_update-legacy {
-	heads=1
-	developer=0
-	override=1
-	force=1
-
-	function update_failure {
-		if [ $force == 1 ]; then
-			echo "WARNING: Failed to update feed(s). Forced update, proceeding anyway." >&2
-		else
-			echo "ERROR: Failed to update feed(s). Omit -F to proceed anyway." >&2
-			exit 1
-		fi
-	}
-
-	while getopts "inFh" opt; do
-		case $opt in
-		i)
-			heads=0
-			;;
-		n)
-			override=0
-			;;
-		F)
-			force=0
-			;;
-		h|\?)
-			echo "Usage: ./iop feeds_update-legacy  [-i] [-n] [-F] [-h]"
-			echo
-			echo "OPTIONS:"
-			echo "  -i - Only update index. Do not change HEAD in feeds."
-			echo "  -n - Do not replace core packages with iopsys versions."
-			echo "  -F - Do not force update if there are inaccessible feeds."
-			echo "  -h - Display this help message and exit."
-			exit 1
-			;;
-		esac
-	done
-
-	git remote -v | grep -qE '(git@|ssh://)' && developer=1
-
-	cp .config .genconfig_config_bak
-
-	if [ $heads == 1 ]; then
-		if [ $developer == 1 ]; then
-			./scripts/feeds update -g || update_failure
-		else
-			./scripts/feeds update || update_failure
-		fi
-	fi
-	./scripts/feeds update -ai || exit 1
-
-	# replace core packages with iopsys versions
-	if [ $override == 1 ]; then
-		./scripts/feeds install -f -p openwrt_core -a || exit 1
-		./scripts/feeds install -f -p qualcomm -a || exit 1
-	fi
-
-	(
-		echo '# DO NOT EDIT. Autogenerated file by ./iop feeds_update'
-		echo 'FEED_DEVICES_DIRS:='
-		find feeds -type f -name .is-feed-devices-dir -printf 'FEED_DEVICES_DIRS+=$(TOPDIR)/%h\n'
-	) > target/linux/feed-devices/feed-devices-list.mk || exit 1
-
-	# targets need to be installed explicitly
-	for target in $(ls ./feeds/targets); do
-		./scripts/feeds install -f -p targets $target || exit 1
-	done
-
-	# install all packages
-	./scripts/feeds install -a || exit 1
-
-	# remove broken symlinks ( for packages that are no longer in the feed )
-	find -L package/feeds -maxdepth 2 -type l -delete || exit 1
-
-	cp .genconfig_config_bak .config
-	make defconfig || exit 1
-
-	# record when we last run this script
-	touch tmp/.iop_bootstrap || exit 1
-
-	# always return true
-	exit 0
-}
-
-register_command "feeds_update-legacy" "Update feeds to point to commit hashes from feeds.conf - legacy mode"

iop/scripts/genconfig-legacy.sh

@@ -1,535 +0,0 @@
-#!/bin/bash
-
-function genconfig-legacy {
-	export CLEAN=0
-	export DIRTY="--dirty"
-	export IMPORT=1
-	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
-	export DEVELOPER=0
-	target="bogus"
-	target_config_path=""
-	brcmbca_feed="target/linux/feeds/brcmbca"
-	airoha_feed="target/linux/feeds/airoha"
-	x86_feed="target/linux/feeds/x86"
-	armsr_feed="target/linux/feeds/armsr"
-	mediatek_feed="target/linux/feeds/mediatek"
-	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
-	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
-
-	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 {
-	    local conf_opt
-	    local conf_org
-	    local conf_new
-
-	    while read -r line
-	    do
-		conf_opt=$(echo $line | grep "^[ #]*CONFIG_" | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
-		if [ -n "${conf_opt}" ]
-		then
-		    conf_org=$(find_last ${conf_opt} .genconfig.config)
-		    conf_new=$(find_last ${conf_opt} .config)
-		    if [ "$conf_org" != "$conf_new" ]
-		    then
-			if is_new $conf_opt
-			then
-			    echo -e "config option [${Red}$conf_opt${Color_Off}] is not set correctly in .config"
-			    echo -e "got value [${Yellow}$conf_new${Color_Off}] but wanted [${Yellow}$conf_org${Color_Off}]"
-			    echo "This is a real problem somebody needs to investigate"
-			    echo ""
-			    conf_warned="$conf_warned $conf_opt"
-			fi
-		    else
-			true
-			# for debug to see all options
-			#echo -e "wanted [$conf_org] got [$conf_new]"
-		    fi
-		fi
-	    done < .genconfig.config
-	}
-
-	# 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/feeds/$TARGET" ]; then
-			local targetpath="./target/linux/feeds/$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 $brcmbca_feed/genconfig ] &&
-			brcmbca=$(cd $brcmbca_feed; ./genconfig)
-		[ -e $airoha_feed/genconfig ] &&
-			airoha=$(cd $airoha_feed; ./genconfig)
-		[ -e $x86_feed/genconfig ] &&
-			x86=$(cd $x86_feed; ./genconfig)
-		[ -e $armsr_feed/genconfig ] &&
-			armsr=$(cd $armsr_feed; ./genconfig)
-		[ -e $mediatek_feed/genconfig ] &&
-			mediatek=$(cd $mediatek_feed; ./genconfig)
-		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
-			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
-		[ -e $qualcomm_ipq53xx_feed/genconfig ] &&
-			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
-
-	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armsr mediatek ipq95xx ipq53xx; do
-				echo "$list based boards:"
-				a=$(echo "${!list}" | sort)
-				for b in $a; do
-					echo -e "\t$b"
-				done
-			done
-			return
-	    fi
-
-	    for p in $airoha; do
-		if [ $p == $profile ]; then
-		    target="airoha"
-			target_config_path="$airoha_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $x86; do
-		if [ $p == $profile ]; then
-		    target="x86"
-			target_config_path="$x86_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $armsr; do
-		if [ $p == $profile ]; then
-		    target="armsr"
-			target_config_path="$armsr_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $mediatek; do
-		if [ $p == $profile ]; then
-		    target="mediatek"
-			target_config_path="$mediatek_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq95xx; do
-		if [ $p == $profile ]; then
-		    target="ipq95xx"
-			target_config_path="$qualcomm_ipq95xx_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq53xx; do
-		if [ $p == $profile ]; then
-		    target="ipq53xx"
-			target_config_path="$qualcomm_ipq53xx_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $brcmbca; do
-		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
-		    return
-		fi
-	    done
-	}
-
-	git remote -v | grep -qE '(git@|ssh://)' && {
-		DEVELOPER=1
-	}
-
-	v() {
-		[ "$VERBOSE" -ge 1 ] && echo "$@"
-	}
-
-	usage() {
-		echo
-		echo 1>&2 "Usage: $0 genconfig-legacy [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
-		echo
-		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -D|--no-dirty\t\tIgnore dirty tree"
-		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-legacy eg400 OPERATORX"
-		echo "(if no customerconfig is chosen, iopsys config will be used)"
-		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()
-	{
-		git remote -v | grep -q http || {
-			CUSTBRANCH="$(git rev-parse --abbrev-ref HEAD)"
-			if git ls-remote $CUSTREPO -q 2>/dev/null; then
-				if [ ! -d "$CUSTPATH" ]; then
-					echo "Cloning $CUSTBRANCH branch of $CUSTREPO"
-					git clone -b "$CUSTBRANCH" "$CUSTREPO" "$CUSTPATH" 2>/dev/null || {
-						DEFBRANCH="$(git remote show $CUSTREPO | grep 'HEAD branch' | cut -d' ' -f5)"
-						echo "$CUSTBRANCH branch is not found, cloning $DEFBRANCH branch of $CUSTREPO"
-						git clone "$CUSTREPO" "$CUSTPATH"
-					}
-				elif [ $IMPORT -eq 1 ]; then
-					cd $CUSTPATH
-					echo "Checking out $CUSTBRANCH branch in $CUSTPATH"
-					git checkout "$CUSTBRANCH" 2>/dev/null || {
-						DEFBRANCH="$(git symbolic-ref refs/remotes/origin/HEAD | cut -d '/' -f4)"
-						echo "Checking out $CUSTBRANCH branch has failed, using $DEFBRANCH branch in $CUSTPATH"
-					}
-					v "git pull"
-					git pull
-					cd - >/dev/null #go back
-				fi
-			else
-				echo "You do not have access to $CUSTREPO"
-			fi
-		}
-
-		if [ ! -d "$FILEDIR" ]; then
-			mkdir -p $FILEDIR
-		elif [ -d "$FILEDIR" -a $CLEAN -eq 1 ]; then
-			v "rm -rf $FILEDIR*"
-			rm -rf $FILEDIR*
-		fi
-	}
-
-	get_subtarget_for_device() {
-		readonly target="$1"
-		readonly device="$2"
-		readonly targetinfo_file="tmp/info/.targetinfo-feeds_$target"
-		readonly target_profile_line="Target-Profile: DEVICE_$device"
-		# We want to know after which Target: $target/$subtarget line
-		# our $target_profile_line appears
-		# This is a crude way to "parse" the file using shell 🤯
-		# 1. grep for both lines with line number output
-		# 2. grep again to determine the device profile line that we looked for
-		#    but output one context line before as well to determine corresponding subtarget line
-		# 4. Use head and sed to extract the subtarget
-		grep "^Target: $target/\|^$target_profile_line" "$targetinfo_file" \
-			| grep -E -B1 "^$target_profile_line" \
-			| head -n1 \
-			| sed -E "s|^Target: $target/||"
-	}
-
-	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 $target_config_path/config ]; then
-		    cat $target_config_path/config >> .config
-		    echo "" >> .config
-		fi
-		if [ -f $target_config_path/$BOARDTYPE/config ]; then
-		    cat $target_config_path/$BOARDTYPE/config >> .config
-		    echo "" >> .config
-		fi
-		# hack to support custom-devices until we have deprecated this genconfig-script...
-		local custom_found=false
-		local used_config_file
-
-		for config_file in feeds/*/devices/$target/config/$BOARDTYPE/config; do
-			if [ "$custom_found" = "true" ]; then
-				echo
-				echo "Error was found!"
-				echo "Please use only one path."
-				echo "Two instances of $target/config/$BOARDTYPE exists:"
-				echo "Path 1: $used_config_file"
-				echo "Path 2: $config_file"
-				return 1
-			fi
-			if [ -f "$config_file" ]; then
-				cat "$config_file" >> .config
-				echo "" >> .config
-				custom_found=true
-				used_config_file=$config_file
-			fi
-		done
-
-		# Special handling for targets which use TARGET_DEVICES
-		case "$target" in
-		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
-			# This assumes the device name to be unique within one target,
-			# which is a fair assumption to make.
-			local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")"
-			if [ -z "$subtarget" ]; then
-				echo "Error determining subtarget for $target / ${BOARDTYPE}"
-				return 1
-			fi
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
-			;;
-		*)
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-			;;
-		esac
-
-		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
-					echo "" >> .config
-				fi
-				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
-					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
-					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
-					echo "" >> .config
-				fi
-			done
-		fi
-
-		# Set target version
-		local git_version
-		if ! git_version="$(git describe --always $DIRTY --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
-			echo "ERROR: Failed getting version via git describe, exiting." >&2
-			return 1
-		fi
-		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
-		local version_lower="${version,,}"
-		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .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 [ $DEVELOPER -eq 1 ]; then
-			# rewrite url to clone with ssh instead of http
-			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
-		else
-			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
-		fi
-
-		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 1
-	fi
-
-	if [ $# -eq 0 ]; then
-		echo Current profile:
-		cat $CURRENT_CONFIG_FILE
-		echo "Try ./iop genconfig-legacy -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;;
-			-D|--no-dirty) export DIRTY="";;
-			-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
-
-		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
-
-		setup_dirs
-		create_and_copy_files "$@" || exit 1
-	fi
-}
-
-register_command "genconfig-legacy" "Generate configuration for board and customer - legacy mode"

iop/scripts/genconfig_min-legacy.sh

@@ -1,503 +0,0 @@
-#!/bin/bash
-
-function genconfig_min-legacy {
-	export CLEAN=0
-	export DIRTY="--dirty"
-	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
-	export DEVELOPER=0
-	target="bogus"
-	target_config_path=""
-	brcmbca_feed="target/linux/feeds/brcmbca"
-	airoha_feed="target/linux/feeds/airoha"
-	x86_feed="target/linux/feeds/x86"
-	armsr_feed="target/linux/feeds/armsr"
-	mediatek_feed="target/linux/feeds/mediatek"
-	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
-	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
-
-	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 {
-	    local conf_opt
-	    local conf_org
-	    local conf_new
-
-	    while read -r line
-	    do
-		conf_opt=$(echo $line | grep "^[ #]*CONFIG_" | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
-		if [ -n "${conf_opt}" ]
-		then
-		    conf_org=$(find_last ${conf_opt} .genconfig.config)
-		    conf_new=$(find_last ${conf_opt} .config)
-		    if [ "$conf_org" != "$conf_new" ]
-		    then
-			if is_new $conf_opt
-			then
-			    echo -e "config option [${Red}$conf_opt${Color_Off}] is not set correctly in .config"
-			    echo -e "got value [${Yellow}$conf_new${Color_Off}] but wanted [${Yellow}$conf_org${Color_Off}]"
-			    echo "This is a real problem somebody needs to investigate"
-			    echo ""
-			    conf_warned="$conf_warned $conf_opt"
-			fi
-		    else
-			true
-			# for debug to see all options
-			#echo -e "wanted [$conf_org] got [$conf_new]"
-		    fi
-		fi
-	    done < .genconfig.config
-	}
-
-	# 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/feeds/$TARGET" ]; then
-			local targetpath="./target/linux/feeds/$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 $brcmbca_feed/genconfig ] &&
-			brcmbca=$(cd $brcmbca_feed; ./genconfig)
-		[ -e $airoha_feed/genconfig ] &&
-			airoha=$(cd $airoha_feed; ./genconfig)
-		[ -e $x86_feed/genconfig ] &&
-			x86=$(cd $x86_feed; ./genconfig)
-		[ -e $armsr_feed/genconfig ] &&
-			armsr=$(cd $armsr_feed; ./genconfig)
-		[ -e $mediatek_feed/genconfig ] &&
-			mediatek=$(cd $mediatek_feed; ./genconfig)
-		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
-			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
-		[ -e $qualcomm_ipq53xx_feed/genconfig ] &&
-			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
-
-	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armsr mediatek ipq95xx ipq53xx; do
-				echo "$list based boards:"
-				a=$(echo "${!list}" | sort)
-				for b in $a; do
-					echo -e "\t$b"
-				done
-			done
-			return
-	    fi
-
-	    for p in $airoha; do
-		if [ $p == $profile ]; then
-		    target="airoha"
-			target_config_path="$airoha_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $x86; do
-		if [ $p == $profile ]; then
-		    target="x86"
-			target_config_path="$x86_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $armsr; do
-		if [ $p == $profile ]; then
-		    target="armsr"
-			target_config_path="$armsr_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $mediatek; do
-		if [ $p == $profile ]; then
-		    target="mediatek"
-			target_config_path="$mediatek_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq95xx; do
-		if [ $p == $profile ]; then
-		    target="ipq95xx"
-			target_config_path="$qualcomm_ipq95xx_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq53xx; do
-		if [ $p == $profile ]; then
-		    target="ipq53xx"
-			target_config_path="$qualcomm_ipq53xx_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $brcmbca; do
-		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
-		    return
-		fi
-	    done
-	}
-
-	git remote -v | grep -qE '(git@|ssh://)' && {
-		DEVELOPER=1
-	}
-
-	v() {
-		[ "$VERBOSE" -ge 1 ] && echo "$@"
-	}
-
-	usage() {
-		echo
-		echo 1>&2 "Usage: $0 genconfig_min-legacy [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
-		echo
-		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -D|--no-dirty\t\tIgnore dirty tree"
-		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_min-legacy eg400 OPERATORX"
-		echo "(if no customerconfig is chosen, iopsys config will be used)"
-		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
-	}
-
-	get_subtarget_for_device() {
-		readonly target="$1"
-		readonly device="$2"
-		readonly targetinfo_file="tmp/info/.targetinfo-feeds_$target"
-		readonly target_profile_line="Target-Profile: DEVICE_$device"
-		# We want to know after which Target: $target/$subtarget line
-		# our $target_profile_line appears
-		# This is a crude way to "parse" the file using shell 🤯
-		# 1. grep for both lines with line number output
-		# 2. grep again to determine the device profile line that we looked for
-		#    but output one context line before as well to determine corresponding subtarget line
-		# 4. Use head and sed to extract the subtarget
-		grep "^Target: $target/\|^$target_profile_line" "$targetinfo_file" \
-			| grep -E -B1 "^$target_profile_line" \
-			| head -n1 \
-			| sed -E "s|^Target: $target/||"
-	}
-
-	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 $target_config_path/config ]; then
-		    cat $target_config_path/config >> .config
-		    echo "" >> .config
-		fi
-		if [ -f $target_config_path/$BOARDTYPE/config ]; then
-		    cat $target_config_path/$BOARDTYPE/config >> .config
-		    echo "" >> .config
-		fi
-		# hack to support custom-devices until we have deprecated this genconfig-script...
-		local custom_found=false
-		local used_config_file
-
-		for config_file in feeds/*/devices/$target/config/$BOARDTYPE/config; do
-			if [ "$custom_found" = "true" ]; then
-				echo
-				echo "Error was found!"
-				echo "Please use only one path."
-				echo "Two instances of $target/config/$BOARDTYPE exists:"
-				echo "Path 1: $used_config_file"
-				echo "Path 2: $config_file"
-				return 1
-			fi
-			if [ -f "$config_file" ]; then
-				cat "$config_file" >> .config
-				echo "" >> .config
-				custom_found=true
-				used_config_file=$config_file
-			fi
-		done
-
-		# Special handling for targets which use TARGET_DEVICES
-		case "$target" in
-		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
-			# This assumes the device name to be unique within one target,
-			# which is a fair assumption to make.
-			local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")"
-			if [ -z "$subtarget" ]; then
-				echo "Error determining subtarget for $target / ${BOARDTYPE}"
-				return 1
-			fi
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
-			;;
-		*)
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-			;;
-		esac
-
-		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
-					echo "" >> .config
-				fi
-				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
-					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
-					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
-					echo "" >> .config
-				fi
-			done
-		fi
-
-		# Set target version
-		local git_version
-		if ! git_version="$(git describe --always $DIRTY --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
-			echo "ERROR: Failed getting version via git describe, exiting." >&2
-			return 1
-		fi
-		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
-		local version_lower="${version,,}"
-		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .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 1
-	fi
-
-	if [ $# -eq 0 ]; then
-		echo Current profile:
-		cat $CURRENT_CONFIG_FILE
-		echo "Try ./iop genconfig_min-legacy -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;;
-			-D|--no-dirty) export DIRTY="";;
-			-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
-
-		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
-
-		setup_dirs
-		create_and_copy_files "$@"
-	fi
-}
-
-register_command "genconfig_min-legacy" "Generate configuration for customer with manual board configuration - legacy mode"

iop/scripts/update_package.sh

@@ -1,10 +0,0 @@
-# Exported interface
-update_package() {
-	echo "update_package is no longer supported." >&2
-	echo "Its replacement will come soon." >&2
-	echo >&2
-	echo "For now update references in profiles/include/*.yml and feeds.conf.io manually." >&2
-	return 1
-}
-
-register_command "update_package" "No longer used command"

iopsys-analytics/Makefile

@@ -4,7 +4,7 @@ PKG_NAME:=iopsys-analytics
 PKG_RELEASE:=$(COMMITCOUNT)
 PKG_LICENSE:=PROPRIETARY
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=88dd7997ed78b1ab02c2904ed90518c46a8fa26b
+PKG_SOURCE_VERSION:=aea91816de703cf1c72490f51c2aa73c2f61640d
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopsys-analytics.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -29,11 +29,6 @@ define Package/$(PKG_NAME)
     +collectd-mod-processes                             \
     +collectd-mod-write-http                            \
     +@PACKAGE_COLLECTD_ENCRYPTED_NETWORK                \
-  # remote syslog
-  DEPENDS+=                                             \
-    +syslog-ng                                          \
-    +@SYSLOGNG_LOGROTATE                                \
-
 endef
 
 define Package/$(PKG_NAME)/description

ipt-trigger/Makefile

@@ -0,0 +1,78 @@
+#
+# Copyright (C) 2024 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ipt-trigger
+PKG_VERSION:=1.0.2
+PKG_LICENSE:=GPL-2.0
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=4f3d4427403e0a9be7653c1b92907ae8ae5f21ae
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ipt-trigger.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/ipt-trigger
+  SUBMENU:=Other modules
+  TITLE:=Kernel module for iptables port trigger
+  FILES:=$(PKG_BUILD_DIR)/src/ipv4/ipt_TRIGGER.ko
+  DEPENDS+=+kmod-nf-nat +xtables-legacy
+  AUTOLOAD:=$(call AutoLoad,30,ipt_TRIGGER,1)
+  KCONFIG:=
+endef
+
+define KernelPackage/ip6t-trigger
+  SUBMENU:=Other modules
+  TITLE:=Kernel module for ip6tables port trigger
+  DEPENDS+=+kmod-nf-nat +xtables-legacy
+  FILES:=$(PKG_BUILD_DIR)/src/ipv6/ip6t_TRIGGER.ko
+  AUTOLOAD:=$(call AutoLoad,30,ip6t_TRIGGER,1)
+  KCONFIG:=
+endef
+
+define KernelPackage/ipt-trigger/description
+	Kernel module to enable port trigger for iptables
+endef
+
+define KernelPackage/ip6t-trigger/description
+	Kernel module to enable port trigger for ip6tables
+endef
+
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+	include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+endif
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ./ipt-trigger/* $(PKG_BUILD_DIR)/
+	$(CP) ./ipt-trigger/include/ipt_TRIGGER.h $(LINUX_DIR)/include/linux/netfilter_ipv4/
+endef
+else
+define Build/Prepare
+	$(Build/Prepare/Default)
+	$(CP) $(PKG_BUILD_DIR)/include/ipt_TRIGGER.h $(LINUX_DIR)/include/linux/netfilter_ipv4/
+endef
+endif
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/include/linux/netfilter_ipv4
+	$(CP) $(PKG_BUILD_DIR)/include/ipt_TRIGGER.h $(1)/include/linux/netfilter_ipv4/
+endef
+
+KERNEL_MAKE_FLAGS += -I$(LINUX_DIR)/include
+
+define Build/Compile
+	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src/ipv4/" modules
+	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src/ipv6/" modules
+endef
+
+$(eval $(call KernelPackage,ipt-trigger))
+$(eval $(call KernelPackage,ip6t-trigger))

libdpp/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdpp
-PKG_VERSION:=2.0.0
+PKG_VERSION:=2.1.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f22959b107a8bf443d04d6261d00074b5514dfe8
+PKG_SOURCE_VERSION:=6024efd3db9dd490c07465ea9b0c15120063165c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/libdpp.git
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

libeasy/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libeasy
-PKG_VERSION:=7.4.3
+PKG_VERSION:=7.4.5
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ba80dcc51056772c906cac8022a2537b74959e6a
+PKG_SOURCE_VERSION:=67e6b91b8aca4c068a71f097f5f0576b47ec1d2e
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libeasy.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

libethernet/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libethernet
-PKG_VERSION:=7.2.107
+PKG_VERSION:=7.2.110
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9c0e9ecd62b79d4e89b4f013f04124870d237395
+PKG_SOURCE_VERSION:=d94e3029e4e9d14907fd6b283218defb4d319f5a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libethernet.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -66,7 +66,7 @@ define Package/libethernet
   SUBMENU:=IOPSYS HAL libs
   MENU:=1
   TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_airoha:ecnt_api +TARGET_brcmbca:bcmkernel
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_airoha:ecnt_api +TARGET_brcmbca:bcm963xx-bsp
 endef
 
 define Package/libethernet/description

libpicoevent-bcm/Makefile

@@ -26,11 +26,8 @@ define Package/libpicoevent-bcm
   CATEGORY:=Libraries
   TITLE:=Libpicoevent-bcm
   URL:=
-  DEPENDS:= +TARGET_brcmbca:bcmkernel
+  DEPENDS:= +TARGET_brcmbca:bcm963xx-bsp
   include $(TOPDIR)/feeds/broadcom/bcmkernel/bcm-toolchain.mk
-  TARGET_CFLAGS := -Os -pipe -mfpu=vfpv3-d16 -mfloat-abi=softfp -DCONFIG_TARGET_brcmbca -g3 -fno-caller-saves -fno-plt -Wno-error=unused-but-set-variable -Wno-error=unused-result \
-                   -mfloat-abi=soft -fmacro-prefix-map=$(BUILD_DIR)libpicoevent-bcm-0.3=libpicoevent-bcm-0.3 -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 \
-                   -Wl,-z,now -Wl,-z,relro -Wl,--build-i
 endef
 
 define Package/libpicoevent-bcm/description

libqos/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libqos
-PKG_VERSION:=7.2.106
+PKG_VERSION:=7.2.108
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=02dba6571fddd9b4c5b4b671270604b4c0faf9ae
+PKG_SOURCE_VERSION:=6a72e35e1a662e2f707e4901679676a9c09b3bc2
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libqos.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -65,7 +65,7 @@ define Package/libqos
   SUBMENU:=IOPSYS HAL libs
   MENU:=1
   TITLE:= QoS library (libqos)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_brcmbca:bcmkernel
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_brcmbca:bcm963xx-bsp
 endef
 
 define Package/libqos/config

libvoice-broadcom/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.9
+PKG_VERSION:=1.0.14
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=3a8d0954ca351a1f8f669dc2f3d294409b90f091
+PKG_SOURCE_VERSION:=7fde62b9634c63b9bc71d1c20541798971a78dc8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-d2/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.1.12
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=17388c54e14d8505254c0640067cf697760310ee
+PKG_SOURCE_VERSION:=772955d814af8bbf91cf5c76f128cd1d17755625
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.4.42
+PKG_VERSION:=7.5.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c3efa4ecd3bbf8247bc1b4c3e0ff512e42649531
+PKG_SOURCE_VERSION:=e93fcd63354489846e5bb2450c7e8059774577d5
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -131,7 +131,7 @@ endef
 define Package/libwifi
   $(call Package/libwifi-common)
   TITLE:= WiFi library (libwifi)
-  DEPENDS+=+libnl +libnl-route +libeasy +libwifiutils +TARGET_brcmbca:bcmkernel
+  DEPENDS+=+libnl +libnl-route +libeasy +libwifiutils +TARGET_brcmbca:bcm963xx-bsp
 endef
 
 define Package/libwifi/config

logmngr/Config.in

@@ -0,0 +1,26 @@
+if PACKAGE_logmngr
+choice
+	prompt "Select backend for syslog management"
+	default LOGMNGR_BACKEND_FLUENTBIT
+	depends on PACKAGE_logmngr
+	help
+		Select which backend daemon to use for syslog management
+
+config LOGMNGR_BACKEND_FLUENTBIT
+	bool "Use fluent-bit for log management"
+	help
+		Enable this option to use fluent-bit for log management.
+
+config LOGMNGR_BACKEND_SYSLOG_NG
+	bool "Use syslog-ng for log management"
+	help
+		Enable this option to use syslog-ng for log management.
+
+endchoice
+config LOGMNGR_LOGROTATE
+	bool "Logrotate support"
+	depends on PACKAGE_logmngr
+	default y
+	help
+		It adds support for logrotate functionality.
+endif

logmngr/Makefile

@@ -0,0 +1,74 @@
+#
+# Copyright (C) 2024 iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=logmngr
+PKG_VERSION:=1.0.1
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/system/logmngr.git
+PKG_SOURCE_VERSION:=ec10abb3cc0f3b96eb806c9c67e18d9d134287e9
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
+
+MAKE_PATH:=bbf_plugin
+
+define Package/logmngr
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=Logging Manager
+ DEPENDS:=+libbbfdm-api +LOGMNGR_BACKEND_FLUENTBIT:fluent-bit +LOGMNGR_LOGROTATE:logrotate
+ DEPENDS+=+LOGMNGR_BACKEND_SYSLOG_NG:syslog-ng
+endef
+
+define Package/logmngr/description
+	Configure log management. This package has the datamodel as well as the
+	the backend implementation for handling syslog.
+endef
+
+define Package/$(PKG_NAME)/config
+        source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ./logmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/logmngr/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/logmngr.init $(1)/etc/init.d/logmngr
+
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/logread $(1)/usr/sbin
+
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/10-logmngr_config_generate $(1)/etc/uci-defaults/
+
+	$(INSTALL_DIR) $(1)/lib/logmngr
+ifeq ($(CONFIG_LOGMNGR_BACKEND_FLUENTBIT),y)
+	$(INSTALL_DATA) ./files/lib/logmngr/fluent-bit.sh $(1)/lib/logmngr/.
+endif
+ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y)
+	$(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/.
+endif
+	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1)
+ifeq ($(CONFIG_LOGMNGR_LOGROTATE),y)
+	$(INSTALL_BIN) ./files/11-logmngr_logrotate_config_generate $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/lib/logmngr/logrotate.sh $(1)/lib/logmngr/.
+	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbflogrotate.so $(1)
+endif
+endef
+
+$(eval $(call BuildPackage,logmngr))

logmngr/files/10-logmngr_config_generate

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+if [ -s "/etc/config/logmngr" ]; then
+	if uci -q get logmngr.@globals[0] >/dev/null; then
+		# return if there is any valid content
+		exit
+	else
+		rm -f /etc/config/logmngr
+	fi
+fi
+touch /etc/config/logmngr
+
+uci set logmngr.globals=globals
+uci set logmngr.globals.enable=1
+
+uci set logmngr.a1=action
+uci set logmngr.a1.name="ac1"
+
+uci set logmngr.lf1=log_file
+uci set logmngr.lf1.enable=1
+uci set logmngr.lf1.action="ac1"
+uci set logmngr.lf1.file="/var/log/messages"
+uci commit logmngr

logmngr/files/11-logmngr_logrotate_config_generate

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ -s "/etc/config/logmngr" ]; then
+	if uci -q get logmngr.@log_rotate[0] >/dev/null; then
+		# return if there is any valid content
+		exit
+	fi
+	uci set logmngr.lro1=log_rotate
+	uci set logmngr.lro1.enable=1
+	uci set logmngr.lro1.file_name="/var/log/messages"
+	uci set logmngr.lro1.file_count=1
+	uci set logmngr.lro1.max_file_size=1000000
+	uci commit logmngr
+fi

logmngr/files/lib/logmngr/fluent-bit.sh

@@ -0,0 +1,319 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /lib/logmngr/logrotate.sh
+
+CONF_FILE=/etc/fluent-bit/fluent-bit.conf
+TMP_CONF_FILE=/tmp/fluent-bit/fluent-bit.conf
+
+create_config_file() {
+	mkdir -p /tmp/fluent-bit
+	rm -f ${TMP_CONF_FILE}
+	touch ${TMP_CONF_FILE}
+}
+
+create_service_section() {
+	# the service section of the fluent-bit.conf file has hardcoded values,
+	# no need to lookup any uci section to configure this section
+	echo "[SERVICE]" >> ${TMP_CONF_FILE}
+	echo "    flush        3" >> ${TMP_CONF_FILE}
+	echo "    daemon       off" >> ${TMP_CONF_FILE}
+	echo "    log_level    info" >> ${TMP_CONF_FILE}
+	echo "    parsers_file /etc/fluent-bit/parsers.conf" >> ${TMP_CONF_FILE}
+}
+
+create_input_section() {
+	local tag="$1"
+	# the input in our case is always syslog, hence, this section of the
+	# fluent-bit.conf file has hardcoded values as well that do not depend
+	# on any uci value
+	echo "[INPUT]" >> ${TMP_CONF_FILE}
+	echo "    name        syslog" >> ${TMP_CONF_FILE}
+	echo "    tag         $tag" >> ${TMP_CONF_FILE}
+	echo "    path        /dev/log" >> ${TMP_CONF_FILE}
+}
+
+generate_facility_regex() {
+	local facility_level=$1
+	local pri=0
+
+	if [ "$facility_level" == "24" ]; then
+		# value 24 means all facility level, which is as good as not
+		# generating a filter section, so return
+		return
+	fi
+
+	# facility_level is a list value, hence, generate regex for
+	# each value
+	IFS=" "
+	for val in $facility_level; do
+		# as per rfc 5424 and 3164, pri in syslog msg is
+		# facility*8+severity. Severity value can range from 0-7 hence
+		# generate regex for each.
+		for sval in 0 1 2 3 4 5 6 7; do
+			pri=`expr $val \* 8 + $sval`
+			echo "    regex        pri $pri" >> ${TMP_CONF_FILE}
+		done
+	done
+
+}
+
+generate_severity_regex() {
+	local sev_level="$1"
+	local sev_compare="$2"
+	local sev_action="$3"
+
+	local pri=0
+	local param="exclude"
+
+	if [ "$sev_action" == "0" ]; then
+		param="regex"
+	fi
+
+	local fval=0
+	if [ "$sev_compare" == "0" ]; then
+		# generate regex for all facility values, with severity=sev_level
+		while [ $fval -le 23 ] ; do
+			pri=`expr $fval \* 8 + $sev_level`
+			echo "    $param        pri $pri" >> ${TMP_CONF_FILE}
+			fval=$((fval + 1))
+		done
+	elif [ "$sev_compare" == "1" ]; then
+		# generate regex for all severity value greater than or equal to
+		# sev_level. please, lower value have higher precedence, so sev_level
+		# 0 which is emergency has higher precedence than error which is 3
+		while [ $fval -le 23 ] ; do
+			sval=0
+			while [ $sev_level -ge $sval ]; do
+				pri=`expr $fval \* 8 + $sval`
+				echo "    $param        pri $pri" >> ${TMP_CONF_FILE}
+				sval=$((sval + 1))
+			done
+			fval=$((fval + 1))
+		done
+	fi
+}
+
+handle_filter_conf() {
+	local section="$1" # config filter
+	local filter_name="$2"
+	local name
+
+	# no need to proceed if name of filter section is not one of the values
+	# listed in option filter in config action section
+	config_get name $section name
+	if [ "$name" != "$filter_name" ]; then
+		return
+	fi
+
+	# as per data model, at a time either facility_level or severity_level can
+	# be specified along with pattern_match. hence, first process and generate
+	# regex for pattern_match which is common in both condition. Next, we will
+	# process facility_level and return if facility level is defined and not
+	# process severity related params at all.
+
+	local pattern_match
+	config_get pattern_match $section pattern_match
+	if [ -n "$pattern_match" ]; then
+		echo "    regex        $pattern_match" >> ${TMP_CONF_FILE}
+	fi
+
+	local facility_level
+	config_get facility_level $section facility_level
+
+	if [ -n "$facility_level" ]; then
+		generate_facility_regex $facility_level
+		# return from here since if facility_level is defined, then no
+		# need to process severity_level
+		return
+	fi
+
+	local sev_level
+	local sev_compare
+	local sev_action
+	config_get sev_level $section severity_level
+
+	if [ -n "$sev_level" ]; then
+		# value 1 of severity compare corresponds to data model
+		# and system default which is EqualorHigher
+		config_get sev_compare $section severity_compare 1
+		# value 0 of severity action corresponds to data model
+		# and system default that is log
+		config_get sev_action $section severity_action 0
+
+		generate_severity_regex $sev_level $sev_compare $sev_action
+	fi
+}
+
+create_filter_section() {
+	local match="$1"
+
+	echo "[FILTER]" >> ${TMP_CONF_FILE}
+	echo "    name        grep" >> ${TMP_CONF_FILE}
+	echo "    match       $match" >> ${TMP_CONF_FILE}
+	echo "    logical_op  or" >> ${TMP_CONF_FILE} # handle multiple filters
+}
+
+handle_filter_ref() {
+	local filter_name="$1"
+	config_foreach handle_filter_conf filter "$filter_name"
+}
+
+handle_log_file() {
+	local section="$1" # out_file section
+	local match="$2"
+	local action_ref
+
+	config_get action_ref $section action
+	if [ "$action_ref" != "$match" ]; then
+		return
+	fi
+
+	local enabled
+	config_get enabled $section enable
+	if [ "$enabled" == 0 ]; then
+		return
+	fi
+
+	local file
+	config_get file $section file
+	if [ -z "$file" ]; then
+		return
+	fi
+
+	echo "[OUTPUT]" >> ${TMP_CONF_FILE}
+	echo "    name         file" >> ${TMP_CONF_FILE}
+	echo "    match        $match" >> ${TMP_CONF_FILE}
+	echo "    file        $file" >> ${TMP_CONF_FILE}
+}
+
+handle_log_remote() {
+	local section="$1"
+	local match="$2"
+	local action_ref
+
+	config_get action_ref $section action
+	if [ "$action_ref" != "$match" ]; then
+		return
+	fi
+
+	local enabled
+	config_get enabled $section enable
+	if [ "$enabled" == 0 ]; then
+		return
+	fi
+
+
+	local address
+	config_get address $section log_ip
+	if [ -z "$address" ]; then
+		return
+	fi
+
+	echo "[OUTPUT]" >> ${TMP_CONF_FILE}
+	echo "    name         syslog" >> ${TMP_CONF_FILE}
+	echo "    match        $match" >> ${TMP_CONF_FILE}
+	echo "    host         $address" >> ${TMP_CONF_FILE}
+
+	local proto # holds value tcp or udp
+	config_get proto $section proto
+	if [ -n "$proto" ]; then
+		if [ "$proto" == "tls" ]; then
+			echo "    mode         tcp" >> ${TMP_CONF_FILE}
+			echo "    tls          on" >> ${TMP_CONF_FILE}
+		else
+			echo "    mode         $proto" >> ${TMP_CONF_FILE}
+		fi
+	fi
+
+	local port
+	config_get port $section port
+	if [ -n "$port" ]; then
+		echo "    port         $port" >> ${TMP_CONF_FILE}
+	fi
+
+	local cert
+	local peer_verify
+	config_get cert $section cert
+	if [ -n "$cert" ]; then
+		echo "    tls.crt_file $cert" >> ${TMP_CONF_FILE}
+
+		config_get peer_verify $section peer_verify
+		if [ "$peer_verify" == "1" ]; then
+			echo "    tls.verify     on" >> ${TMP_CONF_FILE}
+		fi
+	fi
+}
+
+handle_action() {
+	local section="$1"
+
+	local filter
+	config_get filter $section filter
+
+	# use config action option name as tag for input
+	local tag
+	config_get tag $section name
+	if [ -z "$tag" ]; then
+		return
+	fi
+
+	create_input_section $tag
+	if [ -n "$filter" ]; then
+		# the only fluentbit filter that is useful for the datamodel is
+		# grep. Also, fluentbit does not seem to handle multiple instances
+		# of FILTER of same kind. Hence, each filter section corresponding
+		# to an action entry in the uci would translate for us into a set of
+		# regex/exclude values instead of individual FILTER section per uci
+		# section filter is a list, treat according
+		create_filter_section $tag
+
+		IFS=" "
+		for finst in $filter; do
+			handle_filter_ref $finst
+		done
+	fi
+
+	# handle output, each action can be associated with a out_log and out_syslog
+	# section so figure out if any out_log or out_syslog section is associated
+	# with this and action and setup output accordingly.
+	config_foreach handle_log_file log_file "$tag"
+	config_foreach handle_log_remote log_remote "$tag"
+
+
+}
+
+handle_action_section() {
+	config_foreach handle_action action
+}
+
+apply_config_file() {
+	cp ${TMP_CONF_FILE} ${CONF_FILE}
+}
+
+PROG=/usr/sbin/fluent-bit
+logmngr_init() {
+	create_config_file
+
+	config_load logmngr
+	local enabled
+	config_get enabled globals enable
+
+	if [ "$enabled" == "0" ]; then
+		return
+	fi
+
+	create_service_section
+	handle_action_section
+	apply_config_file
+
+	if [ -f /lib/logmngr/logrotate.sh ]; then
+		logrotate_init
+	fi
+
+	procd_open_instance logmngr
+	procd_set_param command $PROG -c $CONF_FILE
+	procd_set_param file $CONF_FILE
+	procd_set_param respawn
+	procd_close_instance
+}

logmngr/files/lib/logmngr/logrotate.sh

@@ -0,0 +1,96 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+LOGROTATE_FILE=/etc/logrotate.conf
+LOGROTATE_TMP_FILE=/tmp/logrotate/logrotate.conf
+
+create_logrotate_file() {
+	mkdir -p /tmp/logrotate
+	rm -f ${LOGROTATE_TMP_FILE}
+	touch ${LOGROTATE_FILE}
+}
+
+
+handle_logrotate() {
+	local section="$1"
+
+	local enabled
+	config_get enabled $section enable
+	if [ "$enabled" == "0" ]; then
+		return
+	fi
+
+	local file_name
+	config_get file_name $section file_name
+	if [ -z "$file_name" ]; then
+		# no file to rotate, return
+		return
+	fi
+
+	echo -e "$file_name {" >> ${LOGROTATE_TMP_FILE}
+	echo -e "\tcreate" >> ${LOGROTATE_TMP_FILE}
+	echo -e "\tmissingok" >> ${LOGROTATE_TMP_FILE}
+	echo -e "\tnotifempty" >> ${LOGROTATE_TMP_FILE}
+
+	local file_count
+	config_get file_count $section file_count
+	if [ -n "$file_count" ]; then
+		echo -e "\trotate $file_count" >> ${LOGROTATE_TMP_FILE}
+	fi
+
+	local max_file_size
+	config_get max_file_size $section max_file_size
+	if [ -n "$max_file_size" ]; then
+		echo -e "\tmaxsize $max_file_size" >> ${LOGROTATE_TMP_FILE}
+	fi
+
+	local duration
+	config_get duration $section duration
+	if [ -n "$duration" ]; then
+		echo -e "\tminutes $duration" >> ${LOGROTATE_TMP_FILE}
+	fi
+
+	local retention
+	config_get retention $section retention
+	if [ -n "$retention" ]; then
+		echo -e "\tmaxage $retention" >> ${LOGROTATE_TMP_FILE}
+	fi
+
+	local compression
+	config_get compression $section compression
+	if [ -n "$compression" ]; then
+		echo -e "\tcompress" >> ${LOGROTATE_TMP_FILE}
+		echo -e "\tcompresscmd $compression" >> ${LOGROTATE_TMP_FILE}
+	fi
+
+	echo -e "\tpostrotate" >> ${LOGROTATE_TMP_FILE}
+	echo -e "\t\tservice logmngr restart" >> ${LOGROTATE_TMP_FILE}
+	echo -e "\t\tsleep 1" >> ${LOGROTATE_TMP_FILE}
+	echo -e "\tendscript" >> ${LOGROTATE_TMP_FILE}
+	echo -e "}" >> ${LOGROTATE_TMP_FILE} # close the logfile section
+}
+
+apply_logrotate_file() {
+	cp ${LOGROTATE_TMP_FILE} ${LOGROTATE_FILE}
+}
+
+config_cron_job() {
+	# taking the liberty to configure the cron job hourly, that is, at the end
+	# of each hour, check if logrotation is needed. The logrotate daemon, when
+	# triggered hourly, will still honour the configure log rotation duration,
+	# the only slight different being that if the minutes for log rotation
+	# are configured in such a way that it falls within the hour, then the
+	# log rotation will be done at the completion of hour and not before. I do
+	# not think this is a drawback in the interest of keeping things simple.
+	sed -i '/logrotate/d' /etc/crontabs/root
+	echo "0 * * * * logrotate ${LOGROTATE_FILE}" >> /etc/crontabs/root
+	/etc/init.d/cron restart
+}
+
+logrotate_init() {
+	create_logrotate_file
+	config_foreach handle_logrotate log_rotate
+	apply_logrotate_file
+	config_cron_job
+}

logmngr/files/lib/logmngr/syslog-ng.sh

@@ -0,0 +1,345 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /lib/logmngr/logrotate.sh
+
+CONF_FILE=/etc/syslog-ng.conf
+TMP_CONF_FILE=/tmp/syslog-ng/syslog-ng.conf
+
+create_config_file() {
+	mkdir -p /tmp/syslog-ng
+	rm -f ${TMP_CONF_FILE}
+	touch ${TMP_CONF_FILE}
+}
+
+create_option_section() {
+	# the option section of the syslog-ng.conf file has hardcoded values,
+	# no need to lookup any uci section to configure this section
+	echo -e "@version: 4.4" >> ${TMP_CONF_FILE}
+	echo -e '@include "scl.conf"' >> ${TMP_CONF_FILE}
+	echo -e "options {" >> ${TMP_CONF_FILE}
+	echo -e "\tchain_hostnames(no);" >> ${TMP_CONF_FILE}
+	echo -e "\tcreate_dirs(yes);" >> ${TMP_CONF_FILE}
+	echo -e "\tkeep_hostname(yes);" >> ${TMP_CONF_FILE}
+	echo -e "\tlog_fifo_size(256);" >> ${TMP_CONF_FILE}
+	echo -e "\tlog_msg_size(1024);" >> ${TMP_CONF_FILE}
+	echo -e "\tstats(freq(0));" >> ${TMP_CONF_FILE}
+	echo -e "\tflush_lines(0);" >> ${TMP_CONF_FILE}
+	echo -e "\tuse_fqdn(no);" >> ${TMP_CONF_FILE}
+	echo "};" >> ${TMP_CONF_FILE}
+
+}
+
+create_input_section() {
+	local tag="$1"
+	# the input in our case is always syslog, hence, this section of the
+	# fluent-bit.conf file has hardcoded values as well that do not depend
+	# on any uci value
+	echo -e "source $tag {" >> ${TMP_CONF_FILE}
+	echo -e "\tinternal();" >> ${TMP_CONF_FILE}
+	echo -e "\tunix-dgram("/dev/log");" >> ${TMP_CONF_FILE}
+	echo "};" >> ${TMP_CONF_FILE}
+}
+
+generate_facility_regex() {
+	local facility_level=$1
+
+	if [ "$facility_level" == "24" ]; then
+		# value 24 means all facility level, which is as good as not
+		# generating a filter section, so return
+		return
+	fi
+
+	# facility_level is a list value, hence, generate regex for
+	# each value
+	IFS=" "
+	for val in $facility_level; do
+		echo -e "\tfacility($val);" >> ${TMP_CONF_FILE}
+	done
+
+}
+
+generate_severity_regex() {
+	local sev_level="$1"
+	local sev_compare="$2"
+	local sev_action="$3"
+
+	if [ "$sev_compare" == "0" ]; then
+		case $sev_level in
+		"0") echo -e "\tlevel(emerg)" >> ${TMP_CONF_FILE}
+		;;
+		"1") echo -e "\tlevel(alert)" >> ${TMP_CONF_FILE}
+		;;
+		"2") echo -e "\tlevel(crit)" >> ${TMP_CONF_FILE}
+		;;
+		"3") echo -e "\tlevel(err)" >> ${TMP_CONF_FILE}
+		;;
+		"4") echo -e "\tlevel(warning)" >> ${TMP_CONF_FILE}
+		;;
+		"5") echo -e "\tlevel(notice)" >> ${TMP_CONF_FILE}
+		;;
+		"6") echo -e "\tlevel(info)" >> ${TMP_CONF_FILE}
+		;;
+		"7") echo -e "\tlevel(debug)" >> ${TMP_CONF_FILE}
+		;;
+		esac
+	elif [ "$sev_compare" == "1" ]; then
+		# generate regex for all severity value greater than or equal to
+		# sev_level
+		case $sev_level in
+		"0") echo -e "\tlevel(emerg)" >> ${TMP_CONF_FILE}
+		;;
+		"1") echo -e "\tlevel(alert..emerg)" >> ${TMP_CONF_FILE}
+		;;
+		"2") echo -e "\tlevel(crit..emerg)" >> ${TMP_CONF_FILE}
+		;;
+		"3") echo -e "\tlevel(err..emerg)" >> ${TMP_CONF_FILE}
+		;;
+		"4") echo -e "\tlevel(warning..emerg)" >> ${TMP_CONF_FILE}
+		;;
+		"5") echo -e "\tlevel(notice..emerg)" >> ${TMP_CONF_FILE}
+		;;
+		"6") echo -e "\tlevel(info..emerg)" >> ${TMP_CONF_FILE}
+		;;
+		"7") echo -e "\tlevel(debug..emerg)" >> ${TMP_CONF_FILE}
+		;;
+		esac
+	fi
+}
+
+handle_filter_conf() {
+	local section="$1" # config filter
+	local filter_name="$2"
+	local name
+
+	# no need to proceed if name of filter section is not one of the values
+	# listed in option filter in config action section
+	config_get name $section name
+	if [ "$name" != "$filter_name" ]; then
+		return
+	fi
+	echo -e "filter $name {" >> ${TMP_CONF_FILE}
+
+	# as per data model, at a time either facility_level or severity_level can
+	# be specified along with pattern_match. hence, first process and generate
+	# regex for pattern_match which is common in both condition. Next, we will
+	# process facility_level and return if facility level is defined and not
+	# process severity related params at all.
+
+	local pattern_match
+	config_get pattern_match $section pattern_match
+	if [ -n "$pattern_match" ]; then
+		# the pattern here is in tag=>value pair, hence, break the pattern
+		# and fill this filed
+		local tag=$(echo $pattern_match | awk '{print $1}')
+		local value=$(echo $pattern_match | awk '{print $2}')
+		echo -e "\tmatch("$value" value("$tag"))" >> ${TMP_CONF_FILE}
+	fi
+
+	local facility_level
+	config_get facility_level $section facility_level
+
+	if [ -n "$facility_level" ]; then
+		generate_facility_regex $facility_level
+		# return from here since if facility_level is defined, then no
+		# need to process severity_level
+		echo "};" >> ${TMP_CONF_FILE}
+		return
+	fi
+
+	local sev_level
+	local sev_compare
+	local sev_action
+	config_get sev_level $section severity_level
+
+	if [ -n "$sev_level" ]; then
+		# value 1 of severity compare corresponds to data model
+		# and system default which is EqualorHigher
+		config_get sev_compare $section severity_compare 1
+		# value 0 of severity action corresponds to data model
+		# and system default that is log
+		config_get sev_action $section severity_action 0
+
+		generate_severity_regex $sev_level $sev_compare $sev_action
+	fi
+	echo "};" >> ${TMP_CONF_FILE}
+}
+
+handle_filter_ref() {
+	local filter_name="$1"
+	config_foreach handle_filter_conf filter "$filter_name"
+}
+
+handle_log_file() {
+	local section="$1" # out_file section
+	local match="$2"
+	local filter="$3"
+	local action_ref
+
+	config_get action_ref $section action
+	if [ "$action_ref" != "$match" ]; then
+		return
+	fi
+
+	local enabled
+	config_get enabled $section enable
+	if [ "$enabled" == 0 ]; then
+		return
+	fi
+
+	local file
+	config_get file $section file
+	if [ -z "$file" ]; then
+		return
+	fi
+
+
+	echo -e "destination file_$match {" >> ${TMP_CONF_FILE}
+	echo -e "\tfile("$file");" >> ${TMP_CONF_FILE}
+	echo -e "};" >> ${TMP_CONF_FILE}
+
+	# now generate the log section for each action section to bring into effect
+	# the filter, destination, source sections create above
+	echo -e "log {" >> ${TMP_CONF_FILE}
+	echo -e "\tsource($tag);" >> ${TMP_CONF_FILE}
+	if [ -n "$filter" ]; then
+		IFS=" "
+		for finst in $filter; do
+			echo -e "\tfilter($finst);" >> ${TMP_CONF_FILE}
+		done
+	fi
+	echo -e "\tdestination(file_$match);" >> ${TMP_CONF_FILE} # log_file
+	echo -e "};" >> ${TMP_CONF_FILE} # close log section
+}
+
+handle_log_remote() {
+	local section="$1"
+	local match="$2"
+	local filter="$3"
+	local action_ref
+
+	config_get action_ref $section action
+	if [ "$action_ref" != "$match" ]; then
+		return
+	fi
+
+	local enabled
+	config_get enabled $section enable
+	if [ "$enabled" == 0 ]; then
+		return
+	fi
+
+
+	local address
+	config_get address $section log_ip
+	if [ -z "$address" ]; then
+		return
+	fi
+
+	echo -e "destination remote_$match {" >> ${TMP_CONF_FILE}
+	echo -e "\tsyslog(" >> ${TMP_CONF_FILE}
+	echo -e "\t\t"$address"" >> ${TMP_CONF_FILE}
+
+	local proto # holds value tcp or udp
+	config_get proto $section proto
+	if [ -n "$proto" ]; then
+		echo -e "\t\ttransport($proto)" >> ${TMP_CONF_FILE}
+	fi
+
+	local port
+	config_get port $section port
+	if [ -n "$port" ]; then
+		echo -e "\t\tport($port)" >> ${TMP_CONF_FILE}
+	fi
+
+	local cert
+	local peer_verify
+	config_get cert $section cert
+	if [ -n "$cert" ]; then
+		echo -e "\t\ttls(" >> ${TMP_CONF_FILE}
+		echo -e "\t\t\tcert-file($cert)" >> ${TMP_CONF_FILE}
+
+		config_get peer_verify $section peer_verify
+		if [ "$peer_verify" == "1" ]; then
+			echo -e "\t\t\tpeer-verify(required-trusted)" >> ${TMP_CONF_FILE}
+		fi
+		echo -e "\t\t)" >> ${TMP_CONF_FILE} # close tls section
+	fi
+	echo -e "\t);" >> ${TMP_CONF_FILE} # close syslog section
+	echo -e "};" >> ${TMP_CONF_FILE} # close destination section
+
+	# now generate the log section for each action section to bring into effect
+	# the filter, destination, source sections create above
+	echo -e "log {" >> ${TMP_CONF_FILE}
+	echo -e "\tsource($tag);" >> ${TMP_CONF_FILE}
+	if [ -n "$filter" ]; then
+		IFS=" "
+		for finst in $filter; do
+			echo -e "\tfilter($finst);" >> ${TMP_CONF_FILE}
+		done
+	fi
+	echo -e "\tdestination(remote_$match);" >> ${TMP_CONF_FILE} # log_file
+	echo -e "};" >> ${TMP_CONF_FILE} # close log section
+}
+
+handle_action() {
+	local section="$1"
+
+	local filter
+	config_get filter $section filter
+
+	# use config action option name as tag for input
+	local tag
+	config_get tag $section name
+	if [ -z "$tag" ]; then
+		return
+	fi
+
+	create_input_section $tag
+	if [ -n "$filter" ]; then
+		IFS=" "
+		for finst in $filter; do
+			handle_filter_ref $finst
+		done
+	fi
+
+	# handle output, each action can be associated with a out_log and out_syslog
+	# section so figure out if any out_log or out_syslog section is associated
+	# with this and action and setup output accordingly.
+	config_foreach handle_log_file log_file "$tag" "$filter"
+	config_foreach handle_log_remote log_remote "$tag" "$filter"
+}
+
+handle_action_section() {
+	config_foreach handle_action action
+}
+
+apply_config_file() {
+	cp ${TMP_CONF_FILE} ${CONF_FILE}
+}
+
+PROG=/usr/sbin/syslog-ng-ctl
+
+logmngr_init() {
+	create_config_file
+
+	config_load logmngr
+	local enabled
+	config_get enabled globals enable
+
+	if [ "$enabled" == "0" ]; then
+		return
+	fi
+
+	create_option_section
+	handle_action_section
+	apply_config_file
+
+	if [ -f /lib/logmngr/logrotate.sh ]; then
+		logrotate_init
+	fi
+
+	procd_open_instance logmngr
+	procd_set_param command $PROG reload
+	procd_close_instance
+}

logmngr/files/logmngr.init

@@ -0,0 +1,16 @@
+#!/bin/sh /etc/rc.common
+
+START=12
+STOP=89
+USE_PROCD=1
+
+. /lib/functions.sh
+include /lib/logmngr
+
+start_service() {
+	logmngr_init
+}
+
+service_triggers() {
+	procd_add_reload_trigger logmngr
+}

logmngr/files/logread

@@ -0,0 +1,108 @@
+#!/bin/sh
+# Shell script compatibility wrapper for /sbin/logread
+#
+# Copyright (C) 2019 Dirk Brenken <dev@brenken.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+. /lib/functions.sh
+
+# use /var/log/messages as default
+logfile="/var/log/messages"
+
+
+handle_log_file() {
+	local section="$1"
+
+	local enabled
+	config_get enabled $section enable
+	if [ "$enabled" == 0 ]; then
+		return
+	fi
+
+	local file
+	config_get file $section file
+	if [ -z "$file" ]; then
+		return
+	fi
+
+	logfile="$file"
+}
+
+config_load logmngr
+config_get logmngr_enabled globals enable
+if [ "$logmngr_enabled" == "0" ]; then
+	printf "%s\n" "Error: logmngr is not enabled!"
+	exit 2
+fi
+
+# treat the last enabled log_file as logfile
+config_foreach handle_log_file log_file
+
+if [ ! -f "${logfile}" ]
+then
+	printf "%s\n" "Error: logfile $logfile not found!"
+	exit 2
+fi
+
+usage()
+{
+	printf "%s\n" "Usage: logread [options]"
+	printf "%s\n" "Options:"
+	printf "%5s %-10s%s\n" "-l" "<count>" "Got only the last 'count' messages"
+	printf "%5s %-10s%s\n" "-e" "<pattern>" "Filter messages with a regexp"
+	printf "%5s %-10s%s\n" "-f" "" "Follow log messages"
+	printf "%5s %-10s%s\n" "-h" "" "Print this help message"
+}
+
+if [ -z "${1}" ]
+then
+	cat "${logfile}"
+	exit 0
+else
+	while [ "${1}" ]
+	do
+		case "${1}" in
+			-l)
+				shift
+				count="${1//[^0-9]/}"
+				tail -n "${count:-50}" "${logfile}"
+				exit 0
+				;;
+			-e)
+				shift
+				pattern="${1}"
+				grep -E "${pattern}" "${logfile}"
+				exit 0
+				;;
+			-f)
+				tail -f "${logfile}"
+				exit 0
+				;;
+			-fe)
+				shift
+				pattern="${1}"
+				tail -f "${logfile}" | grep -E "${pattern}"
+				exit 0
+				;;
+			-h|*)
+				usage
+				exit 1
+				;;
+		esac
+		shift
+	done
+fi

map-agent/Config.in

@@ -15,7 +15,7 @@ config AGENT_EASYMESH_R2_CERT
 
 config AGENT_EASYMESH_VERSION
 	int "Support Easymesh version"
-	default 4
+	default 6
 
 config AGENT_EASYMESH_VENDOR_EXT
 	bool "Enable extra features through Easymesh vendor extension"
@@ -55,5 +55,12 @@ config AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST
 config AGENT_USE_LIBDPP
 	bool "Depend on libdpp for DPP EasyConnect"
 
+config AGENT_CHECK_PARTIAL_WIFI_RELOAD
+	bool "Option that allow SSID/PSK simple reload"
+	default y
+
+config DYNBHD_DYNAMICALLY_PERSIST_CONTROLLER
+	bool "Let dynbhd through AP-Autoconfiguration Search and DHCP Discovery determine the controller or agent role"
+
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.5.1.15
+PKG_VERSION:=6.1.1.7
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=76c10aea46dd59f050666abd1315b00317bc4f7d
+PKG_SOURCE_VERSION:=ce4bbb86e02c7c083c8bdd6bf05a5f83a4cbda0f
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -105,6 +105,14 @@ ifeq ($(CONFIG_AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST),y)
 TARGET_CFLAGS += -DOPER_CHAN_CHANGE_RELAY_MCAST
 endif
 
+ifeq ($(CONFIG_AGENT_CHECK_PARTIAL_WIFI_RELOAD),y)
+TARGET_CFLAGS += -DCHECK_PARTIAL_WIFI_RELOAD
+endif
+
+ifeq ($(CONFIG_DYNBHD_DYNAMICALLY_PERSIST_CONTROLLER),y)
+TARGET_CFLAGS += -DPERSIST_CONTROLLER
+endif
+
 MAKE_PATH:=src
 
 define Package/map-agent/install

map-agent/files/etc/config/mapagent

@@ -1,14 +1,14 @@
 config agent 'agent'
-	option enabled '0'
+	option enabled '1'
 	option debug '0'
 	option profile '3'
 	option al_bridge 'br-lan'
-	option netdev 'wlan'
-	option island_prevention '0'
+	option island_prevention '1'
 	option eth_onboards_wifi_bhs '1'
 	option scan_on_boot_only '0'
 	option chan_ch_relay_mcast '0'
 	option guest_isolation '1'
+	option partial_wifi_reload '0'
 	list map_port 'all'
 #	option controller_macaddr '0a:1b:2c:3d:4e:50'
 

map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul

@@ -1,17 +1,19 @@
 #!/bin/sh
 
-. /lib/network/utils.sh
-
 conn_ports_file="/var/run/multiap/map.connected.ports"
 map_bh_file="/var/run/multiap/multiap.backhaul"
+
+# Exit if AL Bridge is not configured to be a bridge device
 al_bridge="$(uci -q get mapagent.agent.al_bridge)"
 [ "${al_bridge:0:3}" = "br-" ] || exit 0
-al_brnet="${al_bridge:3}"
 
 # Exit if the PORT is not member of the AL Bridge
-[ "$(get_network_of $PORT)" = "$al_brnet" ] || exit 0
+port_bridge_sec="$(uci show network | grep -w $PORT | grep '\.ports' | cut -d'.' -f2)"
+port_bridge_name="$(uci -q get network.$port_bridge_sec.name)"
+[ "$port_bridge_name" = "$al_bridge" ] || exit 0
 
 # Exit if the device is not operating in extender/repeater mode
+al_brnet="${al_bridge:3}"
 [ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
 
 ############## Dynamic Backhaul Daemon ##############
@@ -45,7 +47,7 @@ fi
 ########################################################
 
 ################ Dedicated ETH WAN Port ################
-wanport="$(db -q get hw.board.ethernetWanPort)"
+wanport="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
 if [ -n "$wanport" ]; then
 	[ "$wanport" = "$PORT" ] || exit 0
 ########################################################