inteno-netmodes: testnet: fix typo

change from git to http

dectmngr2/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.1.0
 PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cbe2bd27df151be073cf88e8550bbb39c6cd29d8
+PKG_SOURCE_VERSION:=ace6a3dcb6aa463cf5a34ad39ac37a5bc7d4ce5e
 PKG_NAME:=dectmngr2
 
 

endptmngr/Makefile

@@ -8,35 +8,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=dec85d5beabcb0d01f5a5583e3940c9dc922ea03
-
-
-ifeq ($(CONFIG_ENDPT_OPEN),y)
-BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
-PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
-PKG_NAME:=endptmngr-open
-else
+PKG_VERSION:=0.1
 PKG_SOURCE_URL:=git@private.inteno.se:endptmngr
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_VERSION:=e2733e11e42e5014af7f4b6140aa0a3b6cbb6d10
 PKG_NAME:=endptmngr
-endif
 
 RSTRIP:=true
 export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/endptmngr/config
-	source "$(SOURCE)/Config.in"
-endef
-
 define Package/endptmngr
   CATEGORY:=Utilities
   TITLE:=Brcmslic
@@ -48,14 +34,6 @@ define Package/endptmngr/description
 	endptmngr
 endef
 
-ifeq ($(CONFIG_ENDPT_OPEN),y)
-
-define Build/Compile
-endef
-
-endif
-
-
 define Package/endptmngr/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/init.d/

ice-client/Makefile

@@ -19,14 +19,14 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=5.1.1
-PKG_RELEASE:=
-PKG_VERSION:=$(BASE_PKG_VERSION)$(PKG_RELEASE)_$(DATE)_$(LOGIN)
+BASE_PKG_VERSION:=5.0.2
+PKG_RELEASE:=RC15
+PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=e8bf50630e6ba12dc2d223112643077c4db49189
+PKG_SOURCE_VERSION:=9976efee33243e044b89e74b3c05429aeb777038
 ifeq ($(CONFIG_ICE_OPEN),y)
 TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
@@ -132,12 +132,12 @@ endef
 
 ifeq ($(CONFIG_ICE_OPEN),y)
 define Package/ice-client/install
-	#$(INSTALL_DIR) $(1)/bin
-	#$(INSTALL_DIR) $(1)/etc
-	#$(INSTALL_DIR) $(1)/usr
-	#$(CP) $(PKG_BUILD_DIR)/bin/* $(1)/bin/
-	#$(CP) $(PKG_BUILD_DIR)/etc/* $(1)/etc/
-	#$(CP) $(PKG_BUILD_DIR)/usr/* $(1)/usr/
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DIR) $(1)/usr
+	$(CP) $(PKG_BUILD_DIR)/bin/* $(1)/bin/
+	$(CP) $(PKG_BUILD_DIR)/etc/* $(1)/etc/
+	$(CP) $(PKG_BUILD_DIR)/usr/* $(1)/usr/
 endef
 else
 define Package/ice-client/install

icwmp/Config_datamodel.in

@@ -1,4 +1,14 @@
 if PACKAGE_libdatamodel
+choice
+	prompt "Select Data Model"
+	default tr098
+
+config DATAMODEL_TR098
+	bool "TR-098"
+
+config DATAMODEL_TR181
+	bool "TR-181"
+endchoice
 
 config UPNP_TR064
 	bool "Compile with tr064 features"

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2018-05-23
+PKG_VERSION:=4.0-2018-02-26
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3320a6234403802647df9d8df485cd8a2754dac0
+PKG_SOURCE_VERSION:=dc025485291cad748addb4b90403b298efb95fab
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -111,7 +111,9 @@ ifeq ($(CONFIG_XMPP_ENABLE),y)
 CONFIGURE_ARGS += \
 	--enable-xmpp
 endif
-	
+
+CONFIGURE_ARGS += $(if $(CONFIG_DATAMODEL_TR181),--enable-datamodel=tr181,--enable-datamodel=tr098)
+
 ifeq ($(BUILD_VARIANT),zstream)
 CONFIGURE_ARGS += \
 	--enable-http=zstream \

imonitor/Makefile

@@ -1,42 +0,0 @@
-#
-# Copyright (C) 2018 Inteno
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=imonitor
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
-PKG_BUILD_PARALLEL:=1
-PKG_INSTALL:=1
-
-PKG_SOURCE_PROTO=git
-PKG_SOURCE_URL:=http://public.inteno.se/imonitor.git
-PKG_SOURCE_VERSION:=7ad67946ff8d9701447e720242d42bca7e910a56
-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
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/imonitor
-	CATEGORY:=Utilities
-	TITLE:=Inteno process supervisor
-	DEPENDS:=+ubox +uci +ubus +rpcd +rpcd-mod-file
-endef
-
-define Package/imonitor/description
-	imonitor is a process supervisor or a process control system similar to the Supervisor (http://supervisord.org/)
-endef
-
-define Package/imonitor/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/imonitor $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/etc/config
-endef
-
-$(eval $(call BuildPackage,imonitor))

imonitor/files/etc/config/imonitor

@@ -1,8 +0,0 @@
-config monitor
-   option app 'test'
-   option test 'echo test'
-   option stream 'stdout'
-   option string_match 'test'
-   option execute 'echo executing'
-   option interval '10'
-   option nr_tests '2'

imonitor/files/etc/init.d/imonitor

@@ -1,29 +0,0 @@
-#!/bin/sh /etc/rc.common
-#
-# Start the imonitor
-#
-
-START=99
-STOP=01
-
-USE_PROCD=1
-NAME=imonitor
-
-start_service() {
-	procd_open_instance
-	procd_set_param command "imonitor"
-	procd_set_param stdout 1
-        procd_set_param stderr 1
-	procd_set_param respawn
-	procd_close_instance
-}
-
-stop() {
-	service_stop imonitor
-}
-
-reload_service() {
-	stop
-	start
-}
-

inteno-netmodes/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=inteno-netmodes
 PKG_VERSION:=0.2.0
 
-PKG_SOURCE_VERSION:=fbd7dcfab03df19b3c32675940e0aee708c7cf75
+PKG_SOURCE_VERSION:=b898924491c378ca09ab124991b27f54a336e4e9
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/netmoded
 

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

@@ -17,13 +17,11 @@ if [ "$(netmode_get_ip_type $ipaddr)" == "private" ]; then
 	if [ "$repeaterready" == "1" -o "${curmode:0:8}" == "repeater" ]; then
 		# flush the ip on br-lan; br-lan will anyhow be deleted.
 		# this is needed if the ip received on the wan is also from the same net
-		logger -s -p user.info -t $0: [netmode] ip addr flush dev br-lan >/dev/console
 		ip addr flush dev br-lan 2>/dev/null
 
 		# flush iptables in case the MASTER
 		# tries to configure us before
 		# firewall is disabled the proper way
-		logger -s -p user.info -t $0: [netmode] iptables -F >/dev/console
 		iptables -F
 
 		disable_firewall 1

inteno-netmodes/files/etc/hotplug.d/net/80-repeater

@@ -13,10 +13,7 @@ case "$(uci get netmode.setup.curmode)" in
 		repeater*)
 		;;
 		*)
-			ping -c 1 -w 5 $defroute >/dev/null 2>&1 || {
-				logger -s -t "80-repeater" "ping to $defroute failed, sending USR1 to udhcpc" >/dev/console
-				killall -USR1 udhcpc
-			}
+			ping -c 1 -w 5 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
 			exit
 		;;
 esac

inteno-netmodes/files/etc/init.d/netmode

@@ -12,7 +12,7 @@ start_netmoded() {
 	procd_open_instance
 	procd_set_param command $NETMODED
 
-	procd_append_param command --verbose warning
+	procd_append_param command --verbose debug
 	procd_set_param stdout 1
 	procd_set_param stderr 1
 

inteno-netmodes/files/lib/functions/netmode.sh

@@ -155,23 +155,26 @@ switch_netmode() {
         echo $curmode >$OLD_MODE_FILE
 
 	[ -d "/etc/netmodes/$curmode" ] || return
-	logger -s -p user.info -t $0 "[netmode] Copying /etc/netmodes/$curmode in /etc/config" >/dev/console
 	cp /etc/netmodes/$curmode/* /etc/config/
 	rm -f /etc/config/DETAILS
 	sync
 
 	local reboot=$(uci -q get netmode.$curmode.reboot)
 
-	if [ "$reboot" != "0" ]; then
+	if [ "$reboot" == "1" ]; then
 		reboot &
 		exit
 	fi
 
 	/etc/init.d/environment reload
 	case "$curmode" in
+		routed*)
+			[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
+			ubus call uci commit '{"config":"network"}'
+		;;
 		repeater*)
 			touch $SWITCHMODELOCK
-			logger -s -p user.info -t $0 "Switching to $curmode mode" > /dev/console
+			echo "Switching to $curmode mode" > /dev/console
 			ubus call leds set  '{"state" : "allflash"}'
 			[ -f /etc/init.d/omcproxy ] && /etc/init.d/omcproxy stop
 			[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
@@ -183,10 +186,6 @@ switch_netmode() {
 			ubus call leds set  '{"state" : "normal"}'
 			rm -f $SWITCHMODELOCK
 		;;
-		*)
-			[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
-			ubus call uci commit '{"config":"network"}'
-		;;
 	esac
 }
 
@@ -223,13 +222,7 @@ wait_for_netmode_handler() {
 }
 
 netmode_get_ip_type() {
-	[ -n "$(echo $1 | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ] && {
-		logger -t "[netmode]" "netmode_get_ip_type: ip $1 is private"
-		echo "private"
-	} || {
-		logger -t "[netmode]" "netmode_get_ip_type: ip $1 is public"
-		echo "public"
-	}
+	[ -n "$(echo $1 | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ] && echo "private" || echo "public"
 }
 
 get_device_of() {

inteno-netmodes/files/sbin/netmode-client-detect

@@ -51,7 +51,7 @@ while true ; do
 		json_get_var network network "lan"
 
 		if is_inteno_macaddr $macaddr; then
-			logger -s -p user.info -t $0 "netmode-client-detect: a new Inteno device detected on '$network' network (MACAddr:$macaddr IPAddr:$ipaddr)" >/dev/console
+			echo "netmode-client-detect: a new Inteno device detected on '$network' network (MACAddr:$macaddr IPAddr:$ipaddr)" >/dev/console
 			ubus call repeater get_creds '{"network":"'$network'","file":"/tmp/wificontrol.txt"}'
 			/sbin/wificontrol --router --destination $ipaddr
 		fi

inteno-netmodes/files/sbin/start-netmode-conf

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-netmode-conf "$1" "$2" &

inteno-netmodes/files/sbin/testnet

@@ -58,6 +58,7 @@ ping_uplink()
 	fi
 
 	if [ $rv -eq 0 ]; then
+
 		echo "{ \"online\" : false }" > /tmp/internet_connection_status
 
 		SLEEP_TIME=10
@@ -65,14 +66,11 @@ ping_uplink()
 		wetif="$(uci -q get wireless.$(uci show wireless | grep 'mode=.*wet.*' | cut -d'.' -f2 | head -1).ifname)"
 		# If there is an uplink IP address but no connection for 5 minutes, reboot
 		if [ $enableCounter -gt 32 ]; then
-			logger -s -p user.info -t "testnet" "No uplink connection; reboot" >/dev/console
 			ubus call led.internet  set '{"state" : "error"}'
 			reboot &
 		elif [ $((enableCounter % 8)) -eq 0 -a $enableCounter -ge 8 -o $enableCounter -eq 0 ]; then
 			ps | grep -v grep | grep -q 'wifi reload\|wifi import\|wifi.credentials\|iwpriv' && return
 
-			logger -s -p user.info -t "testnet" "No uplink connection; try to re-connect" >/dev/console
-
 			if [ -f /usr/sbin/wlctl ]; then
 				assoclist="$(wlctl -i $wetif assoclist | head -1 | awk '{print$2}')"
 				wlctl -i $wetif reassoc $assoclsit
@@ -114,7 +112,6 @@ ping_uplink()
 		AccessPolicy=1
 		if [ -f /usr/sbin/iwpriv ]; then
 			grep -q up /sys/class/net/$ETHWAN/operstate 2>/dev/null || {
-				logger -s -p user.info -t "testnet" "Disconnect all stations and disable WiFi access on downlink wireless interfaces" >/dev/console
 				# Do not allow clients to connect on 2.4GHz radio
 				iwpriv ra0 set AccessPolicy=$AccessPolicy
 				# Do not allow clients to connect on 5GHz radio
@@ -125,8 +122,7 @@ ping_uplink()
 				iwpriv rai0 set DisConnectAllSta=2
 			}
 		fi
-	else
-		grep -q "true" /tmp/internet_connection_status 2>/dev/null || logger -s -p user.info -t "testnet" "Uplink connection is gained" >/dev/console
+	else 
 		echo "{ \"online\" : true }" > /tmp/internet_connection_status
 		ubus call led.internet  set '{"state" : "eok"}'
 
@@ -140,10 +136,10 @@ ping_uplink()
 		AccessPolicy=0
 
 		if [ -f /usr/sbin/iwpriv ]; then
-			logger -s -p user.info -t "testnet" "Enable WiFi access on downlink wireless interfaces" >/dev/console
 			iwpriv ra0 set AccessPolicy=$AccessPolicy
 			iwpriv rai0 set AccessPolicy=$AccessPolicy
 		fi
+
 	fi
 }
 

inteno-netmodes/files/usr/libexec/rpcd/repeater

@@ -129,12 +129,12 @@ case "$1" in
 				json_load "`cat $file`" || write_error "invalid file content"
 				json_select "wifi_ifaces" || write_error "invalid file content"
 
-				start-netmode-conf "$file" "$from_gui" >/dev/null 2>/dev/null
 
 				json_init
 				json_add_string "status" success
 				json_dump
 
+				netmode-conf "$file" "$from_gui" >/dev/null 2>&1 &
 			;;
 		esac
 	;;

iop-lla-libs/Config.in

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

iop-lla-libs/Makefile

@@ -1,117 +0,0 @@
-#
-# Copyright (C) 2018 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=iop-lla-libs
-PKG_VERSION:=1.0.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1b863569ba4ed64d7fdbc4e05d4abf6597aa257e
-PKG_SOURCE_URL:=http://public.inteno.se:/iop-lla-libs
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/iop-lla-libs
-  SECTION:=libs
-  CATEGORY:=Libraries
-  SUBMENU:=IOPSYS low level libraries
-  DEPENDS:=+libopenssl
-endef
-
-define Package/libwifi
-  $(call Package/iop-lla-libs)
-  TITLE:= WiFi library (libwifi)
-endef
-
-define Package/libdsl
-  $(call Package/iop-lla-libs)
-  TITLE:= XDSL library (libdsl)
-endef
-
-define Package/libethernet
-  $(call Package/iop-lla-libs)
-  TITLE:= Ethernet library (libethernet)
-endef
-
-define Package/iop-lla-libs/config
-  source "$(SOURCE)/Config.in"
-endef
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
-  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-  TARGET_PLATFORM=MEDIATEK
-  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-  TARGET_PLATFORM=MARVELL
-  TARGET_CFLAGS +=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_lantiq_xrx500),y)
-  TARGET_PLATFORM=LANTIQ
-  TARGET_CFLAGS +=-DIOPSYS_LANTIQ
-else
-  $(info (UNEXPECTED CONFIG TARGET))
-endif
-
-ifdef CONFIG_IOP_LLA_LIBS_DEBUG
-  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
-endif
-
-subdirs := \
-	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
-	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	FPIC="$(FPIC)" \
-	PLATFORM="$(TARGET_PLATFORM)" \
-	subdirs="$(subdirs)"
-
-define Build/InstallDev/libwifi
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
-endef
-
-define Build/InstallDev/libdsl
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libdsl/xdsl.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-endef
-
-define Build/InstallDev
-	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
-endef
-
-define Package/libwifi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi.so* $(1)/usr/lib/
-endef
-
-define Package/libethernet/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so* $(1)/usr/lib/
-endef
-
-define Package/libdsl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libwifi))
-$(eval $(call BuildPackage,libdsl))
-$(eval $(call BuildPackage,libethernet))

iop/configs/config

@@ -32,7 +32,6 @@ 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_imonitor=y
 CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_inteno-netmodes=y
 CONFIG_PACKAGE_iperf-mt=y
@@ -56,11 +55,11 @@ 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-inteno-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-inteno-provisioning=y
+# CONFIG_PACKAGE_juci-inteno-qos is not set
+CONFIG_PACKAGE_juci-inteno-voice-client=y
 CONFIG_PACKAGE_juci-macdb=y
 CONFIG_PACKAGE_juci-minidlna=y
 CONFIG_PACKAGE_juci-mod-status=y
@@ -114,7 +113,7 @@ 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_p910nd=y
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_power-management=y
@@ -131,7 +130,6 @@ CONFIG_PACKAGE_rdnssd=y
 CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_rulengd=y
 CONFIG_PACKAGE_samba3=y
 CONFIG_PACKAGE_samba3-nmbd=y
 CONFIG_PACKAGE_snmpd=y
@@ -157,7 +155,6 @@ CONFIG_TARGET_ROOTFS_TARGZ=y
 CONFIG_USE_STRIP=y
 CONFIG_BUILD_LOG=y
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
-CONFIG_BUSYBOX_CONFIG_ARPING=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
 CONFIG_BUSYBOX_CONFIG_DELUSER=y

iop/configs/target/iopsys_brcm63xx_arm/sdx810_rg/config

@@ -1,3 +1,3 @@
 CONFIG_BCM_ENDPOINT_MODULE=y
 CONFIG_TARGET_NO_DECT=y
-CONFIG_TARGET_NO_DSL=y
+

iop/iop.completion

@@ -36,7 +36,7 @@ _iop()
              feeds_update genconfig generate_tarballs install_key \
              scp_changes setup_host ssh_install_key ssh_sysupgrade \
              ssh_sysupgrade_latest ssh_sysupgrade_latest_w status \
-             update_package update_feed_branches"
+             update_package"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 

iop/scripts/build_branch.sh

@@ -1,60 +0,0 @@
-#!/bin/sh
-# build_branch
-#./iop build_branch <branch> <board> [<customer>]
-
-function build_branch_usage {
-	echo "usage: $0 build_branch <branch> <board> [<customer>]"
-	echo "example: $0 build_branch devel-new ex400 DEV"
-	echo "example: $0 build_branch_sysupgrade devel-new ex400 DEV 192.168.1.1 -n"
-	set +x
-	exit 1
-}
-
-function branch_exists {
-	local branch=$1
-	[ -z "$branch" ] && return 1
-	git branch | grep -q $branch && return 0
-	return 1
-}
-
-function build_branch {
-	set -x
-	local branch=$1
-	local board=$2
-	local customer=$3
-	[ "$customer" == "INT" ] && customer=""
-
-	if ! branch_exists $branch ; then
-		echo "Branch $branch not found"
-		build_branch_usage
-	fi
-
-time {
-	git fetch origin || build_branch_usage
-	git fetch --all -p || build_branch_usage
-	git checkout $branch || build_branch_usage
-	git pull || exit 1
-	./iop feeds_update || build_branch_usage
-	./iop genconfig -c $board $customer || build_branch_usage
-	make -j 8 || build_branch_usage
-	set +x
-}
-}
-
-function build_branch_sysupgrade {
-	set -x
-	local branch=$1 ; shift
-	local board=$1 ; shift
-	local customer=$1 ; shift
-	local ip=$1 ; shift
-	local opts=$*
-
-time {
-	./iop build_branch $branch $board $customer
-	[ "$?" == "0" ] && ./iop ssh_sysupgrade_latest $ip $opts
-}
-	set +x
-}
-
-register_command "build_branch" "<branch> <board> [<customer>]  Build a <branch> for a <board> [with a <customer> profile]"
-register_command "build_branch_sysupgrade" "<branch> <board> <customer>|INT <ip> [<opts>]  Build a <branch> for a <board> [with a <customer> profile] and sysupgrade [with <opts>] it on the router at <ip>"

iop/scripts/generate_tarballs.sh

@@ -14,7 +14,6 @@ build_bcmkernel_consumer() {
 	tarfile='out/bcm963xx_*_consumer.tar.gz'
 	[ $(ls -1 $tarfile |wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
 	scp $tarfile $SERVER:$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz
-	ssh $SERVER "ln -s $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz $FPATH/bcmopen-$board-$majver.$minver.tar.gz"
 	rm -f $tarfile
 	cd $curdir
 }
@@ -38,24 +37,22 @@ build_natalie_consumer() {
 	cd $curdir
 }
 
-build_endptmngr_consumer() {
-	# create endptmngr open version tar file
+build_endptcfg_consumer() {
+	# create endptcfg open version tar file
 	local endptversion endptcommith
 	grep -q "CONFIG_TARGET_NO_VOICE=y" .config && return
-	endptversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/endptmngr/Makefile | cut -d'=' -f2)
-	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/endptmngr/Makefile | cut -d'=' -f2)
+	endptversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/endptcfg/Makefile | cut -d'=' -f2)
+	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/endptcfg/Makefile | cut -d'=' -f2)
 	[ -n "$profile" -a -n "$endptversion" -a -n "$endptcommith" ] || return
-	ssh $SERVER "ls $FPATH/endptmngr-$profile-$endptversion-$endptcommith.tar.gz" && return
-	cd ./build_dir/target-*/endptmngr-$endptversion/
-	mkdir endptmngr-open-$endptversion
-	mkdir endptmngr-open-$endptversion/src
-	cp ./src/endptmngr endptmngr-open-$endptversion/src
-	cp -r ./files/ endptmngr-open-$endptversion/
-	tar -czv  endptmngr-open-$endptversion/ -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
-	scp endptmngr-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
-	cp endptmngr-$profile-$endptversion-$endptcommith.tar.gz $curdir/
-	rm -rf endptmngr-open-$endptversion
-	rm -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
+	ssh $SERVER "ls $FPATH/endptcfg-$profile-$endptversion-$endptcommith.tar.gz" && return
+	cd ./build_dir/target-*/endptcfg-$endptversion/
+	mkdir endptcfg-open-$endptversion
+	cp endptcfg endptcfg-open-$endptversion/
+	tar -czv  endptcfg-open-$endptversion/ -f endptcfg-$profile-$endptversion-$endptcommith.tar.gz
+	scp endptcfg-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
+	cp endptcfg-$profile-$endptversion-$endptcommith.tar.gz $curdir/
+	rm -rf endptcfg-open-$endptversion
+	rm -f endptcfg-$profile-$endptversion-$endptcommith.tar.gz
 	cd $curdir
 }
 
@@ -120,8 +117,6 @@ function generate_tarballs {
     target=$(grep CONFIG_TARGET_BOARD .config | cut -d'=' -f2 | tr -d '"')
     board=$(grep CONFIG_TARGET_IBOARDID .config | cut -d'=' -f2 | tr -d '"')
     profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
-    majver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f1 -d .)
-    minver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f2 -d .)
     curdir=$(pwd)
 
 
@@ -150,7 +145,7 @@ function generate_tarballs {
 	if [ "$stk_target" == "broadcom" ]; then
 		build_bcmkernel_consumer
 		build_natalie_consumer
-		build_endptmngr_consumer
+		build_endptcfg_consumer
 		build_ice_consumer
 	elif [ "$stk_target" == "mediatek" ]; then
 		build_mediatek_kernel

iop/scripts/ssh_sysupgrade.sh

@@ -22,7 +22,7 @@ function ssh_sysupgrade {
 	fi
 	IMAGE=`basename $2`
 	echo "sysupgrade host: $1 with file $IMAGE"
-	[ "$2" ] && [ -e "$2" ] && scp $2 root@$1:/tmp/ && ssh -o ConnectTimeout=60 root@$1 "sysupgrade -v $3 /tmp/$IMAGE" && echo "sysupgrade done!"
+	[ "$2" ] && [ -e "$2" ] && scp $2 root@$1:/tmp/ && ssh root@$1 "sysupgrade $3 /tmp/$IMAGE" && echo "sysupgrade done!"
 }
 
 register_command "ssh_sysupgrade" "<host> <file> [opts]  Install firmware on remote host with SSH"

iop/scripts/update_feed_branches.sh

@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# Exported interface
-function update_feed_branches {
-	local release="$1"
-	local ipath="$(pwd)"
-	local branch="$2"
-	local curbranch
-
-	[ -n "$release" ] || {
-		echo "Usage: ./update_feeds <RELEASE> <BRANCH>"
-		echo ""
-		echo "If you do not give a branch as argument,"
-		echo "<RELEASE> branch will be updated to commit"
-		echo "hash given in feeds.conf for each feed repo"
-		exit 1
-	}
-
-	if [ -n "$branch" ]; then
-		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo at branch $branch"
-		if git diff-index --quiet HEAD; then
-			curbranch=`git symbolic-ref HEAD 2>/dev/null`
-			curbranch=${curbranch##refs/heads/}
-			if [ -z $curbranch ]; then
-				curbranch=`git log -1 --pretty=format:"%H"`
-			fi
-			git checkout $branch || {
-				echo "couldn't checkout branch $branch"
-				exit 99
-			}
-		else
-			echo "You have unsaved changes."
-			exit 99
-		fi
-	else
-		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo"
-	fi
-
-	ifeeds="$(grep -r feed_inteno feeds.conf  | awk '{print$2}' | cut -d'_' -f3 | tr '\n' ' ')"
-
-	for f in $ifeeds; do
-		commith=$(grep feed_inteno_$f feeds.conf | cut -d'^' -f2)
-		cd $ipath/feeds/feed_inteno_$f
-		git branch -D $release 2>/dev/null
-		echo "feed_inteno_$f: updating release branch $release to commit $commith"
-		git checkout $commith
-		git push origin :$release
-		git checkout -b $release
-		git push origin $release
-		cd $ipath
-	done
-
-	if [ -n "$branch" ]; then
-		echo "Release branch $release is updated to specific commit hash given in feeds.conf in in branch $branch for each feed repo"
-		git checkout $curbranch
-	else
-		echo "Release branch $release is updated to specific commit hash given in feeds.conf for each feed repo"
-	fi
-}
-
-register_command "update_feed_branches" "<release> [branch] Update branches in feeds from the current top level commit or specified top level branch"

iop/scripts/update_package.sh

@@ -41,7 +41,7 @@ update_this_pkg()
 	echo "	to get an up to date version in ${PKG_BUILD_DIR}/.git_update"
 	echo ""
 
-	echo -n "	Should we continue with the update anyway? [y/N]:"
+	echo -n "	Shold we continue with the update anyway? [y/N]:"
 	read answer
 	echo ""
 
@@ -184,7 +184,7 @@ branch_uptodate()
      else
 	 echo "Diverged. not sure what you did but there is no tracking branch. "
 	 echo "repo at [ $1 ]. fix it so that there is a tracking branch remote."
-	 echo "Often this is related to somebody having commited to the same branch"
+	 echo "Often this is related to sombody having commited to the same branch"
 	 echo "on the server so a simple push wont work, try a 'git rebase'."
 	 exit 99
      fi

iup/files/lib/functions/dhcp_option_relay.sh

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

iup/files/sbin/iup

@@ -5,7 +5,6 @@ echo $$ > /var/run/iup.pid
 . /lib/functions.sh
 . /lib/functions/network.sh
 . /lib/functions/savecfg.sh
-. /lib/functions/dhcp_option_relay.sh
 . /usr/share/libubox/jshn.sh
 
 include /lib/upgrade
@@ -269,20 +268,19 @@ change_to_vlan() {
 	base_dev=$(echo ${base_dev} | cut -d. -f1)
 
 	# add "VLAN interface" to the "end of the file".
-	uci add network device
-	uci rename network.@device[-1]=${name}
-	uci set network.@device[-1].type=8021q
-	uci set network.@device[-1].ifname=${base_dev}
-	uci set network.@device[-1].name="${base_dev}.${1}"
-	uci set network.@device[-1].vid=${1}
-	uci set network.@device[-1].priority=${2}
+	uci add layer2_interface_vlan vlan_interface
+	uci set layer2_interface_vlan.@vlan_interface[-1].name=${name}
+	uci set layer2_interface_vlan.@vlan_interface[-1].vlan8021q=${1}
+	uci set layer2_interface_vlan.@vlan_interface[-1].vlan8021p=${2}
+	uci set layer2_interface_vlan.@vlan_interface[-1].ifname="${base_dev}.${1}"
+	uci set layer2_interface_vlan.@vlan_interface[-1].baseifname=${base_dev}
 	# and commit the change.
-	uci commit network
-	v "option 132: committed update to file network"
+	uci commit layer2_interface_vlan
+	v "option 132: committed update to file layer2_interface_vlan"
 
 	# reload configuration files.
 	/etc/init.d/layer2_interface_vlan reload
-	v "option 132: reload network config"
+	v "option 132: reload layer2_interface_vlan config"
 
 	# replace old interface (like eth0.1 with new eth0.101).
 	wan_if=$(uci get network.$3.ifname)
@@ -385,10 +383,6 @@ handle_option224()
 parse_dhcp_options()
 {
 	local the_json="$@"
-
-	# process the dhcp_option_relay sections
-	dhcp_option_relay_parse "$the_json"
-
 	# Process IUP related DHCP options #
 	local privopt224 privopt225 privopt226 vendorspecinf httpurl128
 	local tftp bootfile vlanid vlanpriority interface
@@ -568,7 +562,7 @@ main()
 	        if [ "$filesystem" == "JFFS2" ] ; then
 	                firmware=$firmware.w
 		else
-			firmware=$firmware.y3
+			firmware=$firmware.y
 		fi
 		if [ "$sofwareminuspath" == "${sofwareminuspath/$firmware/}" ] ; then
 			v "Software \"$software\""

libmobile/Makefile

@@ -1,77 +0,0 @@
-#
-# Copyright (C) 2013 Inteno
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=libmobile
-PKG_VERSION:=0.1
-
-PKG_SOURCE_VERSION:=62db19a67357473f1f8eb7b36c5c48a0baad55c6
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@public.inteno.se:mobile-api.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
-	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))

libmobile/files/etc/config/mdmngr

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

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

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

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

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

libmobile/files/etc/init.d/mdmngr

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

libpicoevent/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.2
+PKG_VERSION:=0.1
 PKG_SOURCE_URL:=http://public.inteno.se/libpicoevent
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e374bb2e848ab4002d13a02b6375974e155ba37e
+PKG_SOURCE_VERSION:=c96770b32f66c6e799f8430d8e85d94780358135
 PKG_NAME:=libpicoevent
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

owsd/Makefile

@@ -61,8 +61,8 @@ define Package/owsd/install
 	$(INSTALL_CONF) ./files/owsd.config $(1)/etc/config/owsd
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) ./files/owsd.hotplug $(1)/etc/hotplug.d/iface/55-owsd
-#	$(INSTALL_DIR) $(1)/etc/uci-defaults
-#	$(INSTALL_BIN) ./files/owsd.uci_default $(1)/etc/uci-defaults/55-owsd-interfaces
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/owsd.uci_default $(1)/etc/uci-defaults/55-owsd-interfaces
 endef
 
 define Package/owsd-testdata

peripheral_manager/files/sbin/ledctl

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-usage () {
-	echo "Usage: ledctl [normal|test|allon|alloff|production]"
-	exit 1
-}
-
-[ $# -ne 1 ] && usage
-ledstate=$(echo $1 | tr '[A-Z]' '[a-z]')
-
-case $ledstate in
-	normal|test|allon|alloff|production)
-		ubus call leds set  "{\"state\" : \"$ledstate\"}"
-	;;
-	*)
-		usage
-	;;
-esac
-

questd/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.40
 
-PKG_SOURCE_VERSION:=d3a77faeadac7c7094fa084524d08e03c296bb56
+PKG_SOURCE_VERSION:=bc42507b2530185bb6650c56c02acd6d5e271a15
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 

rulengd/Makefile

@@ -12,7 +12,7 @@ PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=http://public.inteno.se/rulengd.git
-PKG_SOURCE_VERSION:=99881f39232154530ac129dc2109d78963017ad1
+PKG_SOURCE_VERSION:=ba3bc1d0e0219c43c970bb7a332132572da6115a
 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>

uboot/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=u-boot
 PKG_VERSION:=2016.08
-PKG_RELEASE:=5
+PKG_RELEASE:=4
 PKG_SOURCE_URL:=http://public.inteno.se:/uboot
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=38f170244c587eb3eec37c4c033bf41c0abb89dc
@@ -24,9 +24,6 @@ PKG_BUILD_PARALLEL:=1
 #include $(INCLUDE_DIR)/u-boot.mk
 include $(INCLUDE_DIR)/package.mk
 
-# prevent openwrt source date to be used as build date by u-boot
-unexport SOURCE_DATE_EPOCH
-
 
 define uboot/Default
   TITLE:=

uboot/files/etc/init.d/uboot

@@ -27,12 +27,10 @@ sanity_check_env(){
 }
 
 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
-    u_ver=$(strings  /dev/mtd0 | grep 938f0820-2ffb-11e7-bbc9-2f21351ee6fb)
-    [ -n "$u_ver" ] && fw_setenv uboot_inteno_version "$u_ver"
+
     sanity_check_env
 }
 

voice-client/files/etc/asterisk_templates/indications.conf.TEMPLATE

@@ -206,19 +206,6 @@ info = 450/100,0/100,450/100,0/100,450/100,0/100,450/400,0/400
 ; STUTTER - not specified
 stutter = 450+425
 
-[cr]
-description = Croatia / Europe
-ringcadence = 2000,4000
-dial = 425/200,0/300,425/700,0/800
-busy = 425/500,0/500
-ring = 425/1000,0/4000
-congestion = 425/250,0/250
-callwaiting = 425/300,0/8000
-dialrecall = 425/200,0/300,425/700,0/800
-record = 1400/500,0/15000
-info = 1400/330,!1800/330,0/1000
-stutter = 0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
-
 [cz]
 description = Czech Republic
 ; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf

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

@@ -1,2 +1,2 @@
-#exec echo 'register => |TRANSPORT|://|USER|@|DOMAIN|:'$(/usr/bin/voicesec -d /usr/lib/asterisk/voicesec_|PROVIDER|)'|AUTHUSER|@|PROVIDER||PORT|/|CONTACT_USER|'
+#exec echo "register => |TRANSPORT|://|USER|@|DOMAIN|:$(/usr/bin/voicesec -d /usr/lib/asterisk/voicesec_|PROVIDER|)|AUTHUSER|@|PROVIDER||PORT|/|CONTACT_USER|"
 

voice-client/files/etc/idc_cc.cfg

@@ -3,7 +3,6 @@ BEL;00;32
 BRA;00;55
 CHL;1xx0;56
 CHN;00;86
-HRV;00;385
 CZE;00;420
 DNK;00;45
 ETS;00;372

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

@@ -721,10 +721,6 @@ configure_sip_provider()
 	config_get transport $1 transport
 	config_get encryption $1 encryption
 
-	# This is a hack to fix security issue #14962
-	user=${user//"'"/}
-	authuser=${authuser//"'"/}
-
 	if [ -z "$transport" ] ; then 
 		transport="udp" 
 	fi

wifimngr/Makefile

@@ -1,53 +1,45 @@
 #
-# Copyright (C) 2018 Iopsys
+# Copyright (C) 2015 Inteno
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=1.0.0
+PKG_VERSION:=2016-03-29
 
+PKG_SOURCE_VERSION:=9dae4438b781b0abb7ca9e16c37c0344b16ccf2a
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fa0c6298ed8e47ac2979d51e0697e41bcaa3a055
 PKG_SOURCE_URL:=http://public.inteno.se:/wifimngr
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+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
 
+LDFLAGS+= \
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+	-Wl,-rpath-link=$(STAGING_DIR)/lib
+
 define Package/wifimngr
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=WiFi status and configration utility
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl
+	CATEGORY:=Network
+	DEPENDS:=+libpthread +libstdcpp +librt +libjson +alljoyn +alljoyn-about +ubus +libuci
+	TITLE:=WiFi Manager
 endef
 
 define Package/wifimngr/description
- This package can be used to configure and provide status about
- the WiFi modules through UBUS.
- It does this in an implementation agnostic manner through APIs
- exposed by the libwifi library.
+	wifimngr manages wireless driver
 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)"
-
-#define Build/Compile
-#	+$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
-#endef
-
 define Package/wifimngr/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wifimngr $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wifimngr $(1)/sbin/
+endef
+
+define Package/wifimngr/postinst
+	/etc/init.d/alljoyn restart
+	pidof alljoyn-daemon >/dev/null && wifimngr &
 endef
 
 $(eval $(call BuildPackage,wifimngr))