mdmngr :Added the missing lib in Makefile

Add default value to debug so that an extra check whether debug has been initiated is not required prior to checking if it is greater than 0.

dslmngr/Makefile

@@ -0,0 +1,78 @@
+#
+# Copyright (C) 2018 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dslmngr
+PKG_VERSION:=1.0.0
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=be5b0d0c0a1c2abd335aaf19f01f63284d8cc285
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+  TARGET_PLATFORM=BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+  TARGET_PLATFORM=BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+  TARGET_PLATFORM=MEDIATEK
+else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
+  TARGET_PLATFORM=MARVELL
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+  TARGET_PLATFORM=INTEL
+else
+  $(info Unexpected CONFIG_TARGET)
+endif
+
+export TARGET_PLATFORM
+
+define Package/dslmngr
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=XDSL status and configration utility
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +easy-soc-libs
+endef
+
+define Package/dslmngr/description
+ This package can be used to configure and provide status about
+ the XDSL subsystem through UBUS.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)"
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	rsync -r --exclude=.* ~/git/dslmngr/ $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Build/Compile
+	+$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
+endef
+
+define Package/dslmngr/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,dslmngr))

easy-soc-libs/Config.in

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

easy-soc-libs/Makefile

@@ -8,12 +8,15 @@ PKG_NAME:=easy-soc-libs
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6a311af7cd17fc410c27de3cfae33b658195fd0b
+PKG_SOURCE_VERSION:=b77b80af1e7d793764fc90a510bda980634db077
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
-
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+endif
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
@@ -34,26 +37,24 @@ endef
 define Package/libwifi
   $(call Package/easy-soc-libs)
   TITLE:= WiFi library (libwifi)
-endef
-
-define Package/libdsl
-  $(call Package/easy-soc-libs)
-  TITLE:= XDSL library (libdsl)
+  DEPENDS+=+TARGET_intel_mips:libnl +TARGET_intel_mips:libnl-route
 endef
 
 define Package/libethernet
   $(call Package/easy-soc-libs)
   TITLE:= Ethernet library (libethernet)
-  DEPENDS:=+TARGET_iopsys_ramips:swconfig
+  DEPENDS+=+TARGET_iopsys_ramips:swconfig
 endef
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
   TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
   KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
 else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
   TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
@@ -64,13 +65,21 @@ else ifeq ($(CONFIG_TARGET_intel_mips),y)
   TARGET_PLATFORM=INTEL
   TARGET_CFLAGS +=-DIOPSYS_INTEL
 else
-  $(info (UNEXPECTED CONFIG TARGET))
+  $(info Unexpected CONFIG_TARGET)
 endif
 
+export TARGET_PLATFORM
+
 ifdef CONFIG_IOP_LLA_LIBS_DEBUG
   TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
 endif
 
+define Package/libdsl
+  $(call Package/easy-soc-libs)
+  TITLE:= XDSL library (libdsl)
+  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi
+endef
+
 subdirs := \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
@@ -78,15 +87,22 @@ subdirs := \
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/openssl \
 	-I$(STAGING_DIR)/usr/include/libnl3
 
 MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
+	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	FPIC="$(FPIC)" \
 	PLATFORM="$(TARGET_PLATFORM)" \
 	subdirs="$(subdirs)"
 
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	rsync -r --exclude=.* ~/git/easy-soc-libs/ $(PKG_BUILD_DIR)/
+endef
+endif
+
 define Build/InstallDev/libwifi
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
@@ -108,6 +124,12 @@ define Build/InstallDev/libethernet
 	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
 endef
 
+define Build/Compile
+	$(call Build/Compile/Default)
+ifeq ($(CONFIG_LIBDSL_TEST),y)
+	$(MAKE) -C "$(PKG_BUILD_DIR)/libdsl/test" $(MAKE_FLAGS)
+endif
+endef
 
 define Build/InstallDev
 	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
@@ -125,7 +147,11 @@ endef
 
 define Package/libdsl/install
 	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
+ifeq ($(CONFIG_LIBDSL_TEST),y)
+	$(CP) $(PKG_BUILD_DIR)/libdsl/test/libdsl_test $(1)/usr/bin/
+endif
 endef
 
 $(eval $(call BuildPackage,libwifi))

endptmngr/Makefile

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

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-04-01
+PKG_VERSION:=4.0-2019-03-29
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7faa875dcb825869c6bd942e140d2200e5e0dc0e
+PKG_SOURCE_VERSION:=aeda48024be6e70e50e688e761ac5fafb0c1e6fc
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -51,6 +51,13 @@ define Package/icwmp_xmpp
 	DEPENDS:=+libuci +libubox +libexpat +libstrophe
 endef
 
+define Package/icwmp_udpechoserver
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 udpechoserver feature
+	DEPENDS:=+libuci
+endef
+
 define Package/icwmp/Default
   SECTION:=utils
   CATEGORY:=Utilities
@@ -203,6 +210,15 @@ define Package/icwmp_xmpp/install
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_xmpp $(1)/etc/config
 endef
 
+define Package/icwmp_udpechoserver/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_udpechoserverd $(1)/usr/sbin/icwmp_udpechoserverd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_udpechoserverd $(1)/etc/init.d/icwmp_udpechoserverd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_udpechoserver $(1)/etc/config
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libdatamodel
@@ -238,4 +254,5 @@ $(eval $(call BuildPackage,icwmp-curl))
 $(eval $(call BuildPackage,libdatamodel))
 $(eval $(call BuildPackage,icwmp_stun))
 $(eval $(call BuildPackage,icwmp_xmpp))
+$(eval $(call BuildPackage,icwmp_udpechoserver))
 $(eval $(call BuildPackage,icwmp-zstream))

icwmp/README

@@ -9,7 +9,7 @@
 	- libz.so
 	- libcrypto.so
 	the librairies should be present in the "staging_dir/target-i386_uClibc-0.9.30.1/usr/lib/"  or "staging_dir/toolchain-mips_gcc-4.3.3+cs_uClibc-0.9.30.1/usr/lib"
-
+	
 	header files and folders:
 	- expat.h
 	- expat_external.h
@@ -33,7 +33,7 @@ this software is composed of 3 packages:
 - cwmp kernel package: contains cwmp kernel module. This module could be used by other kernel modules to notify the icwmpd daemon  when kernel parameter changes
 
 The three packages should be selected in the make menu config in order to get the three packages compiled.
-To compile the three packages: $ make package/cwmpd/compile
+To compile the three packages: $ make package/cwmpd/compile 
 
 3) OpenWRT settings
 in the  OpenWRT, Add the following lines in the /usr/share/udhcpc/default.script file:
@@ -49,7 +49,7 @@ in the  OpenWRT, Add the following lines in the /usr/share/udhcpc/default.script
 	- libopenssl package should be installed
 	- libz package should be installed
 	- libcrypto package should be installed
-
+    
     Configure the acs url in the /etc/config/icwmp
     and then start the cwmpd service: /etc/init.d/icwmpd start
     for the help: /etc/init.d/icwmpd

ifbt/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=ifbt
 PKG_VERSION:=0.1
 
-PKG_SOURCE_VERSION:=0286812ed8036dea758f904694dc416481fba64d
+PKG_SOURCE_VERSION:=07485438c27822a9d3af80b4a82b6a6c399fc521
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ifbt.git
 

imonitor/Makefile

@@ -12,7 +12,7 @@ PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
-PKG_SOURCE_VERSION:=cea60630cfac1d3c70f486acea6663d339b7d444
+PKG_SOURCE_VERSION:=532f4900862bcb45d8cd4bf37555fabda81750b6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>

inbd/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=inbd
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=12755fccb8ef87965ac684d62d56e19e73a255bd
+PKG_SOURCE_VERSION:=665a72a6bb2b5ea5a17ad6248957fe35525b3782
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
 

iop/config

@@ -3,11 +3,9 @@ CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
 CONFIG_DEVEL=y
-# CONFIG_LOCALMIRROR is not set
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
-CONFIG_PACKAGE_6tunnel=y
 CONFIG_PACKAGE_alsa-lib=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
@@ -17,56 +15,35 @@ CONFIG_PACKAGE_crashlog=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
 CONFIG_PACKAGE_gdb=m
-CONFIG_PACKAGE_gdbserver=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
-CONFIG_PACKAGE_ice-client=y
-CONFIG_PACKAGE_ice-client-camerawatch=m
-CONFIG_PACKAGE_ice-client-fileme=m
-CONFIG_PACKAGE_ice-client-gigaset=m
-CONFIG_PACKAGE_ice-client-guest=m
-CONFIG_PACKAGE_ice-client-iperf=m
-CONFIG_PACKAGE_ice-client-logreader=m
-CONFIG_PACKAGE_ice-client-monitor=m
-CONFIG_PACKAGE_ice-client-netrounds=m
-CONFIG_PACKAGE_ice-client-rshell=m
-CONFIG_PACKAGE_ice-client-texec=m
 CONFIG_PACKAGE_icwmp-curl=y
 CONFIG_PACKAGE_ifbt=y
 CONFIG_PACKAGE_imonitor=y
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_netmode=y
-CONFIG_PACKAGE_iperf-mt=y
+CONFIG_PACKAGE_iopupgrade=y
+CONFIG_PACKAGE_ip-full=y
+CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
 CONFIG_PACKAGE_iptables=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
-CONFIG_PACKAGE_iup=y
 # CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_juci=y
-CONFIG_PACKAGE_juci-broadcom-iptv=y
-CONFIG_PACKAGE_juci-broadcom-pwrmgmt=y
-CONFIG_PACKAGE_juci-wifilife=y
-CONFIG_PACKAGE_juci-wireless=y
+CONFIG_PACKAGE_juci-config-backup=y
 CONFIG_PACKAGE_juci-ddns=y
 CONFIG_PACKAGE_juci-diagnostics=y
 CONFIG_PACKAGE_juci-dnsmasq-dhcp=y
 CONFIG_PACKAGE_juci-dropbear=y
 CONFIG_PACKAGE_juci-event=y
 CONFIG_PACKAGE_juci-firewall-fw3=y
-CONFIG_PACKAGE_juci-ice-client=y
 CONFIG_PACKAGE_juci-icwmp=y
 CONFIG_PACKAGE_juci-igmpinfo=y
-CONFIG_PACKAGE_juci-config-backup=y
-CONFIG_PACKAGE_juci-mwan3=y
-CONFIG_PACKAGE_juci-iup=y
-# CONFIG_PACKAGE_juci-qos is not set
-CONFIG_PACKAGE_juci-voice-client=y
-CONFIG_PACKAGE_juci-macdb=y
 CONFIG_PACKAGE_juci-minidlna=y
 CONFIG_PACKAGE_juci-mod-status=y
 CONFIG_PACKAGE_juci-mod-system=y
+CONFIG_PACKAGE_juci-mwan3=y
 CONFIG_PACKAGE_juci-natalie-dect=y
 CONFIG_PACKAGE_juci-netmode=y
 CONFIG_PACKAGE_juci-network-device=y
@@ -75,24 +52,20 @@ CONFIG_PACKAGE_juci-network-netifd=y
 CONFIG_PACKAGE_juci-network-port=y
 CONFIG_PACKAGE_juci-openvpn=y
 CONFIG_PACKAGE_juci-owsd=y
-CONFIG_PACKAGE_juci-printer=y
 CONFIG_PACKAGE_juci-realtime-graphs=y
 CONFIG_PACKAGE_juci-samba=y
-CONFIG_PACKAGE_juci-simple-gui=y
 CONFIG_PACKAGE_juci-snmpd=y
 CONFIG_PACKAGE_juci-sysupgrade=y
-CONFIG_PACKAGE_juci-theme-iopsys=y
-CONFIG_PACKAGE_juci-ubus-core=y
 CONFIG_PACKAGE_juci-upnp=y
 CONFIG_PACKAGE_juci-usb=y
-CONFIG_PACKAGE_juci-utils=y
-# CONFIG_PACKAGE_kmod-ipt-nathelper is not set
-CONFIG_PACKAGE_kmod-nls-base=y
+CONFIG_PACKAGE_juci-voice-client=y
+CONFIG_PACKAGE_juci-wifilife=y
+CONFIG_PACKAGE_juci-wireless=y
+CONFIG_PACKAGE_juci-theme-iopsys=y
 CONFIG_PACKAGE_kmod-siit=y
 CONFIG_PACKAGE_libcgroup-daemon=y
 CONFIG_PACKAGE_libcgroup=y
 # CONFIG_PACKAGE_libcgroup-utils is not set
-CONFIG_PACKAGE_ldd=y
 CONFIG_PACKAGE_libdaemon=y
 CONFIG_PACKAGE_libffmpeg-mini=y
 CONFIG_PACKAGE_libgmp=y
@@ -100,14 +73,10 @@ CONFIG_PACKAGE_libreadline=y
 CONFIG_PACKAGE_loop-detector=m
 CONFIG_PACKAGE_minidlna=y
 CONFIG_PACKAGE_miniupnpd=y
-CONFIG_PACKAGE_mtd-utils=y
-CONFIG_PACKAGE_mtd-utils-deubinize=y
-CONFIG_PACKAGE_mtd-utils-imagewrite=y
-CONFIG_PACKAGE_mtd-utils-mkfs.jffs2=y
-CONFIG_PACKAGE_mtd-utils-nanddump=y
 CONFIG_PACKAGE_mwan3=y
 CONFIG_PACKAGE_nand-utils=y
 CONFIG_PACKAGE_ndisc6=y
+CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_ntfs-3g=y
 CONFIG_PACKAGE_ntpd=y
 CONFIG_PACKAGE_odhcp6c=y
@@ -116,7 +85,6 @@ CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
-# CONFIG_PACKAGE_p910nd is not set
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_power-management=y
@@ -155,7 +123,7 @@ CONFIG_PACKAGE_wifimngr=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
-CONFIG_TARGET_CUSTOMER="INT"
+CONFIG_TARGET_CUSTOMER="IOPSYS"
 CONFIG_TARGET_ROOTFS_TARGZ=y
 # CONFIG_USE_SSTRIP is not set
 CONFIG_USE_STRIP=y
@@ -187,7 +155,6 @@ CONFIG_BUSYBOX_CONFIG_MICROCOM=y
 # CONFIG_BUSYBOX_CONFIG_RMMOD is not set
 CONFIG_BUSYBOX_CONFIG_STTY=y
 CONFIG_BUSYBOX_CONFIG_TFTP=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_2_4_MODULES is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
@@ -201,11 +168,9 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
 # CONFIG_BUSYBOX_CONFIG_FEATURE_NOLOGIN is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_SECURETTY=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY is not set
 # CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
@@ -215,7 +180,6 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
 # CONFIG_BUSYBOX_CONFIG_PAM is not set
 # CONFIG_BUSYBOX_CONFIG_TFTP_DEBUG is not set
 # CONFIG_BUSYBOX_CONFIG_NTPD is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
 CONFIG_LIBCURL_CRYPTO_AUTH=y
 # CONFIG_LIBCURL_MBEDTLS is not set
 CONFIG_LIBCURL_OPENSSL=y
@@ -224,7 +188,6 @@ CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_SIGNED_PACKAGES is not set
 CONFIG_KERNEL_DEVTMPFS=y
 CONFIG_KERNEL_DEVTMPFS_MOUNT=y
-CONFIG_PACKAGE_ip-full=y
 # CONFIG_BUSYBOX_CONFIG_IP is not set
-CONFIG_PACKAGE_iopupgrade=y
+LOCAL_MIRROR="http://download.iopsys.eu/iopsys/mirror/"
 

iop/scripts/auto_feeds_conf.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-declare -a feed_list
-function list_feeds {
-    jq '.feed[] | .name' feeds.conf
-}
-
-# Exported interface
-function auto_feeds_conf {
-    echo "Function auto feeds conf"
-    echo "feed list:"
-    list_feeds
-}
-
-register_command "auto_feeds_conf" "Automatically update feeds"

iop/scripts/feeds_update.sh

@@ -32,13 +32,15 @@ function feeds_update {
     fi
 
     # targets need to be installed explicitly
-    ./scripts/feeds install -p targets iopsys-brcm63xx-mips
-    ./scripts/feeds install -p targets iopsys-brcm63xx-arm
-    ./scripts/feeds install -p targets iopsys-ramips
-    ./scripts/feeds install -p intel_targets intel_mips
+    targets="iopsys-brcm63xx-mips iopsys-brcm63xx-arm iopsys-ramips intel_mips"
+    for target in $targets
+    do
+	rm -f target/linux/$target
+	./scripts/feeds install -p targets $target
+    done
 
     # install all packages
-    ./scripts/feeds install -a 
+    ./scripts/feeds install -a
 
     # remove broken symlinks ( for packages that are no longer in the feed )
     find -L package/feeds -maxdepth 2 -type l -delete
@@ -47,7 +49,7 @@ function feeds_update {
     make defconfig
 
     # record when we last run this script
-    touch tmp/.iop_bootstrap 
+    touch tmp/.iop_bootstrap
 
     # always return true
     exit 0

iop/scripts/genconfig.sh

@@ -12,39 +12,99 @@ function genconfig {
 	export CUSTCONF="customerconfigs/customers"
 	export VERBOSE=0
 	export DEVELOPER=0
-	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
-
 	target="bogus"
 	config_path=""
+	brcm63xx_mips="target/linux/iopsys-brcm63xx-mips"
+	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
+	ramips="target/linux/iopsys-ramips"
+	intel_mips="target/linux/intel_mips"
+
+	Red='\033[0;31m'          # Red
+	Color_Off='\033[0m'       # Text Reset
+	Yellow='\033[0;33m'       # Yellow
+
+	function find_last {
+	    egrep "^[ #]*${1}[ =]" $2 | tail -n1
+	}
+
+	function is_new {
+	    for opt in $conf_warned
+	    do
+		if [ "$opt" == "$1" ]
+		then
+		    return 1
+		fi
+	    done
+	    # option not found return true
+	    return 0
+	}
+
+	function verify_config {
+	    IFS=$'\n'
+	    org=$(<.genconfig.config)
+	    unset IFS
+	    local num
+	    local conf_opt
+	    local conf_org
+	    local conf_new
+
+	    #echo "lines to check $tot_lines"
+	    num=0
+	    for line in $org
+	    do
+		conf_opt=$(echo $line | grep CONFIG_ | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
+		if [ -n "${conf_opt}" ]
+		then
+		    conf_org=$(find_last ${conf_opt} .genconfig.config)
+		    conf_new=$(find_last ${conf_opt} .config)
+		    if [ "$conf_org" != "$conf_new" ]
+		    then
+			if is_new $conf_opt
+			then
+			    echo -e "config option [${Red}$conf_opt${Color_Off}] is not set correctly in .config"
+			    echo -e "got value [${Yellow}$conf_new${Color_Off}] but wanted [${Yellow}$conf_org${Color_Off}]"
+			    echo "This is a real problem somebody needs to investigate"
+			    echo ""
+			    conf_warned="$conf_warned $conf_opt"
+			fi
+		    else
+			true
+			# for debug to see all options
+			#echo -e "wanted [$conf_org] got [$conf_new]"
+		    fi
+		fi
+		num=$((num+1))
+	    done
+	}
 
 	# Takes a board name and returns the target name in global var $target
 	set_target() {
 	    local profile=$1
 
-	    local iopsys_brcm63xx_mips=$(cd target/linux/iopsys-brcm63xx-mips; ./genconfig)
-	    local iopsys_brcm63xx_arm=$(cd target/linux/iopsys-brcm63xx-arm; ./genconfig)
-	    local iopsys_ramips=$(cd target/linux/iopsys-ramips; ./genconfig)
-	    local intel_mips=$(cd target/linux/intel_mips; ./genconfig)
 
-	    if [ "$profile" == "LIST" ]
-	    then
-		for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips intel_mips
-		do
-		    echo "$list based boards:"
-		    for b in ${!list}
-		    do
-			echo -e "\t$b"
-		    done
-		done
-		return
+		[ -e $brcm63xx_mips/genconfig ] &&
+			iopsys_brcm63xx_mips=$(cd $brcm63xx_mips; ./genconfig)
+		[ -e $brcm63xx_arm/genconfig ] &&
+			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
+		[ -e $ramips/genconfig ] &&
+			iopsys_ramips=$(cd $ramips; ./genconfig)
+		[ -e $intel_mips/genconfig ] &&
+			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
+
+	    if [ "$profile" == "LIST" ]; then
+			for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips; do
+				echo "$list based boards:"
+				for b in ${!list}; do
+					echo -e "\t$b"
+				done
+			done
+			return
 	    fi
 
-	    local targets
-
 	    for p in $iopsys_brcm63xx_mips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_mips"
-			config_path="target/linux/iopsys-brcm63xx-mips/config"
+			config_path="$brcm63xx_mips/config"
 		    return
 		fi
 	    done
@@ -52,7 +112,7 @@ function genconfig {
 	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_arm"
-			config_path="target/linux/iopsys-brcm63xx-arm/config"
+			config_path="$brcm63xx_arm/config"
 		    return
 		fi
 	    done
@@ -60,15 +120,15 @@ function genconfig {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			config_path="target/linux/iopsys-ramips/config"
+			config_path="$ramips/config"
 		    return
 		fi
 	    done
 
-	    for p in $intel_mips; do
+	    for p in $iopsys_intel_mips; do
 		if [ $p == $profile ]; then
 		    target="intel_mips"
-			config_path="target/linux/intel_mips/config"
+			config_path="$intel_mips/config"
 		    return
 		fi
 	    done
@@ -85,17 +145,12 @@ function genconfig {
 		mediatekAllowed=0
 		wifilifeAllowed=0
 
-		allowedRepos="$(ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null | grep -w 'R\|W' | awk '{print$NF}')"
-		for repo in $allowedRepos; do
-			case $repo in
-			bcmkernel) bcmAllowed=1 ;;
-			ice-client) iceAllowed=1 ;;
-			endptcfg) endptAllowed=1 ;;
-			natalie-dect*) natalieAllowed=1 ;;
-			linux) mediatekAllowed=1 ;;
-			wifilife) wifilifeAllowed=1 ;;
-			esac
-		done
+		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
+		git ls-remote git@dev.iopsys.eu:mediatek/linux.git -q 2>/dev/null && mediatekAllowed=1
+		git ls-remote git@dev.iopsys.eu:dialog/natalie-dect-12.26.git -q 2>/dev/null && natalieAllowed=1
+		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
+		git ls-remote git@dev.iopsys.eu:iopsys/wifilife.git -q 2>/dev/null && wifilifeAllowed=1
+		git ls-remote git@private.inteno.se:ice-client.git -q -q 2>/dev/null && iceAllowed=1
 	}
 
 	v() {
@@ -106,14 +161,15 @@ function genconfig {
 		echo
 		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
 		echo
-		echo -e "  -c|--clean\tRemove all files under ./files and import from config "
-		echo -e "  -v|--verbose\tVerbose"
+		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
+		echo -e "  -v|--verbose\t\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
-		echo -e "  -s|--override\tEnable 'Package source tree override'"
-		echo -e "  -h|--help\tShow this message"
+		echo -e "  -s|--override\t\tEnable 'Package source tree override'"
+		echo -e "  -S|--brcmsingle\tForce build of bcmkernel to use only one thread"
+		echo -e "  -h|--help\t\tShow this message"
 		echo -e "  -l|--list [customer]\tList all Customers or all boards for one customer"
-		echo -e "  -a|--list-all\tList all Customers and their board types"
-		echo -e "  -b|--boards\tList all board types"
+		echo -e "  -a|--list-all\t\tList all Customers and their board types"
+		echo -e "  -b|--boards\t\tList all board types"
 		echo
 		echo "Example ./iop genconfig vg50 TELIA"
 		echo "(if no customerconfig is chosen the Inteno Config will be used)"
@@ -176,7 +232,7 @@ function genconfig {
 
 	setup_dirs()
 	{
-		if ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null  | grep -qw ${CUSTREPO:22}; then
+		if git ls-remote $CUSTREPO -q 2>/dev/null; then
 			if [ ! -d "$CUSTPATH" ]; then
 				git clone "$CUSTREPO" "$CUSTPATH"
 			elif [ $IMPORT -eq 1 ]; then
@@ -315,6 +371,11 @@ function genconfig {
 			echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		fi
 
+		if [ -n "$BRCM_MAX_JOBS" ]
+		then
+		    echo "CONFIG_BRCM_MAX_JOBS=\"1\"" >>.config
+		fi
+
 		# Force regeneration of themes
 		touch package/feeds/juci/juci/Makefile
 
@@ -327,6 +388,9 @@ function genconfig {
 		# 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)"
 
@@ -334,6 +398,8 @@ function genconfig {
 
 		# Clean base-file package to force rebuild when changing profile
 		v "$(make package/base-files/clean 2>&1)"
+
+		verify_config
 	}
 
 	####### main #####
@@ -358,6 +424,7 @@ function genconfig {
 			-p|--profile) export PROFILE="$2"; shift;;
 			-r|--repo) export CUSTREPO="$2"; shift;;
 			-s|--override) export SRCTREEOVERR=1;;
+			-S|--brcmsingel) export BRCM_MAX_JOBS=1;;
 			-h|--help) usage;;
 			-l|--list) list_customers 0 $2;;
 			-a|--list-all)list_customers 1;;

iop/scripts/install_key.sh

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

iop/scripts/update_feed_branches.sh

@@ -46,7 +46,7 @@ function update_feed_branches {
 		git checkout $commith
 		git push origin :$release
 		git checkout -b $release
-		git push origin $release
+		git push --set-upstream origin $release
 		cd $ipath
 	done
 

iop/scripts/update_package.sh

@@ -496,7 +496,6 @@ check_feeds()
     for feed in `echo $feeds`
     do
 		feed_hash=$(feeds_hash $feed)
-		[ -n "$feed_hash" ] || continue
 		if [ -d feeds/$feed ]; then
 			in_git=$(cd feeds/$feed; git rev-parse HEAD)
 

iopupgrade/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=iopupgrade
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=9b5ed4bc9f7ac5064414cf5feb510ffd95df6ec4
+PKG_SOURCE_VERSION:=01f2afd6c831d6f9eb2940c7e7af16f7e4d439c2
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopupgrade
 

iopupgrade/files/sbin/iopu

@@ -7,6 +7,7 @@ cur_vol=""	# num,[0/1]	Number used for ubifs root filesystem volume name.
 upd_vol=""	# num,[0/1]	Number used for ubifs root filesystem volume name.
 		# eg: rootfs_0 or rootfs_1, the one we want to update
 cmdline=""	# command line settings.
+cmdline_match="" # Headers to match to the image
 
 ###############################################################################
 # file local variables. should not be used in imported functions. Can be used
@@ -204,9 +205,7 @@ log "Firmware upgrade started"
 if [ $upd_forceimage -eq 0 ]
 then
    board=$(db get hw.board.iopVerBoard)
-   cmdline="$cmdline -b $board"
-else
-    cmdline="$cmdline -q"
+   cmdline_match="board=$board"
 fi
 
 # find out what rootfs volume is active. 
@@ -217,16 +216,19 @@ upd_vol=$(get_flashbank_next)
 upd_ubi_id=$(ubinfo -d 0 -N rootfs_$upd_vol | awk "/Volume ID:/ {print \$3}")
 log "installing Root Fileystem into UBI volume rootfs_$upd_vol"
 
+# prepare to match dsl.
+function_call upd_conf_dsl
+
 # prepare to update CFE if it exists
 function_call upd_conf_cfe
 
 # prepare to update kernel if it is stored in MTD/JFFS2 
 function_call upd_conf_kernel
 
-log "now starting writing data to flash with [ iopupgrade $cmdline -u ubi0_$upd_ubi_id ]"
+log "now starting writing data to flash with [ iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id ]"
 run_cleanup=1	# When we start to actually write data there might be some
 		# things that need cleanup if we get an error/crash
-iopupgrade $cmdline -u ubi0_$upd_ubi_id
+iopupgrade $cmdline -M "$cmdline_match" -u ubi0_$upd_ubi_id
 
 # in case of any error we abort
 if [ $? -ne 0 ]; then

mdmngr/Makefile

@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2019 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=mdmngr
+PKG_VERSION:=0.1
+
+PKG_SOURCE_VERSION:=b36329396852519f136a3ff5feda10bc36444688
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/mdmngr.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libmobile
+	CATEGORY:=Libraries
+	DEPENDS:=+libubox +ubus +libcurl +libxml2
+	TITLE:=package for 4g dongle stuff
+endef
+
+
+define Package/mdmngr
+	CATEGORY:=Utilities
+	DEPENDS:=+libubox +ubus +libmobile +libnl-genl
+	TITLE:=application package for 4g dongle stuff
+endef
+
+#define Package/dongle_nl
+#	CATEGORY:=Utilities
+#	TITLE:=Dongle Netlink
+#	URL:=
+#	DEPENDS:=+libuci +libubus +libblobmsg-json +libnl-genl
+#endef
+
+define Package/libmobile/description
+	a library to communicate with dongles through HTTP requests
+endef
+
+define Package/mdmngr/description
+	application using libmobile to communicate with a 4g dongle
+endef
+
+#define Package/dongle_nl/description
+#	Dongle application handling netlink messages from kernel and sending them out on ubus.
+#endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/ $(1)/usr/lib
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libmobile.h $(1)/usr/include/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libmobile.so $(1)/usr/lib/
+endef
+
+define	Package/libmobile/install
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libmobile.so $(1)/usr/lib/
+endef
+
+define	Package/mdmngr/install
+	$(CP) ./files/* $(1)/ # copy from files to final image
+	$(INSTALL_DIR) $(1)/sbin # make the dir
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mdmngr $(1)/sbin/ # copy binaries to new directory
+endef
+
+#define Package/dongle_nl/install
+#	$(INSTALL_BIN) $(1)/sbin # make the dir
+#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dongle_nl $(1)/sbin/
+#endef
+
+$(eval $(call BuildPackage,libmobile))
+$(eval $(call BuildPackage,mdmngr))
+#$(eval $(call BuildPackage,dongle_nl))

mdmngr/files/etc/config/mdmngr

@@ -0,0 +1,2 @@
+config mdmngr mdmngr
+	option debug 1

mdmngr/files/etc/hotplug.d/iface/99-mdmngr

@@ -0,0 +1,8 @@
+if echo $DEVICE | grep "eth";then
+	ubus call dongle refresh
+fi
+
+if echo $DEVICE | grep "usb";then
+	ubus call dongle refresh
+fi
+

mdmngr/files/etc/hotplug.d/usb/99-mdmngr

@@ -0,0 +1,17 @@
+DEV_MOUNTPATH=`echo "$DEVPATH" | cut -d'/' -f 1-7`
+JUNK=`echo "$DEVPATH" | cut -d'/' -f 8`
+
+case "$ACTION" in
+	add)
+		if [ -z "$JUNK" ];then
+			#ubus call dongle alert '{"path":"/sys'${DEV_MOUNTPATH}'"}'
+			ubus call dongle refresh
+		fi
+		;;
+	remove)
+		ubus call dongle refresh
+		;;
+	*)
+		;;
+esac
+

mdmngr/files/etc/init.d/mdmngr

@@ -0,0 +1,34 @@
+#!/bin/sh /etc/rc.common
+
+START=14
+STOP=96
+
+USE_PROCD=1
+NAME=dongled
+
+start_service() {
+	procd_open_instance
+	config_load mdmngr
+	config_get debug mdmngr debug 0
+	procd_set_param command "/sbin/mdmngr"
+
+#	procd_append_param command --debug "$debug"
+	if [ "$debug" -gt 0 ]
+	then
+		procd_append_param command --debug "$debug"
+	fi
+	procd_set_param respawn
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger mdmngr
+}
+
+reload_service() {
+	stop
+	start
+}

netmode/files/etc/config/netmode

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

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

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

netmode/files/lib/functions/netmode.sh

@@ -386,9 +386,7 @@ populate_netmodes() {
 			if json_select acl; then
 				_i=1
 				while json_get_var user $_i; do
-					uci del_list netmode.$mode._access_r="$user"
 					uci del_list netmode.$mode._access_w="$user"
-					uci add_list netmode.$mode._access_r="$user"
 					uci add_list netmode.$mode._access_w="$user"
 					_i=$((_i+1))
 				done

questd/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.40
 
-PKG_SOURCE_VERSION:=9edeefb6942c1a806a82274d124d8889bfb4f8e7
+PKG_SOURCE_VERSION:=dd8f4a956ce652d483b8f8878deaa6d5586c2860
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 

rulengd/Makefile

@@ -5,17 +5,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rulengd
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.1.0
 PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
-PKG_SOURCE_VERSION:=99881f39232154530ac129dc2109d78963017ad1
+PKG_SOURCE_VERSION:=63569245b62d90d3106cc826f2d2b18f51c0b885
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
-PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
 

uboot/Makefile

@@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 
 ifdef CONFIG_TARGET_intel_mips
 PKG_SOURCE_URL:=git@dev.iopsys.eu:intel/uboot.git
-PKG_SOURCE_VERSION:=a6292375108a6d5f200f234f5eef3fe17f427092
+PKG_SOURCE_VERSION:=0ef53f269c27f8e736fd30fd1a874159f70c76bf
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
 PKG_SOURCE_VERSION:=3ef2ba866a99205496e0ce01935c89a1778d9b85
@@ -59,9 +59,10 @@ define uboot/grx500
   TITLE:=U-Boot for the grx
   UBOOT_IMG:=u-boot-nand.bin
   DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=8
+  PKG_RELEASE:=10
 endef
 
+# obsolete: no longer supported
 define uboot/grx500_speedport_smart3
   TITLE:=U-Boot for the Speedport Smart3
   UBOOT_IMG:=u-boot-nand.bin
@@ -73,7 +74,7 @@ define uboot/grx500_norrland
   TITLE:=U-Boot for Norrland Board
   UBOOT_IMG:=u-boot-nand.bin
   DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=8
+  PKG_RELEASE:=10
 endef
 
 UBOOTS := \
@@ -123,8 +124,13 @@ define Build/Compile
 		CROSS_COMPILE=$(TARGET_CROSS) env
 endef
 
+# don't install /etc/init.d/uboot for intel-mips as it's not needed
 define Package/uboot/install/default
-	$(CP) ./files/* $$(1)/
+	$(INSTALL_DIR) $$(1)/lib/upgrade
+	$(CP) ./files/uboot-upgrade $$(1)/lib/upgrade/
+	$(if $(CONFIG_TARGET_intel_mips), ,$(INSTALL_DIR) $$(1)/etc/init.d)
+	$(if $(CONFIG_TARGET_intel_mips), ,$(CP) ./files/uboot $$(1)/etc/init.d/)
+
 	$(INSTALL_DIR) $(BIN_DIR)/$(TARGET)
 	$(INSTALL_DIR) $$(1)/boot
 	$(CP) \

uboot/files/uboot

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

uboot/files/uboot-upgrade

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

voice-client/Makefile

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

voice-client/files/etc/asterisk_templates/tel_line.TEMPLATE

@@ -6,7 +6,7 @@ autodial_timeoutmsec=|AUTODIAL_TIMEOUT|
 dialtone_timeoutmsec=|DIALTONE_TIMEOUT|
 context=|CONTEXT|
 context_direct=|CONTEXT|-direct
-dialtone_extension_hint_context=brcm_dialtone
+dialtone_extension_hint_context=|LINE_NAME|_dialtone
 dialtone_extension_hint=|DIALTONE_EXTENSION_HINT|
 callwaiting=|CALLWAITING|
 clir=|CLIR|

voice-client/files/etc/config/voice_client

@@ -1,4 +1,4 @@
-config 'brcm_line' 'brcm0'
+config 'tel_line' 'brcm0'
 	option 'extension' '0000'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -9,7 +9,7 @@ config 'brcm_line' 'brcm0'
 	option 'callwaiting' '0'
 	option 'clir' '0'
 
-config 'brcm_line' 'brcm1'
+config 'tel_line' 'brcm1'
 	option 'extension' '1111'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -20,7 +20,7 @@ config 'brcm_line' 'brcm1'
 	option 'callwaiting' '0'
 	option 'clir' '0'
 
-config 'brcm_line' 'brcm2'
+config 'tel_line' 'brcm2'
 	option 'extension' '2222'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -31,7 +31,7 @@ config 'brcm_line' 'brcm2'
 	option 'callwaiting' '0'
 	option 'clir' '0'
 
-config 'brcm_line' 'brcm3'
+config 'tel_line' 'brcm3'
 	option 'extension' '3333'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -42,7 +42,7 @@ config 'brcm_line' 'brcm3'
 	option 'callwaiting' '0'
 	option 'clir' '0'
 
-config 'brcm_line' 'brcm4'
+config 'tel_line' 'brcm4'
 	option 'extension' '4444'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -53,7 +53,7 @@ config 'brcm_line' 'brcm4'
 	option 'callwaiting' '0'
 	option 'clir' '0'
 
-config 'brcm_line' 'brcm5'
+config 'tel_line' 'brcm5'
 	option 'extension' '5555'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -64,7 +64,7 @@ config 'brcm_line' 'brcm5'
 	option 'callwaiting' '0'
 	option 'clir' '0'
 
-config 'brcm_line' 'brcm6'
+config 'tel_line' 'brcm6'
 	option 'extension' '6666'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -75,7 +75,7 @@ config 'brcm_line' 'brcm6'
 	option 'callwaiting' '0'
 	option 'clir' '0'
 
-config 'brcm_line' 'brcm7'
+config 'tel_line' 'brcm7'
 	option 'extension' '7777'
 	option 'sip_account' 'sip0'
 	option 'noise' '0'
@@ -116,7 +116,7 @@ config 'sip_advanced' 'SIP'
 	option 'dnsmgr_refresh_interval' '300'
 	option 'srvlookup' 'yes'
 
-config 'brcm_advanced' 'BRCM'
+config 'tel_advanced' 'TEL'
 	option 'country' 'SWE'
 	option 'jbenable' 'yes'
 	option 'jbforce' 'no'

voice-client/files/etc/init.d/voice_client

@@ -6,6 +6,8 @@
 #
 . /lib/functions.sh
 . /lib/functions/network.sh
+. /lib/voice/voicelib.sh
+
 HOOKS=/usr/lib/inithooks/voice_client
 if [ -f "$HOOKS" ] ; then
 	. $HOOKS
@@ -15,8 +17,8 @@ START=60
 USE_PROCD=1
 
 # Some global variables
-SERIAL=$(cat /proc/nvram/SerialNumber)
-BASEMAC=$(cat /proc/nvram/BaseMacAddr | sed 's/ //g')
+SERIAL=$(getSerial)
+BASEMAC=$(getBaseMAC)
 MODULENAME=voice
 USERAGENT="Inteno_${SERIAL}_${BASEMAC}"
 
@@ -30,8 +32,8 @@ ASTERISKDIR=/etc/asterisk
 WORKDIR=/tmp/$MODULENAME.$$
 MD5SUMSFILE=/tmp/$MODULENAME-sums.$$
 
-# Whitespace separated list of BRCM feature access codes
-BRCM_FAC=
+# Whitespace separated list of $(getChannelName) feature access codes
+CHANNEL_FAC=
 
 #TODO: go through templates, check usage
 
@@ -80,8 +82,8 @@ TMPL_ACL=$TEMPLATEDIR/acl.conf.TEMPLATE
 TMPL_CONFBRIDGE=$TEMPLATEDIR/confbridge.conf.TEMPLATE
 TMPL_UDPTL=$TEMPLATEDIR/udptl.conf.TEMPLATE
 
-TMPL_BRCM=$TEMPLATEDIR/brcm.conf.TEMPLATE
-TMPL_BRCM_LINE=$TEMPLATEDIR/brcm_line.TEMPLATE
+TMPL_CHANNEL=$TEMPLATEDIR/$(getLineName).conf.TEMPLATE
+TMPL_CHANNEL_LINE=$TEMPLATEDIR/tel_line.TEMPLATE
 
 TMPL_MEETME=$TEMPLATEDIR/meetme.conf.TEMPLATE
 
@@ -180,7 +182,7 @@ assemble_and_copy_config()
 	mv $WORKDIR/sip_registrations.tmp	$WORKDIR/sip_registrations.conf
 	mv $WORKDIR/sip_providers.tmp		$WORKDIR/sip_providers.conf
 	mv $WORKDIR/sip_users.tmp		$WORKDIR/sip_users.conf
-	mv $WORKDIR/brcm.tmp			$WORKDIR/brcm.conf
+	mv $WORKDIR/$(getLineName).tmp		$WORKDIR/$(getLineName).conf
 	mv $WORKDIR/extensions.tmp		$WORKDIR/extensions.conf
 	mv $WORKDIR/codecs.tmp			$WORKDIR/codecs.conf
 	mv $WORKDIR/rtp.tmp			$WORKDIR/rtp.conf
@@ -251,13 +253,13 @@ read_codecs_ptime()
 # in a Dial() command
 #
 # For backwards compatibility, if i is only a number (not prefixed by
-#	"SIP/" or "BRCM/") then add "BRCM/"
+#	"SIP/" or "CHANNEL/") then add "CHANNEL/"
 #
 read_lines()
 {
 	local lines=""
 	local call_lines
-	local fsxIdx fsxEpt dectIdx dectEpt
+	local fxsIdx fxsEpt dectIdx dectEpt
 
 	# Are lines already set by user conf?
 	config_get call_lines $1 call_lines
@@ -276,19 +278,19 @@ read_lines()
 		if test $(db get hw.board.hasVoice) = "1"; then
 			# Get the first FSX voice endpoint index by
 			# searching for the name usually used.
-			fsxIdx=$(echo $voiceNames | \
+			fxsIdx=$(echo $voiceNames | \
 				awk -e '{
 					i = 1;
 					while(i <= NF && tolower($i) !~ /^tel.*$/) {
 						i++;
 					}
 					print i;
-				}
-			')
+				}'
+			)
 	
 			# Convert index to endpoint ID
-			if test $fsxIdx -gt 0; then
-				fsxEpt=$(echo $voicePorts | awk '{ print $'$fsxIdx' }')
+			if test $fxsIdx -gt 0; then
+				fxsEpt=$(echo $voicePorts | awk '{ print $'$fxsIdx' }')
 			fi
 
 			hasVoice=1
@@ -315,7 +317,9 @@ read_lines()
 		fi
 
 		if test $hasVoice -eq 1; then
-			call_lines="$dectEpt $fsxEpt"
+		        call_lines="$dectEpt $fxsEpt"
+		        # Remove leading/trailing spaces
+			call_lines=$(echo $call_lines | xargs echo -n)
 
 			# If we didn't find any endpoint ID we
 			# fallback to activate them all.
@@ -333,7 +337,7 @@ read_lines()
 	for i in $call_lines ; do
 		case $i in
 			''|*[!0-9]*)	lines=$lines"$i&" ;;
-			*) 				lines=$lines"BRCM/$i&" ;;
+			*) 				lines=$lines"$(getChannelName)/$i&" ;;
 		esac
 		
 	done
@@ -1028,9 +1032,9 @@ configure_queue()
 	do
 		local out=""
 		re='^[0-9]+$'
-		num=${member#brcm}
+		num=${member#$(getLineName)}
 		if [ -z "${num##[0-9]*}" ] ; then
-			out="BRCM/$num"
+			out="$(getChannelName)/$num"
 		else
 			local sip_user
 			config_get sip_user $member user
@@ -1157,7 +1161,7 @@ configure_cdr()
 configure_call_filters()
 {
 	local country
-	config_get country BRCM country
+	config_get country TEL country
 	# Read the International Dialing Code and the Country Code from config
 
 	echo "Looking up IDC and CC for country $country"
@@ -1435,7 +1439,7 @@ configure_extensions()
 	fi
 
 	if [ -n "$extension_all_ports" ] ; then
-		local all_lines="BRCM/0&BRCM/1&BRCM/2&BRCM/3&BRCM/4&BRCM/5&BRCM/6"
+		local all_lines=$(getAllLines)
 		echo "exten => $extension_all_ports,1,Dial($all_lines,,t)"	>> $WORKDIR/extensions_local.tmp
 		echo "exten => $extension_all_ports,n,Hangup()"			>> $WORKDIR/extensions_local.tmp
 	fi
@@ -1449,7 +1453,6 @@ configure_extensions()
 		echo "exten => $test_echo_extension,1,Echo()"			>> $WORKDIR/extensions_local.tmp
 		echo "exten => $test_echo_extension,n,Hangup()"			>> $WORKDIR/extensions_local.tmp
 	fi
-
 	
 	if [ -n "$record_message_extension" ] ; then
 		echo "exten => $record_message_extension,1,Playback(beep)"		>> $WORKDIR/extensions_local.tmp
@@ -1463,7 +1466,7 @@ configure_extensions()
 		sed -i "s/|CLIR_FAC_SET|//"		$WORKDIR/extensions.tmp
 		sed -i "s/|CLIR|/$clir/"		$WORKDIR/extensions.tmp
 		sed -i "s/|CLIR_FAC_LEN|/${#clir}/"     $WORKDIR/extensions.tmp
-		BRCM_FAC="$BRCM_FAC $clir."
+		CHANNEL_FAC="$CHANNEL_FAC $clir."
 	else
 		sed -i "s/|CLIR_FAC_SET|/;/"		$WORKDIR/extensions.tmp
 	fi
@@ -1722,9 +1725,9 @@ configure_extensions_provider()
 }
 
 #
-# Create a local extension for a BRCM Line
+# Create a local extension for a CHANNEL Line
 #
-configure_brcm_line_extension()
+configure_tel_line_extension()
 {
 	local line
 	local extension
@@ -1734,8 +1737,9 @@ configure_brcm_line_extension()
 	local cbbs_retrytime
 	local cbbs_waittime
 	local mailbox
+	local line_name=$(getLineName)
 	
-	line=${1:4}
+	line=${1:${#line_name}}
 	config_get extension $1 extension
 
 	if [ -z "$line" ] ; then
@@ -1760,7 +1764,7 @@ configure_brcm_line_extension()
 	
 		cp $TMPL_EXTENSIONS_LOCAL_LINE			$WORKDIR/extensions_local_line.tmp
 		sed -i "s/|EXTEN|/$extension/g"			$WORKDIR/extensions_local_line.tmp
-		sed -i "s/|LINE|/$line/g"			$WORKDIR/extensions_local_line.tmp
+		sed -i "s/|LINE|/$(getLineIdx $line)/g"		$WORKDIR/extensions_local_line.tmp
 		sed -i "s/|TIMEOUT|/$(get_voicemail_timeout)/g"	$WORKDIR/extensions_local_line.tmp
 
 		#cbbs settings
@@ -1833,16 +1837,16 @@ configure_codecs()
 {
 	echo "Configuring codecs"
 	local genericplc
-	config_get genericplc BRCM genericplc
+	config_get genericplc TEL genericplc
 	sed -i "s/|PLC|/$genericplc/"			$WORKDIR/codecs.tmp
 }
 
 #
-# Configure default settings for brcm.conf
+# Configure default settings for $(getLineName).conf
 #
-configure_brcm()
+configure_tel()
 {
-	echo "Configuring BRCM"
+	echo "Configuring $(getChannelName)"
 	local jbenable
 	local jbforce
 	local jbmaxsize
@@ -1850,44 +1854,48 @@ configure_brcm()
 	local dtmfcompatibility
 	local dialoutmsec
 	local fac
+	local echocancel
 
-	config_get jbenable BRCM jbenable
-	config_get jbforce BRCM jbforce
-	config_get jbmaxsize BRCM jbmaxsize
-	config_get jbimpl BRCM jbimpl
+	config_get jbenable TEL jbenable
+	config_get jbforce TEL jbforce
+	config_get jbmaxsize TEL jbmaxsize
+	config_get jbimpl TEL jbimpl
 	config_get dtmfmode SIP dtmfmode
-	config_get dialoutmsec BRCM dialoutmsec
-	config_get fac BRCM fac
+	config_get dialoutmsec TEL dialoutmsec
+	config_get fac TEL fac
+	config_get echocancel TEL echo_cancel
 
-	BRCM_FAC="$BRCM_FAC $fac"
+	CHANNEL_FAC="$CHANNEL_FAC $fac"
 	# Convert whitespace to commas
-	BRCM_FAC=$(echo $BRCM_FAC | sed -e 's/^ *//' -e 's/ *$//' | tr -s ' ' | tr ' ' ',')
+	CHANNEL_FAC=$(echo $CHANNEL_FAC | sed -e 's/^ *//' -e 's/ *$//' | tr -s ' ' | tr ' ' ',')
 
 	if [ -z "$dialoutmsec" ] ; then
 		dialoutmsec=4000
 	fi
 
-	sed -i "s/|JBENABLE|/$jbenable/"			$WORKDIR/brcm.tmp
-	sed -i "s/|JBFORCE|/$jbforce/"				$WORKDIR/brcm.tmp
-	sed -i "s/|JBMAXSIZE|/$jbmaxsize/"			$WORKDIR/brcm.tmp
-	sed -i "s/|JBIMPL|/$jbimpl/"				$WORKDIR/brcm.tmp
-	sed -i "s/|DIALOUTMSEC|/$dialoutmsec/"			$WORKDIR/brcm.tmp
-	sed -i "s/|FAC|/$BRCM_FAC/"				$WORKDIR/brcm.tmp
+	sed -i "s/|JBENABLE|/$jbenable/"			$WORKDIR/$(getLineName).tmp
+	sed -i "s/|JBFORCE|/$jbforce/"				$WORKDIR/$(getLineName).tmp
+	sed -i "s/|JBMAXSIZE|/$jbmaxsize/"			$WORKDIR/$(getLineName).tmp
+	sed -i "s/|JBIMPL|/$jbimpl/"				$WORKDIR/$(getLineName).tmp
+	sed -i "s/|DIALOUTMSEC|/$dialoutmsec/"			$WORKDIR/$(getLineName).tmp
+	sed -i "s/|FAC|/$CHANNEL_FAC/"				$WORKDIR/$(getLineName).tmp
+	sed -i "s/|CHANNELS|/$(db get hw.board.VoicePorts)/"	$WORKDIR/$(getLineName).tmp
+	sed -i "s/|ECHOCANCEL|/$(getEchoCancellingValue $echocancel)/"	$WORKDIR/$(getLineName).tmp
 
 	if [ "$dtmfmode" == "compatibility" ] ; then
 		dtmfcompatibility="1"
 	else
 		dtmfcompatibility="0"
 	fi
-	sed -i "s/|DTMFCOMPATIBILITY|/$dtmfcompatibility/"      $WORKDIR/brcm.tmp
+	sed -i "s/|DTMFCOMPATIBILITY|/$dtmfcompatibility/"      $WORKDIR/$(getLineName).tmp
 }
 
 #
-# Configure settings for individual line in brcm.conf
+# Configure settings for individual line in $(getLineName).conf
 #
-configure_brcm_line()
+configure_tel_line()
 {
-	echo "Configuring BRCM line $1"
+	echo "Configuring $(getChannelName) line $1"
 	local extension
 	local sip_provider
 	local codecs
@@ -1933,30 +1941,30 @@ configure_brcm_line()
 		clir=0
 	fi
 
-	cp $TMPL_BRCM_LINE $WORKDIR/brcm_line.tmp
-	sed -i "s/|SECTION|/$1/"				$WORKDIR/brcm_line.tmp
-	sed -i "s/|CALLERID|/$extension/g"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|CONTEXT|/$sip_provider/g"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|DIALTONE_EXTENSION_HINT|/$1/"		$WORKDIR/brcm_line.tmp
-	sed -i "s/|AUTODIAL|/$autodial/"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|AUTODIAL_TIMEOUT|/$autodial_timeout/"	$WORKDIR/brcm_line.tmp
-	sed -i "s/|DIALTONE_TIMEOUT|/$dialtone_timeout/"	$WORKDIR/brcm_line.tmp
-	sed -i "s/|DTMFRELAY|/$dtmfmode/"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|CALLWAITING|/$callwaiting/"			$WORKDIR/brcm_line.tmp
-	sed -i "s/|CLIR|/$clir/"				$WORKDIR/brcm_line.tmp
+	cp $TMPL_CHANNEL_LINE $WORKDIR/tel_line.tmp
+	sed -i "s/|SECTION|/$1/"				$WORKDIR/tel_line.tmp
+	sed -i "s/|CALLERID|/$extension/g"			$WORKDIR/tel_line.tmp
+	sed -i "s/|CONTEXT|/$sip_provider/g"			$WORKDIR/tel_line.tmp
+	sed -i "s/|DIALTONE_EXTENSION_HINT|/$1/"		$WORKDIR/tel_line.tmp
+	sed -i "s/|AUTODIAL|/$autodial/"			$WORKDIR/tel_line.tmp
+	sed -i "s/|AUTODIAL_TIMEOUT|/$autodial_timeout/"	$WORKDIR/tel_line.tmp
+	sed -i "s/|DIALTONE_TIMEOUT|/$dialtone_timeout/"	$WORKDIR/tel_line.tmp
+	sed -i "s/|DTMFRELAY|/$dtmfmode/"			$WORKDIR/tel_line.tmp
+	sed -i "s/|CALLWAITING|/$callwaiting/"			$WORKDIR/tel_line.tmp
+	sed -i "s/|CLIR|/$clir/"				$WORKDIR/tel_line.tmp
+	sed -i "s/|LINE_NAME|/$(getLineName)/"			$WORKDIR/tel_line.tmp
 
-
-	#Configure BRCM line with codecs according to the SIP line settings
+	#Configure CHANNEL line with codecs according to the SIP line settings
 #	local is_fax
 #	config_get is_fax $sip_provider is_fax
 # 	if [ -z "$is_fax" -o "$is_fax" = "1" ] ; then
-# 		sed -i "s/|ALLOW|/allow = ulaw\nallow = alaw/"	$WORKDIR/brcm_line.tmp
+# 		sed -i "s/|ALLOW|/allow = ulaw\nallow = alaw/"	$WORKDIR/tel_line.tmp
 # 	else
-# 		sed -i "s/|ALLOW|/$(read_codecs $sip_provider)/"	$WORKDIR/brcm_line.tmp
+# 		sed -i "s/|ALLOW|/$(read_codecs $sip_provider)/"	$WORKDIR/tel_line.tmp
 # 	fi
 
-	cat $WORKDIR/brcm_line.tmp >>				$WORKDIR/brcm.tmp
-	rm -f							$WORKDIR/brcm_line.tmp
+	cat $WORKDIR/tel_line.tmp >>				$WORKDIR/$(getLineName).tmp
+	rm -f							$WORKDIR/tel_line.tmp
 }
 
 #
@@ -2055,30 +2063,35 @@ pbx_fix_ownership()
 }
 
 #
-# Calculate a name for each brcm line, depending on port type
+# Calculate a name for each $(getLineName) line, depending on port type
 # and number. The name is used to make UI look better.
 #
 set_line_name()
 {
 	local maxlinenum=$2
 	local curname name_ix ix item lnum
+	local line_name=$(getLineName)
+	local line_name_len=${#line_name}
+	local tel_line=$1
+	
+	line=${tel_line:${line_name_len}}
 
 	# delete non-existing lines from config #
-	case $1 in
-		brcm[0-9])
-			lnum=${1:4:1}
-			[ $((lnum+1)) -gt $maxlinenum ] && uci -q delete voice_client.$1
+	case $tel_line in
+		${line_name}[0-9])
+			lnum=${tel_line:${line_name_len}:1}
+			[ $((lnum+1)) -gt $maxlinenum ] && uci -q delete voice_client.$tel_line
 		;;
 	esac
 	#########################################
 
-	config_get curname $1 name
+	config_get curname $tel_line name
 	[ -n "$curname" ] && return
 
 	name_ix=""
 	ix=0
 	for item in $(db get hw.board.VoicePortOrder); do
-		if [ "$item" == "$1" ]; then
+		if [ "$item" == "$tel_line" ]; then
 			name_ix=$ix
 			break
 		fi
@@ -2089,15 +2102,14 @@ set_line_name()
 	if [ -n "$name_ix" ]; then
 		for item in $(db get hw.board.VoicePortNames); do
 			if [ $ix -eq $name_ix ]; then
-				uci_set voice_client $1 name \
-					"$(echo "$item" |tr "[_]" "[ ]")"
+				uci_set voice_client $tel_line name "$(echo '$item' |tr '[_]' '[ ]')"
 				return
 			fi
 			ix=$((ix+1))
 		done
 	fi
 
-	uci_set voice_client $1 name $1
+	uci_set voice_client $tel_line name $tel_line
 }
 
 #
@@ -2147,11 +2159,11 @@ start_service() {
 	config_load voice_client
 
 	########################################################
-	# Set line names according to whats reported by brcminfo
+	# Set line names according to board parameters
 	# and delete non-existing lines from voice_client config
 	########################################################
 	local maxlinenum=$(db get hw.board.VoicePorts)
-	config_foreach set_line_name brcm_line $maxlinenum
+	config_foreach set_line_name tel_line $maxlinenum
 	uci_commit voice_client
 
 	#######################################
@@ -2164,7 +2176,7 @@ start_service() {
 	cp $TMPL_SIP			$WORKDIR/sip.tmp
 	cp $TMPL_RTP			$WORKDIR/rtp.tmp
 	cp $TMPL_STUN			$WORKDIR/res_stun_monitor.tmp
-	cp $TMPL_BRCM			$WORKDIR/brcm.tmp
+	cp $TMPL_CHANNEL		$WORKDIR/$(getLineName).tmp
 	cp $TMPL_CODECS			$WORKDIR/codecs.tmp
 	cp $TMPL_VOICEMAIL		$WORKDIR/voicemail.tmp
 	cp $TMPL_DNSMGR			$WORKDIR/dnsmgr.tmp
@@ -2208,12 +2220,12 @@ start_service() {
 	config_foreach configure_sip_user_extension sip_user
 
 	#####################
-	# BRCM configuration
+	# CHANNEL configuration
 	#####################
-	configure_brcm
-	config_foreach configure_brcm_line brcm_line
-	config_foreach configure_brcm_line_extension brcm_line
-	config_foreach create_extensions_dialtone brcm_line
+	configure_tel
+	config_foreach configure_tel_line tel_line
+	config_foreach configure_tel_line_extension tel_line
+	config_foreach create_extensions_dialtone tel_line
 	configure_codecs
 
 	###########################
@@ -2278,14 +2290,19 @@ stop_service() {
 }
 
 reload_service() {
-	#stop
 	start
+	#stop
+	# turn off voice led; asterisk will turn it on
+	# if there is a registered account
+	ubus call led.voice1 set '{"state":"off"}'
 
-	asterisk -rx "config reload $ASTERISKDIR/sip.conf"
-	sleep 1
-	asterisk -rx "core reload"
-	asterisk -rx "dialplan reload"
-	asterisk -rx "brcm reload"
+	[ -f /var/run/asterisk/asterisk.pid ] && /etc/init.d/asterisk restart
+
+#	asterisk -rx "config reload $ASTERISKDIR/sip.conf"
+#	sleep 1
+#	asterisk -rx "core reload"
+#	asterisk -rx "dialplan reload"
+#	asterisk -rx "$(getChipVendor) reload"
 }
 
 service_triggers() {

voice-client/files/etc/uci-defaults/99-voice_client

@@ -1,5 +1,12 @@
 #!/bin/sh
 
+. /lib/voice/voicelib.sh
+
+# Adapt to config section name changes
+grep -q brcm_line /etc/config/voice_client && sed -i 's/brcm_line/tel_line/g' /etc/config/voice_client
+grep -q brcm_advanced /etc/config/voice_client && sed -i 's/brcm_advanced/tel_advanced/g' /etc/config/voice_client
+
+# Add call filter section
 uci -q get voice_client.call_filter0 >/dev/null || {
 
 uci -q batch <<-EOT
@@ -14,6 +21,7 @@ EOT
 
 }
 
+# Add ringing schedule section
 uci -q get voice_client.RINGING_STATUS >/dev/null || {
 
 uci -q batch <<-EOT
@@ -27,27 +35,28 @@ EOT
 
 }
 
-# Default Broadcom phone volume for Iopsys 4.
+# Default phone volume for iopsysWrt 4.X.
 uci -q batch <<-EOT
-	set voice_client.brcm0.txgain=4
-	set voice_client.brcm0.rxgain=4
-	set voice_client.brcm1.txgain=4
-	set voice_client.brcm1.rxgain=4
-	set voice_client.brcm2.txgain=4
-	set voice_client.brcm2.rxgain=4
-	set voice_client.brcm3.txgain=4
-	set voice_client.brcm3.rxgain=4
-	set voice_client.brcm4.txgain=4
-	set voice_client.brcm4.rxgain=4
-	set voice_client.brcm5.txgain=4
-	set voice_client.brcm5.rxgain=4
-	set voice_client.brcm6.txgain=4
-	set voice_client.brcm6.rxgain=4
-	set voice_client.brcm7.txgain=4
-	set voice_client.brcm7.rxgain=4
+	set voice_client.$(getLineName)0.txgain=4
+	set voice_client.$(getLineName)0.rxgain=4
+	set voice_client.$(getLineName)1.txgain=4
+	set voice_client.$(getLineName)1.rxgain=4
+	set voice_client.$(getLineName)2.txgain=4
+	set voice_client.$(getLineName)2.rxgain=4
+	set voice_client.$(getLineName)3.txgain=4
+	set voice_client.$(getLineName)3.rxgain=4
+	set voice_client.$(getLineName)4.txgain=4
+	set voice_client.$(getLineName)4.rxgain=4
+	set voice_client.$(getLineName)5.txgain=4
+	set voice_client.$(getLineName)5.rxgain=4
+	set voice_client.$(getLineName)6.txgain=4
+	set voice_client.$(getLineName)6.rxgain=4
+	set voice_client.$(getLineName)7.txgain=4
+	set voice_client.$(getLineName)7.rxgain=4
 	commit voice_client
 EOT
 
+# Add firewall include
 uci -q batch <<-EOT
         delete firewall.sip
         set firewall.sip=include

voice-client/files/lib/cw.sh

@@ -1,12 +1,14 @@
 #! /bin/sh
 
+. /lib/voice/voicelib.sh
+
 if [ $2 != '?' ]; then
-    for brcm in `uci show voice_client | grep brcm | grep $1 | cut -d . -f 2`; do
-	sed -i "/\[$brcm\]/,/^\[/ s/\(callwaiting=\)[0-9]/\1$2/" /etc/asterisk/brcm.conf
+    for tel_line in `uci show voice_client | grep $(getLineName) | grep $1 | cut -d . -f 2`; do
+	sed -i "/\[$tel_line\]/,/^\[/ s/\(callwaiting=\)[0-9]/\1$2/" /etc/asterisk/$(getLineName).conf
     done
 else
-    for brcm in `uci show voice_client | grep brcm | grep $1 | cut -d . -f 2`; do
-	status=`sed -n "/\[$brcm\]/,/^\[/ s/callwaiting=\([0-9]\)/\1/p" /etc/asterisk/brcm.conf`
+    for tel_line in `uci show voice_client | grep $(getLineName) | grep $1 | cut -d . -f 2`; do
+	status=`sed -n "/\[$tel_line\]/,/^\[/ s/callwaiting=\([0-9]\)/\1/p" /etc/asterisk/$(getLineName).conf`
 	echo $status
 	exit 0
     done

voice-client/files/lib/voice/broadcom.sh

@@ -0,0 +1,45 @@
+#! /bin/sh
+# Voice library for Broadcom boards
+
+getChipVendor() {
+    echo brcm
+}
+
+getChannelName() {
+    echo BRCM
+}
+
+getLineName() {
+    echo brcm
+}
+
+getSerial() {
+    echo $(cat /proc/nvram/SerialNumber)
+}
+
+getBaseMAC() {
+    echo $(cat /proc/nvram/BaseMacAddr | sed 's/ //g')
+}
+
+getAllLines() {
+    echo "BRCM/0&BRCM/1&BRCM/2&BRCM/3&BRCM/4&BRCM/5&BRCM/6"
+}
+
+getLineIdx() {
+    echo $1
+}
+
+getEchoCancellingValue() {
+    case $1 in
+	0)
+	    echo '0'
+	    ;;
+	1)
+	    echo '1'
+	    ;;
+	*)
+	    # Unknown value
+	    echo ''
+	    ;;
+    esac
+}

voice-client/files/lib/voice/intel.sh

@@ -0,0 +1,52 @@
+#! /bin/sh
+# Voice library for Intel boards
+
+getChipVendor() {
+    echo intel
+}
+
+getChannelName() {
+    echo TAPI
+}
+
+getLineName() {
+    echo tapi
+}
+
+getSerial() {
+    sernum=$(fw_printenv -n serial_number) 2> /dev/null
+
+    if [ $? ]; then
+	echo 0
+    else
+	echo $sernum
+    fi
+}
+
+getBaseMAC() {
+    echo $(fw_printenv -n ethaddr)
+}
+
+getAllLines() {
+    echo "TAPI/1&TAPI/2&TAPI/3&TAPI/4&TAPI/5&TAPI/6"
+}
+
+getLineIdx() {
+    i=$1
+    echo $((i+1))
+}
+
+getEchoCancellingValue() {
+    case $1 in
+	0)
+	    echo 'off'
+	    ;;
+	1)
+	    echo 'nlec'
+	    ;;
+	*)
+	    # Unknown value
+	    echo ''
+	    ;;
+    esac
+}

voice-client/files/usr/lib/asterisk/cbbs.sh

@@ -23,6 +23,8 @@
 # ./cbbs.sh BRCM 0 4444 BRCM/4 5 300 45
 #####################################################
 
+. /lib/voice/voicelib.sh
+
 #Create temporary file
 tempfile=$(mktemp)
 
@@ -31,7 +33,7 @@ echo "Channel: $1/$2/$3" >> $tempfile
 echo "MaxRetries: $5" >> $tempfile
 echo "RetryTime: $6" >> $tempfile
 echo "WaitTime: $7" >> $tempfile
-echo "Set: BRCMLINE=$4" >> $tempfile
+echo "Set: $(getChannelName)LINE=$4" >> $tempfile
 
 #On answer
 echo "Context: cbbs" >> $tempfile

voice-client/files/usr/libexec/rpcd/voice.asterisk

@@ -1,10 +1,11 @@
 #!/bin/sh
 
 . /usr/share/libubox/jshn.sh
+. /lib/voice/voicelib.sh
 
 case "$1" in
 	list)
-		echo '{ "status" : {}, "lines" : {}, "codecs" : {}, "call_log" : {} }'
+		echo '{ "status" : {}, "lines" : {}, "codecs" : {}, "call_log" : {}, "platform" : {} }'
 
 	;;
 	call)
@@ -48,8 +49,8 @@ case "$1" in
                                 done
 				json_select ..
 
-				json_add_object "brcm"
-				for line in $(uci show voice_client | grep brcm_line | awk -F[.,=] '{print$2}'); do
+				json_add_object "tel"
+				for line in $(uci show voice_client | grep tel_line | awk -F[.,=] '{print$2}'); do
 					json_add_object "$line"
 					linestate="ONHOOK"
 					linenum=${line:4}
@@ -66,7 +67,7 @@ case "$1" in
 
 			;;
 			lines)
-				subchannels=$(asterisk -x 'brcm show status' 2>/dev/null | grep Subchannel | sort -u | wc -l)
+				subchannels=$(asterisk -x "$(getChipVendor) show status" 2>/dev/null | grep Subchannel | sort -u | wc -l)
 				[ $subchannels -eq 0 ] && subchannels=2
                                 json_init
                                 json_add_int num_subchannels $subchannels
@@ -125,6 +126,26 @@ case "$1" in
                                 done < /var/log/asterisk/cdr-csv/Master.csv
 				json_dump
 			;;
+			platform)
+                                json_init
+                                json_add_string platform "$(getLineName)"
+
+				case $(getLineName) in
+				    "brcm")
+					    json_add_int lineoffset 0
+					    json_add_int chanoffset 0
+				    ;;
+				    "tapi")
+					    json_add_int lineoffset 1
+					    json_add_int chanoffset -1
+				    ;;
+			        *)
+				    # Error, unknown platform
+				    ;;
+				esac
+				
+				json_dump
+			;;
 		esac
 	;;
 esac

wifilife/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=wifilife
 PKG_VERSION:=1.0.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=9a75b717d3cd95d88e394f5bcd8b4006dfa450ba
+PKG_SOURCE_VERSION:=de6183cda406fbd1a98779bda2ea1b2ffb8f2e04
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 ifeq ($(CONFIG_WIFILIFE_OPEN),y)

wifimngr/Makefile

@@ -8,7 +8,7 @@ PKG_NAME:=wifimngr
 PKG_VERSION:=1.0.2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c7228ea031f407580ff8e4801e0ba544aeadd050
+PKG_SOURCE_VERSION:=8f8f51dbf74a2ce67f1e2569d00317ebd3bd25bb
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>