Ticket#576: Implement rest of the operate commands

Description:
 - First draft of the changes

Test Done:
 - Below ubus call tested
   ubus call usp get '{"path":"Device.WiFi.SSID.[BSSID==\"00:22:07:6D:5E:DD\"].SSID"}'
   ubus call usp get '{"path":"Device.IP.Interface.*.IPv4Address.*.IPAddress"}'
   ubus call usp get '{"path":"Device.WiFi.AccessPoint.[SSIDReference+BSSID==\"00:22:07:6D:5E:DD\"].SSID"}'
   ubus call usp set '{"path":"Device.WiFi.AccessPoint.[SSIDReference+BSSID==\"00:22:07:6D:5E:D\"].SSID", "value":"Test-2G"}'

Not Covered:
 - Operate command
 - Alias based addressing
 - Searching with List of References

4g-support/Makefile

@@ -1,31 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=4g-support
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/4g-support
-  CATEGORY:=Network
-  TITLE:=4G Network Setup Tools
-endef
-
-define Package/4g-support/description
-	4g-support contains necessary tools to setup 4G WAN connection
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./files/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Compile
-endef
-
-define Package/4g-support/install
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,4g-support))

4g-support/files/etc/gcom/ncmconnection.gcom

@@ -1,62 +0,0 @@
-opengt
-set com 115200n81
-set comecho off
-set senddelay 0.05
-waitquiet 1 0.2
-
-:start
- if $env("USE_DISCONNECT")="1" goto disconnect
- send "AT^^NDISDUP=1,1,\""
- send $env("USE_APN")
-
- if $env("USE_AUTHTYPE")="-1" goto noauth
- else goto auth
-
-:noauth
- send "\"^m"
- goto result
-
-:auth
- send "\",\""
- send $env("USE_USERID")
- send "\",\""
- send $env("USE_PASSWORD")
- send "\","
- send $env("USE_AUTHTYPE")
- send "^m"
- goto result
-
-:result
- waitfor 5 "OK","ERR","ERROR"
- if % = 0 goto connok
- if % = 1 goto connerr
- if % = 2 goto connerr
-
-:connok
- print "WWAN connection established.\r\n"
- goto done
-
-:connerr
- print "WWAN error. Connection failed.\r\n"
- exit 1
-
-:disconnect
- send "AT^^NDISDUP=1,0,\""
- send $env("USE_APN")
- send "\"^m"
-
- waitfor 5 "OK","ERR","ERROR"
- if % = 0 goto disconnok
- if % = 1 goto disconnerr
- if % = 2 goto disconnerr
-
-:disconnok
- print "WWAN connection disconnected.\r\n"
- goto done
-
-:disconnerr
- print "WWAN disconnection error.\r\n"
- exit 1
-
-:done
- exit 0

4g-support/files/etc/hotplug.d/net/05-mobile

@@ -1,35 +0,0 @@
-. /lib/network/config.sh
-. /usr/share/libubox/jshn.sh
-
-iface_status() {
-	local iface=$1
-	local up
-	json_load "$(ifstatus $iface)"
-	json_get_var up up
-	json_close_object
-	return $up
-}
-
-case "$ACTION" in
-        add|register)
-                if [ "${INTERFACE:0:4}" == "wwan" ]; then
-                        netname=$(get_network_of "$INTERFACE")
-                        for net in $netname; do
-				local service=$(uci -q get network.$net.service)
-				local cnt=0
-				while $(iface_status $net); do
-		                        ifup $net
-					if [ "$service" == "qmi" ]; then
-						cnt=$(($cnt+1))
-						# quit trying if still not online after three times
-						[ $cnt -eq 3 ] && break
-						sleep 5
-					else
-						break
-					fi
-				done
-                        done
-                fi
-        ;;
-esac
-

4g-support/files/etc/hotplug.d/usb/30-usbnet

@@ -1,74 +0,0 @@
-#!/bin/sh
-
-local usb_dir uVid uPid uMa uPr uSe bConf bNumConfs vendor product mdmtyp netdev comdev cdcdev ttydev interface usbno usbbr
-
-sanitize() {
-	sed -e 's/[[:space:]]\+$//; s/[[:space:]]\+/_/g' "$@"
-}
-
-find_usb_attrs() {
-	usb_dir="/sys/$DEVPATH"
-	[ -f "$usb_dir/idVendor" ] || usb_dir="${usb_dir%/*}"
-
-	uVid=$(cat "$usb_dir/idVendor")
-	uPid=$(cat "$usb_dir/idProduct")
-	uMa=$(sanitize "$usb_dir/manufacturer")
-	uPr=$(sanitize "$usb_dir/product")
-	uSe=$(sanitize "$usb_dir/serial")
-	bNumConfs=$(cat "$usb_dir/bNumConfigurations")
-	bConf=$(cat "$usb_dir/bConfigurationValue")
-	netdev=$(find $usb_dir -name wwan* | awk -F'/' '{print$NF}' | head -2 | tail -1)
-	cdcdev=$(find $usb_dir -name cdc-wdm* | awk -F'/' '{print$NF}' | head -2 | tail -1)
-	ttydev=$(ls $(find $usb_dir -name tty | head -2 | tail -1) | tail -1)
-	interface=$(cat $usb_dir/interface)
-	if [ -n "$cdcdev" ]; then
-		comdev=$cdcdev
-		mdmtyp=$(grep $uVid:$uPid /etc/modemdb | grep 'qmi\|mbim' | awk '{print$2}' | head -1)
-		vendor=$(grep $uVid:$uPid /etc/modemdb | grep 'qmi\|mbim' | awk '{print$3}' | head -1)
-		product=$(grep $uVid:$uPid /etc/modemdb | grep 'qmi\|mbim' | awk '{print$4}' | head -1)
-	else
-		comdev=$ttydev
-		mdmtyp=$(grep $uVid:$uPid /etc/modemdb | grep 'ncm' | awk '{print$2}' | head -1)
-		vendor=$(grep $uVid:$uPid /etc/modemdb | grep 'ncm' | awk '{print$3}' | head -1)
-		product=$(grep $uVid:$uPid /etc/modemdb | grep 'ncm' | awk '{print$4}' | head -1)
-	fi
-	[ -n "$mdmtyp" ] || mdmtyp=$(grep $uVid:$uPid /etc/modemdb | awk '{print$2}' | head -1)
-	[ -n "$vendor" ] || vendor=$(grep $uVid:$uPid /etc/modemdb | awk '{print$3}' | head -1)
-	[ -n "$product" ] || product=$(grep $uVid:$uPid /etc/modemdb | awk '{print$4}' | head -1)
-}
-
-convert_to_mbim() {
-	if [ "$mdmtyp" == "mbim" ] && [ "$bNumConfs" == "2" ]; then
-		[ "$bConf" == "2" ] || echo 2 > $usb_dir/bConfigurationValue
-	fi
-}
-
-usbno=$(echo $DEVPATH | cut -d'/' -f5)
-usbbr=$(echo $DEVPATH | cut -d'/' -f7)
-case "$usbbr" in
-	*:*) usbbr=$(echo $DEVPATH | cut -d'/' -f6) ;;
-esac
-
-#devno=$(basename $DEVPATH)
-
-find_usb_attrs
-if [ "$ACTION" = add ]; then
-	convert_to_mbim "$uVid:$uPid"
-	if [ -n "$uVid" ] && [ -n "$uPid" ] && [ -n "$mdmtyp" ] && [ -n "$netdev" ] && [ -n "$comdev" ]; then
-		if [ -n "$usbno" ] && [ -n "$usbbr" ]; then
-			sed -i "/$usbno:$usbbr/ d" /var/usbnets
-			echo $usbno:$usbbr $uVid:$uPid $uMa $uPr $netdev $comdev $mdmtyp $vendor $product >> /var/usbnets
-			ubus send hotplug.usb "{'action': 'add', 'devpath': '$DEVPATH', 'manufacturer': '$uMa', 'product': '$uPr', 'serial': '$uSe', 'vendor_id': '$uVid', \
-			'product_id': '$uPid', 'driver_interface': '$interface', 'driver': '$DRIVER', 'devtype': '$DEVTYPE'}"
-
-		fi
-	fi
-fi
-
-if [ "$ACTION" = remove ]; then
-	if [ -n "$usbno" ] && [ -n "$usbbr" ]; then
-		sed -i "/$usbno:$usbbr/ d" /var/usbnets
-		ubus send hotplug.usb "{'action': 'remove', 'devpath': '$DEVPATH', 'manufacturer': '$uMa', 'product': '$uPr', 'serial': '$uSe', 'vendor_id': '$uVid', \
-		'product_id': '$uPid', 'driver_interface': '$interface', 'driver': '$DRIVER', 'devtype': '$DEVTYPE'}"
-	fi
-fi

4g-support/files/etc/modemdb

@@ -1,100 +0,0 @@
-1bbb:011e	qmi
-1a8d:1001	ecm
-1a8d:100c	ecm
-1a8d:100d	ecm
-16d8:6280	qmi
-16d8:6803	qmi
-16d8:6804	qmi
-16d8:7003	qmi
-16d8:700a	qmi
-2001:7d01	mbim
-2001:7d02	mbim
-2001:7d03	mbim
-12d1:14ac	qmi
-12d1:140c	qmi
-12d1:1506	qmi	Huawei		E367/392/398
-12d1:1506	ncm	Huawei		E3276
-12d1:14d2	qmi
-12d1:1c07	ncm
-12d1:1436	ecm
-12d1:14c9	qmi
-12d1:14db	ecm
-12d1:151d	mbim
-12d1:151e	qmi	Huawei		E353
-12d1:1c1e	ncm
-12d1:150c	qmi
-12d1:150f	qmi
-12d1:151b	qmi
-12d1:142d	ecm
-12d1:1432	ecm
-12d1:1c1f	ncm
-12d1:1433	qmi
-12d1:1465	ecm
-12d1:14ca	qmi
-12d1:14cf	ncm
-12d1:14bc	ecm
-12d1:14ae	ecm
-12d1:1576	mbim
-12d1:1577	mbim
-12d1:1400	mbim
-12d1:14f7	mbim
-12d1:1464	qmi
-12d1:14cb	qmi
-12d1:14cc	qmi
-12d1:14c6	qmi
-12d1:14fa	mbim
-12d1:1578	mbim
-12d1:14c8	qmi
-12d1:14f8	mbim
-12d1:1575	mbim
-12d1:1579	mbim
-12d1:157a	mbim
-12d1:157b	mbim
-12d1:157f	mbim
-12d1:1f16	mbim	Vodafone	K5150
-12d1:1404	qmi
-19f2:1700	ecm	
-1410:b001	qmi
-1527:1000	ecm
-0b3c:c005	qmi
-0f3d:68a2	qmi
-1199:68a2	qmi	SierraWireless	M7710
-1199:68c0	qmi	SierraWireless	M7304
-1349:1100	qmi
-1349:1200	qmi	
-1199:683c	qmi
-2360:2100	qmi
-2360:2200	qmi
-2360:2300	qmi
-2507:0000	qmi	
-19d2:0055	qmi
-19d2:0052	qmi
-19d2:0063	qmi
-19d2:1008	qmi
-19d2:1010	qmi
-19d2:2002	qmi
-19d2:1176	qmi
-19d2:1023	mbim
-19d2:0104	qmi
-19d2:1018	qmi
-19d2:1032	mbim
-19d2:1402	qmi
-19d2:1405	ecm
-19d2:1426	qmi
-19d2:0031	qmi
-19d2:0124	qmi
-19d2:1254	qmi
-19d2:0017	qmi
-19d2:0002	qmi
-19d2:0121	qmi
-19d2:1252	qmi
-19d2:0157	qmi
-19d2:0167	qmi
-19d2:0199	qmi
-19d2:0257	qmi
-19d2:0326	qmi
-19d2:0349	ecm
-19d2:1408	ecm
-19d2:0284	qmi
-19d2:0019	qmi
-19d2:0265	qmi

4g-support/files/lib/netifd/proto/4g.sh

@@ -1,159 +0,0 @@
-#!/bin/sh
-INCLUDE_ONLY=1
-
-. /lib/functions.sh
-. ../netifd-proto.sh
-init_proto "$@"
-
-proto_4g_init_config() {
-	proto_config_add_string "modem"
-	proto_config_add_string "service"
-	proto_config_add_string "comdev"
-	proto_config_add_string "ipaddr"
-	proto_config_add_string "netmask"
-	proto_config_add_string "hostname"
-	proto_config_add_string "clientid"
-	proto_config_add_string "vendorid"
-	proto_config_add_boolean "broadcast"
-	proto_config_add_string "reqopts"
-	proto_config_add_string "apn"
-	proto_config_add_string "username"
-	proto_config_add_string "password"
-	proto_config_add_boolean "lte_apn_use"
-	proto_config_add_string "lte_apn"
-	proto_config_add_string "lte_username"
-	proto_config_add_string "lte_password"
-	proto_config_add_string "pincode"
-	proto_config_add_string "technology"
-	proto_config_add_string "auto"
-}
-
-proto_4g_setup() {
-	local config="$1"
-	local iface="$2"
-
-        local ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone
-        json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone
-
-        local opt dhcpopts
-        for opt in $reqopts; do
-                append dhcpopts "-O $opt"
-        done
-
-        for opt in $sendopts; do
-                append dhcpopts "-x $opt"
-        done
-
-        [ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
-        [ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
-        [ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"
-        [ "$iface6rd" != 0 -a -f /lib/netifd/proto/6rd.sh ] && append dhcpopts "-O 212"
-        [ -n "$zone6rd" ] && proto_export "ZONE6RD=$zone6rd"
-        [ -n "$zone" ] && proto_export "ZONE=$zone"
-        [ "$delegate" = "0" ] && proto_export "IFACE6RD_DELEGATE=0"
-
-        json_get_var comdev comdev
-        json_get_var apn apn
-        json_get_var service service
-        json_get_var pincode pincode
-
-
-#	if [ -n "$modem" ]; then
-#		service=$(echo $modem | cut -d':' -f1)
-#		comdev=$(echo $modem | cut -d':' -f2)
-#		iface=$(echo $modem | cut -d':' -f3)
-#	fi
-	
-	case "$service" in
-		ecm)
-		;;
-		eem)
-		;;
-		mbim)
-			local mbimdev=/dev/$(basename $(ls /sys/class/net/${iface}/device/usb/cdc-wdm* -d))
-			local comdev="${comdev:-$mbimdev}"
-			[ -n "$pincode" ] && {
-				if ! mbimcli -d $comdev --query-pin-state 2>&1 | grep -q "unlocked"; then
-					set -o pipefail
-					if ! mbimcli -d $comdev --enter-pin="${pincode}" 2>&1; then
-						mbimcli -d $comdev --query-pin-state
-						proto_notify_error "$config" PIN_FAILED
-						proto_block_restart "$interface"
-						return 1
-					fi
-				fi
-			}
-			APN="$apn" mbim-network $comdev start
-		;;
-		ncm)
-			[ -n "$pincode" ] && echo $pincode | gcom -d $comdev
-			USE_APN="$apn" gcom -d $comdev -s /etc/gcom/ncmconnection.gcom
-		;;
-		qmi)
-			local qmidev=/dev/$(basename $(ls /sys/class/net/${iface}/device/usb/cdc-wdm* -d))
-			local comdev="${comdev:-$qmidev}"
-			[ -n "$pincode" ] && {
-				if ! qmicli -d $comdev --dms-uim-get-pin-status 2>&1 | grep -q "enabled-verified\|disabled" >/dev/null; then
-					set -o pipefail
-					if ! qmicli -d $comdev --dms-uim-verify-pin="PIN,${pincode}" 2>&1; then
-						qmicli -d $comdev --dms-uim-get-pin-status
-						proto_notify_error "$config" PIN_FAILED
-						proto_block_restart "$interface"
-						return 1
-					fi
-				fi
-			}
-			APN="$apn" qmi-network $comdev start
-		;;		
-	esac
-	
-	proto_export "INTERFACE=$config"
-	proto_run_command "$config" udhcpc -R \
-		-p /var/run/udhcpc-$iface.pid \
-		-s /lib/netifd/dhcp.script \
-		-f -t 0 -i "$iface" \
-		${ipaddr:+-r $ipaddr} \
-		${hostname:+-H $hostname} \
-		${vendorid:+-V $vendorid} \
-		$clientid $broadcast $dhcpopts
-}
-
-proto_4g_teardown() {
-	local interface="$1"
-	local iface="$2"
-	local modem service comdev
-
-        config_load network
-        config_get service $interface service
-        config_get comdev $interface comdev
-
-#	config_get modem $interface modem
-#	if [ -n "$modem" ]; then
-#		service=$(echo $modem | cut -d':' -f1)
-#		comdev=$(echo $modem | cut -d':' -f2)
-#		iface=$(echo $modem | cut -d':' -f3)
-#	fi
-	
-	case "$service" in
-		ecm)
-		;;
-		eem)
-		;;
-		mbim)
-			local mbimdev=/dev/$(basename $(ls /sys/class/net/${iface}/device/usb/cdc-wdm* -d))
-			local comdev="${comdev:-$mbimdev}"
-			mbim-network $comdev stop
-		;;
-		ncm)
-			USE_DISCONNECT=1 gcom -d $comdev -s /etc/gcom/ncmconnection.gcom
-		;;
-		qmi)
-			local qmidev=/dev/$(basename $(ls /sys/class/net/${iface}/device/usb/cdc-wdm* -d))
-			local comdev="${comdev:-$qmidev}"
-			qmi-network $comdev stop
-		;;		
-	esac
-	proto_kill_command "$interface"
-}
-
-add_protocol 4g

asterisk-1.8.x-mod/Makefile

@@ -1,773 +0,0 @@
-#
-# Copyright (C) 2008-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=asterisk18-mod
-PKG_VERSION:=1.8.10.1
-
-PKG_SOURCE_VERSION:=ee99af0d91a2197529b13075d802ebc37e644e40
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/asterisk-1.8.x
-
-PKG_RELEASE:=$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)-$(PKG_RELEASE).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
--include $(INCLUDE_DIR)/ltqtapi.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/asterisk18-mod/Default
-  SUBMENU:=Telephony
-  SECTION:=net
-  CATEGORY:=Network
-  URL:=http://www.asterisk.org/
-endef
-
-define Package/asterisk18-mod/Default/description
- Asterisk is a complete PBX in software. It provides all of the features
- you would expect from a PBX and more. Asterisk does voice over IP in three
- protocols, and can interoperate with almost all standards-based telephony
- equipment using relatively inexpensive hardware.
-endef
-
-
-define Package/asterisk18-mod
-$(call Package/asterisk18-mod/Default)
-  TITLE:=Complete open source PBX, v1.8x
-  MENU:=1
-  DEPENDS:= +natalie-dect-h +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen +libopenssl +libncurses +libpopt +libpthread +uci +ubus +zlib @!TARGET_avr32
-endef
-
-define Package/asterisk18-mod/description
-$(call Package/asterisk18-mod/Default/description)
-endef
-
-define Package/asterisk18-mod-sounds
-$(call Package/asterisk18-mod/Default)
-  TITLE:=Sound files
-  DEPENDS:= asterisk18-mod
-endef
-
-define Package/asterisk18-mod-sounds/description
-$(call Package/asterisk18-mod/Default/description)
- This package contains sound files for Asterisk.
-endef
-
-define Package/asterisk18-mod-voicemail
-$(call Package/asterisk18-mod/Default)
-  TITLE:=Voicemail support
-  DEPENDS:= asterisk18-mod
-endef
-
-define Package/asterisk18-mod-voicemail/description
-$(call Package/asterisk18-mod/Default/description)
- This package contains voicemail related modules for Asterisk.
-endef
-
-define Package/asterisk18-mod-app-transfer
-$(call Package/asterisk18-mod/Default)
-  TITLE:=Call transfer support
-  DEPENDS:= asterisk18-mod
-endef
-
-define Package/asterisk18-mod-app-transfer/description
-$(call Package/asterisk18-mod/Default/description)
- This package contains the call transfer support module for Asterisk.
-endef
-
-define Package/asterisk18-mod-app-softhangup
-$(call Package/asterisk18-mod/Default)
-  TITLE:=SoftHangup application
-  DEPENDS:= asterisk18-mod
-endef
-
-define Package/asterisk18-mod-app-softhangup/description
-$(call Package/asterisk18-mod/Default/description)
- This package contains the SoftHangup support module for Asterisk.
-endef
-
-define Package/asterisk18-mod-app-meetme
-$(call Package/asterisk18-mod/Default)
-  TITLE:=conferencing support
-  DEPENDS:= asterisk18-mod +dahdi-tools-libtonezone +dahdi
-endef
-
-define Package/asterisk18-mod-app-meetme/description
-$(call Package/asterisk18-mod/Default/description)
- This package provides the MeetMe application driver Conferencing support to
- Asterisk.
-endef
-
-define Package/asterisk18-mod-chan-iax2
-$(call Package/asterisk18-mod/Default)
-  TITLE:=IAX support
-  DEPENDS:= asterisk18-mod +asterisk18-res-crypto
-endef
-
-define Package/asterisk18-mod-chan-iax2/description
-$(call Package/asterisk18-mod/Default/description)
- This package provides IAX support to
- Asterisk.
-endef
-
-define Package/asterisk18-mod-cdr
-$(call Package/asterisk18-mod/Default)
-  TITLE:=CDR support
-  DEPENDS:= asterisk18-mod +libsqlite3
-endef
-
-define Package/asterisk18-mod-cdr/description
-$(call Package/asterisk18-mod/Default/description)
- This package provides Call Detail Record support to
- Asterisk.
-endef
-
-define Package/asterisk18-mod-res-musiconhold
-$(call Package/asterisk18-mod/Default)
-  TITLE:=MOH support
-  DEPENDS:= asterisk18-mod
-endef
-
-define Package/asterisk18-mod-res-musiconhold/description
-$(call Package/asterisk18-mod/Default/description)
- This package provides Music On Hold support to
- Asterisk.
-endef
-
-define Package/asterisk18-mod-res-voice
-$(call Package/asterisk18-mod/Default)
-  TITLE:=Voice client/pbx support
-  DEPENDS:= asterisk18-mod
-endef
-
-define Package/asterisk18-mod-res-voice/description
-$(call Package/asterisk18-mod/Default/description)
- This package provides Voice Client/pbx support to
- Asterisk.
-endef
-
-define Package/asterisk18-mod-res-srtp
-$(call Package/asterisk18-mod/Default)
-  TITLE:=SRTP support
-  DEPENDS:= asterisk18-mod libsrtp +asterisk18-mod-res-crypto
-endef
-
-define Package/asterisk18-mod-res-srtp/description
-$(call Package/asterisk18-mod/Default/description)
- This package provides SRTP support to
- Asterisk.
-endef
-
-define Package/asterisk18-mod-res-stun
-$(call Package/asterisk18-mod/Default)
-  TITLE:=STUN support
-  DEPENDS:= asterisk18-mod
-endef
-
-define Package/asterisk18-mod-app-queue
-$(call Package/asterisk18-mod/Default)
-  TITLE:=Queue support
-  DEPENDS:= asterisk18-mod
-endef
-
-define Package/asterisk18-mod-chan-gtalk
-$(call Package/asterisk18-mod/Default)
-  TITLE:=GTalk support
-  DEPENDS:= asterisk18-mod +libiksemel
-endef
-
-define Package/asterisk18-mod-chan-gtalk/description
-$(call Package/asterisk18-mod/Default/description)
- This package provides the channel chan_gtalk and res_jabber for GTalk
- support to Asterisk.
-endef
-
-define Package/asterisk18-mod-res-timing-timerfd
-$(call Package/asterisk18-mod/Default)
-  TITLE:= Timerfd Timing Interface
-  DEPENDS:= asterisk18-mod
-endef
-
-define Package/asterisk18-mod-res-timing-pthread
-$(call Package/asterisk18-mod/Default)
-  TITLE:= pthread Timing Interface
-  DEPENDS:= asterisk18-mod
-endef
-
-define Package/asterisk18-mod-res-fax
-$(call Package/asterisk18-mod/Default)
-  TITLE:=Generic FAX Resource for FAX technology resource modules
-  DEPENDS:= asterisk18-mod +asterisk18-mod-res-timing-pthread
-endef
-
-define Package/asterisk18-mod-res-fax-spandsp
-$(call Package/asterisk18-mod/Default)
-  TITLE:=Spandsp T.38 and G.711 FAX Resource
-  DEPENDS:= asterisk18-mod +asterisk18-mod-res-fax +libspandsp
-endef
-
-define Package/asterisk18-mod-chan-mgcp
-$(call Package/asterisk18-mod/Default)
-  TITLE:=MGCP channel support
-  DEPENDS:= asterisk18-mod
-endef
-
-define Package/asterisk18-mod-chan-mgcp/description
-$(call Package/asterisk18-mod/Default/description)
- This package provides the channel chan_mgcp support to Asterisk.
-endef
-
-define Package/asterisk18-mod-chan-skinny
-$(call Package/asterisk18-mod/Default)
-  TITLE:=Skinny channel support
-  DEPENDS:= asterisk18-mod
-endef
-
-define Package/asterisk18-mod-chan-skinny/description
-$(call Package/asterisk18-mod/Default/description)
- This package provides the channel chan_skinny support to Asterisk.
-endef
-
-define Package/asterisk18-mod-chan-brcm
-$(call Package/asterisk18-mod/Default)
-  TITLE:=Broadcom channel support
-  DEPENDS:= asterisk18-mod
-endef
-
-define Package/asterisk18-mod-chan-brcm/description
-$(call Package/asterisk18-mod/Default/description)
- This package provides the channel chan_brcm support to Asterisk.
-endef
-
-define Package/asterisk18-mod-curl
-$(call Package/asterisk18-mod/Default)
-  TITLE:=CURL support
-  DEPENDS:= asterisk18-mod +libcurl
-endef
-
-define Package/asterisk18-mod-curl/description
-$(call Package/asterisk18-mod/Default/description)
- This package provides CURL
- support to Asterisk.
-endef
-
-define Package/asterisk18-mod-mysql
-$(call Package/asterisk18-mod/Default)
-  TITLE:=MySQL support
-  DEPENDS:= asterisk18-mod +PACKAGE_asterisk18-mysql:libmysqlclient
-endef
-
-define Package/asterisk18-mod-mysql/description
-$(call Package/asterisk18-mod/Default/description)
- This package provides MySQL
- support to Asterisk.
-endef
-
-define Package/asterisk18-mod-chan-lantiq
-$(call Package/asterisk18-mod/Default)
-  TITLE:=Lantiq TAPI support
-  DEPENDS:= asterisk18-mod $(LTQ_TAPI_DEPENDS)
-  URL:=http://git.nanl.de/?p=asterisk_channel_lantiq.git
-  MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
-endef
-
-define Package/asterisk18-mod-chan-lantiq/description
-$(call Package/asterisk18-mod/Default/description)
- This package provides the channel chan_lantiq support to Asterisk.
-endef
-
-CONFIGURE_ARGS+= \
-	--without-inotify
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mod-app-meetme),)
-  CONFIGURE_ARGS+= \
-	--with-dahdi="$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= \
-	--without-dahdi
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mod-chan-gtalk),)
-  CONFIGURE_ARGS+= \
-	--with-gnutls="$(STAGING_DIR)/usr" \
-	--with-iksemel="$(STAGING_DIR)/usr"
-  SITE_VARS+= \
-	ac_cv_lib_iksemel_iks_start_sasl=yes \
-	ac_cv_lib_gnutls_gnutls_bye=yes
-else
-  CONFIGURE_ARGS+= \
-	--without-gnutls \
-	--without-iksemel
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mod-curl),)
-  CONFIGURE_ARGS+= \
-	--with-curl="$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= \
-	--without-curl
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mod-mysql),)
-  CONFIGURE_ARGS+= \
-	--with-mysqlclient="$(STAGING_DIR)/usr/bin"
-else
-  CONFIGURE_ARGS+= \
-	--without-mysqlclient
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mod-res-fax-spandsp),)
-  CONFIGURE_ARGS+= \
-    --with-spandsp="$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= \
-    --without-spandsp
-endif
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mod-res-srtp),)
-  CONFIGURE_ARGS+= \
-	--with-srtp="$(STAGING_DIR)/usr"
-else
-  CONFIGURE_ARGS+= \
-	--without-srtp
-endif
-
-ifeq ($(CONFIG_TARGET_IBOARDID),"D301")
-  EXTRA_CFLAGS += -DNTR_SUPPORT
-endif
-
-CONFIGURE_ARGS+= \
-	--without-curses \
-	--with-gsm=internal \
-	--without-cap \
-	--without-gtk \
-	--without-gtk2 \
-	--without-isdnnet \
-	--without-kde \
-	--without-misdn \
-	--without-nbs \
-	--with-ncurses="$(STAGING_DIR)/usr" \
-	--without-netsnmp \
-	--without-newt \
-	--without-odbc \
-	--without-ogg \
-	--without-osptk \
-	--with-popt="$(STAGING_DIR)/usr" \
-	--without-pri \
-	--without-qt \
-	--without-radius \
-	--without-sdl \
-	--without-suppserv \
-	--without-tds \
-	--without-termcap \
-	--without-tinfo \
-	--without-vorbis \
-	--without-vpb \
-	--with-z="$(STAGING_DIR)/usr" \
-	--with-sounds-cache="$(DL_DIR)" \
-	--disable-xmldoc
-
-# I've had strange errors with -fno-caller-saves
-# in global CFLAGS so revert it. /Ronny
-EXTRA_CFLAGS+= -O2 -fcaller-saves
-EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
-EXTRA_LDFLAGS+= $(TARGET_LDFLAGS)
-
-
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-ifneq ($(CONFIG_TARGET_lantiq),)
-	$(CP) ./src-lantiq/* $(PKG_BUILD_DIR)/
-endif
-endef
-
-define Build/Configure
-	-rm $(PKG_BUILD_DIR)/menuselect.makeopts
-	$(call Build/Configure/Default,,$(SITE_VARS))
-endef
-
-define Build/Compile
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		include/asterisk/version.h \
-		include/asterisk/buildopts.h defaults.h \
-		makeopts.embed_rules
-	ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY" \
-	ASTLDFLAGS="$(EXTRA_LDFLAGS)" \
-	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		ASTVARLIBDIR="/usr/lib/asterisk" \
-		ASTDATADIR="/usr/lib/asterisk" \
-		ASTKEYDIR="/usr/lib/asterisk" \
-		ASTDBDIR="/usr/lib/asterisk" \
-		NOISY_BUILD="1" \
-		DEBUG="" \
-		OPTIMIZE="" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install samples
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/asterisk-1.8/include/asterisk/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(1)/usr/include/asterisk-1.8/include/asterisk/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/asterisk-1.8/include/
-endef
-
-define Package/asterisk18-mod/conffiles
-/etc/asterisk/asterisk.conf
-/etc/asterisk/modules.conf
-/etc/asterisk/extensions.conf
-/etc/asterisk/sip.conf
-/etc/asterisk/sip_notify.conf
-/etc/asterisk/features.conf
-/etc/asterisk/indications.conf
-/etc/asterisk/logger.conf
-/etc/asterisk/manager.conf
-/etc/asterisk/rtp.conf
-/etc/default/asterisk
-/etc/init.d/asterisk
-endef
-
-define Package/asterisk18-mod/install
-	$(INSTALL_DIR) $(1)/etc/asterisk/ssl
-	for f in asterisk extensions features \
-		indications logger manager modules \
-		sip sip_notify rtp; do \
-		$(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$$$$f.conf $(1)/etc/asterisk/ ; \
-	done
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	for f in app_dial app_echo app_playback app_macro \
-		chan_sip res_rtp_asterisk res_rtp_multicast \
-		codec_ulaw codec_gsm \
-		format_gsm format_pcm format_wav format_wav_gsm \
-		pbx_config \
-		func_strings func_timeout func_callerid func_logic; do \
-		$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$$$$f.so $(1)/usr/lib/asterisk/modules/ ; \
-	done
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/default
-	$(INSTALL_DATA)  ./files/asterisk.default $(1)/etc/default/asterisk
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN)  ./files/asterisk.init $(1)/etc/init.d/asterisk
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(INSTALL_BIN)  ./files/asterisk.hotplug $(1)/etc/hotplug.d/iface/80-asterisk
-endef
-
-define Package/asterisk18-mod-sounds/install
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/* $(1)/usr/lib/asterisk/sounds/
-	rm -f $(1)/usr/lib/asterisk/sounds/vm-*
-	rm -f $(1)/usr/lib/asterisk/sounds/conf-*
-endef
-
-
-define Package/asterisk18-mod-voicemail/conffiles
-/etc/asterisk/voicemail.conf
-endef
-
-define Package/asterisk18-mod-voicemail/install
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/voicemail.conf $(1)/etc/asterisk/
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*voicemail.so $(1)/usr/lib/asterisk/modules/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_adsi.so $(1)/usr/lib/asterisk/modules/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_smdi.so $(1)/usr/lib/asterisk/modules/
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/vm-*.gsm $(1)/usr/lib/asterisk/sounds/
-endef
-
-define Package/asterisk18-mod-app-meetme/conffiles
-/etc/asterisk/meetme.conf
-endef
-
-define Package/asterisk18-mod-app-meetme/install
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/meetme.conf $(1)/etc/asterisk/
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_meetme.so $(1)/usr/lib/asterisk/modules/
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/conf-*.gsm $(1)/usr/lib/asterisk/sounds/
-endef
-
-define Package/asterisk18-mod-chan-iax2/conffiles
-/etc/asterisk/iax.conf
-/etc/asterisk/iaxprov.conf
-endef
-
-define Package/asterisk18-mod-cdr/conffiles
-/etc/asterisk/cdr.conf
-/etc/asterisk/cdr_custom.conf
-/etc/asterisk/cdr_manager.conf
-/etc/asterisk/cdr_odbc.conf
-/etc/asterisk/cdr_pgsql.conf
-/etc/asterisk/cdr_tds.conf
-endef
-
-define Package/asterisk18-mod-res-musiconhold/conffiles
-/etc/asterisk/musiconhold.conf
-endef
-
-define Package/asterisk18-mod-chan-iax2/install
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/iax.conf $(1)/etc/asterisk/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/iaxprov.conf $(1)/etc/asterisk/
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_iax2.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-cdr/install
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/cdr*.conf $(1)/etc/asterisk/
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*cdr*.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-res-musiconhold/install
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/musiconhold.conf $(1)/etc/asterisk/
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_musiconhold.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-res-voice/install
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_voice.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-chan-gtalk/conffiles
-/etc/asterisk/gtalk.conf
-/etc/asterisk/jabber.conf
-endef
-
-define Package/asterisk18-mod-chan-gtalk/install
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/gtalk.conf $(1)/etc/asterisk/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/jabber.conf $(1)/etc/asterisk/
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_gtalk.so $(1)/usr/lib/asterisk/modules/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_jabber.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-res-timing-timerfd/install
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_timing_timerfd.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-res-timing-pthread/install
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_timing_pthread.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-res-fax/conffiles
-/etc/asterisk/res_fax.conf
-endef
-
-define Package/asterisk18-mod-res-fax/install
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/res_fax.conf $(1)/etc/asterisk/
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_fax.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-res-fax-spandsp/install
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_fax_spandsp.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-chan-mgcp/conffiles
-/etc/asterisk/mgcp.conf
-endef
-
-define Package/asterisk18-mod-chan-mgcp/install
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/mgcp.conf $(1)/etc/asterisk/
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_mgcp.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-chan-skinny/conffiles
-/etc/asterisk/skinny.conf
-endef
-
-define Package/asterisk18-mod-chan-skinny/install
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/skinny.conf $(1)/etc/asterisk/
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_skinny.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-chan-brcm/conffiles
-/etc/asterisk/brcm.conf
-endef
-
-define Package/asterisk18-mod-chan-brcm/install
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/brcm.conf $(1)/etc/asterisk/
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_brcm.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-curl/install
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/func_curl.so $(1)/usr/lib/asterisk/modules/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_curl.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-app-transfer/install
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_transfer.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-app-softhangup/install
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_softhangup.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-mysql/conffiles
-/etc/asterisk/app_mysql.conf
-/etc/asterisk/res_config_mysql.conf
-/etc/asterisk/cdr_mysql.conf
-endef
-
-define Package/asterisk18-mod-mysql/install
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/app_mysql.conf $(1)/etc/asterisk/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/res_config_mysql.conf $(1)/etc/asterisk/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/cdr_mysql.conf $(1)/etc/asterisk/
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_mysql.so $(1)/usr/lib/asterisk/modules/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/cdr_mysql.so $(1)/usr/lib/asterisk/modules/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_config_mysql.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-chan-lantiq/conffiles
-/etc/asterisk/lantiq.conf
-endef
-
-define Package/asterisk18-mod-chan-lantiq/install
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/lantiq.conf $(1)/etc/asterisk/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_lantiq.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-res-srtp/install
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_srtp.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-res-stun/install
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_stun_monitor.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Package/asterisk18-mod-app-queue/install
-	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_queue.so $(1)/usr/lib/asterisk/modules/
-endef
-
-define Buildasterisk18-modModuleTemplate
-
-  define Package/asterisk18-mod-$(subst _,-,$(1))
-  $$(call Package/asterisk18-mod/Default)
-    TITLE:=$(2) support
-    DEPENDS:= asterisk18-mod $(4)
-  endef
-
-  define Package/asterisk18-mod-$(subst _,-,$(1))/description
-  $$(call Package/asterisk18-mod/Default/description)
-    This package provides support $(3) in Asterisk.
-  endef
-
-  define Package/asterisk18-mod-$(subst _,-,$(1))/install
-	$(INSTALL_DIR) $$(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$(1).so $$(1)/usr/lib/asterisk/modules/
-  endef
-
-  $$(eval $$(call BuildPackage,asterisk18-mod-$(subst _,-,$(1))))
-endef
-
-$(eval $(call BuildPackage,asterisk18-mod))
-$(eval $(call BuildPackage,asterisk18-mod-voicemail))
-$(eval $(call BuildPackage,asterisk18-mod-sounds))
-$(eval $(call BuildPackage,asterisk18-mod-app-meetme))
-$(eval $(call BuildPackage,asterisk18-mod-app-transfer))
-$(eval $(call BuildPackage,asterisk18-mod-app-softhangup))
-$(eval $(call BuildPackage,asterisk18-mod-chan-iax2))
-$(eval $(call BuildPackage,asterisk18-mod-cdr))
-$(eval $(call BuildPackage,asterisk18-mod-res-musiconhold))
-$(eval $(call BuildPackage,asterisk18-mod-res-voice))
-$(eval $(call BuildPackage,asterisk18-mod-chan-gtalk))
-$(eval $(call BuildPackage,asterisk18-mod-res-fax))
-$(eval $(call BuildPackage,asterisk18-mod-res-fax-spandsp))
-$(eval $(call BuildPackage,asterisk18-mod-res-timing-timerfd))
-$(eval $(call BuildPackage,asterisk18-mod-res-timing-pthread))
-$(eval $(call BuildPackage,asterisk18-mod-chan-mgcp))
-$(eval $(call BuildPackage,asterisk18-mod-chan-skinny))
-$(eval $(call BuildPackage,asterisk18-mod-chan-brcm))
-$(eval $(call BuildPackage,asterisk18-mod-curl))
-$(eval $(call BuildPackage,asterisk18-mod-mysql))
-$(eval $(call BuildPackage,asterisk18-mod-chan-lantiq))
-$(eval $(call BuildPackage,asterisk18-mod-res-srtp))
-$(eval $(call BuildPackage,asterisk18-mod-res-stun))
-$(eval $(call BuildPackage,asterisk18-mod-app-queue))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_authenticate,Authenticate,support for executing arbitrary authenticate commands))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_chanisavail,Channel availability check,support for checking if a channel is available))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_chanspy,Channel listen in,support for listening in on any channel))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_directed_pickup,Directed call pickup,support for directed call pickup))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_exec,Exec application,support for application execution))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_minivm,Minimal voicemail system,a voicemail system in small building blocks working together based on the Comedian Mail voicemail system))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_readexten,Extension to variable,a trivial application to read an extension into a variable))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_read,Variable read,a trivial application to read a variable))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_sayunixtime,Say Unix time,an application to say Unix time))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_sms,SMS,SMS support (ETSI ES 201 912 protocol 1)))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_stack,Stack applications, stack applications Gosub Return etc., +asterisk18-res-agi))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_system,System exec,support for executing system commands))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_talkdetect,File playback with audio detect,for file playback with audio detect))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_waituntil,Sleep,support sleeping until the given epoch))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_while,While loop,a while loop implementation))
-$(eval $(call Buildasterisk18-modModuleTemplate,chan_agent,Agents proxy channel, an implementation of agents proxy channel))
-$(eval $(call Buildasterisk18-modModuleTemplate,chan_local,Local proxy channel, an implementation of local proxy channel))
-$(eval $(call Buildasterisk18-modModuleTemplate,codec_alaw,Signed linear to alaw translation,translation between signed linear and alaw codecs))
-$(eval $(call Buildasterisk18-modModuleTemplate,codec_ulaw,Signed linear to ulaw translation,translation between signed linear and ulaw codecs))
-$(eval $(call Buildasterisk18-modModuleTemplate,codec_a_mu,Alaw to ulaw translation,translation between alaw and ulaw codecs))
-$(eval $(call Buildasterisk18-modModuleTemplate,codec_g722,G.722,a high bit rate 48/56/64Kbps ITU standard codec))
-$(eval $(call Buildasterisk18-modModuleTemplate,codec_g726,Signed linear to G.726 translation,translation between signed linear and ITU G.726-32kbps codecs))
-$(eval $(call Buildasterisk18-modModuleTemplate,codec_ilbc,iLBC,internet Low Bitrate Codec))
-$(eval $(call Buildasterisk18-modModuleTemplate,codec_gsm,GSM,GSM codec))
-$(eval $(call Buildasterisk18-modModuleTemplate,format_g726,G.726,support for headerless G.726 16/24/32/40kbps data format))
-$(eval $(call Buildasterisk18-modModuleTemplate,format_g729,G.729,support for raw headerless G729 data))
-$(eval $(call Buildasterisk18-modModuleTemplate,format_sln,Raw slinear format,support for raw slinear format))
-$(eval $(call Buildasterisk18-modModuleTemplate,format_sln16,Raw slinear 16 format,support for Raw slinear 16 format))
-$(eval $(call Buildasterisk18-modModuleTemplate,func_db,Database interaction,functions for interaction with the database))
-$(eval $(call Buildasterisk18-modModuleTemplate,func_devstate,Blinky lights control,functions for manually controlled blinky lights))
-$(eval $(call Buildasterisk18-modModuleTemplate,func_vmcount,vmcount dialplan,a vmcount dialplan function))
-$(eval $(call Buildasterisk18-modModuleTemplate,func_extstate,Hinted extension state,retrieving the state of a hinted extension for dialplan control))
-$(eval $(call Buildasterisk18-modModuleTemplate,func_global,Global variable,global variable dialplan functions))
-$(eval $(call Buildasterisk18-modModuleTemplate,func_shell,Shell,support for shell execution))
-$(eval $(call Buildasterisk18-modModuleTemplate,pbx_ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic))
-$(eval $(call Buildasterisk18-modModuleTemplate,res_ael_share,Shareable AEL code,support for shareable AEL code mainly between internal and external modules))
-$(eval $(call Buildasterisk18-modModuleTemplate,pbx_spool,Call Spool,outgoing call spool support))
-$(eval $(call Buildasterisk18-modModuleTemplate,res_agi,Asterisk Gateway Interface,support for the Asterisk Gateway Interface extension))
-$(eval $(call Buildasterisk18-modModuleTemplate,res_crypto,Provide Crypto,Cryptographic Signature capability))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_alarmreceiver,Alarm receiver,Central Station Alarm receiver for Ademco Contact ID))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_setcallerid,Set callerid,support for setting callerid))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_verbose,Verbose logging,Verbose logging application))
-$(eval $(call Buildasterisk18-modModuleTemplate,func_channel,Channel info,Channel info dialplan function))
-$(eval $(call Buildasterisk18-modModuleTemplate,func_blacklist,Blacklist on callerid,looking up the callerid number and see if it is blacklisted))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_originate,Originate a call,originating an outbound call and connecting it to a specified extension or application))
-$(eval $(call Buildasterisk18-modModuleTemplate,func_uri,URI encoding and decoding,Encodes and decodes URI-safe strings))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_disa,Direct Inward System Access,Direct Inward System Access))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_senddtmf,Send DTMF digits,Sends arbitrary DTMF digits))
-$(eval $(call Buildasterisk18-modModuleTemplate,func_cut,CUT function,CUT function))
-$(eval $(call Buildasterisk18-modModuleTemplate,res_clioriginate,Calls via CLI,Originate calls via the CLI))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_mixmonitor,Record a call and mix the audio,record a call and mix the audio during the recording))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_playtones,Playtones application,play a tone list))
-$(eval $(call Buildasterisk18-modModuleTemplate,app_record,Record sound file,to record a sound file))

asterisk-1.8.x-mod/files/asterisk.default

@@ -1,4 +0,0 @@
-## startup options for /etc/init.d/asterisk
-
-ENABLE_ASTERISK="yes"
-OPTIONS=""

asterisk-1.8.x-mod/files/asterisk.hotplug

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-[ "$ACTION" = ifup ] || exit 0
-
-config_load voice_client
-config_get bindintf SIP bindintf
-
-[ "$INTERFACE" == "$bindintf" ] || exit 0
-
-. /lib/functions/network.sh
-
-if [ -n "$bindintf" ]; then
-	network_get_ipaddr bindaddr "$bindintf"
-	[ -z "$bindaddr" ] && network_get_ipaddr6 bindaddr "$bindintf"
-	bindaddr="${bindaddr:-0.0.0.0}"
-	sed -i "s/bindaddr=.*/bindaddr=$bindaddr/g" /etc/asterisk/sip.conf
-	[ -e /var/run/asterisk/asterisk.ctl ] && /etc/init.d/asterisk reload
-fi
-

asterisk-1.8.x-mod/files/asterisk.init

@@ -1,56 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=98
-STOP=10
-
-. /usr/share/libubox/jshn.sh
-. /lib/functions/network.sh
-USE_PROCD=1
-NAME=asterisk
-PROG=/usr/sbin/asterisk
-DEFAULT=/etc/default/asterisk
-CONFDIR=/etc/asterisk
-
-init_asterisk() {
-	[ -f $DEFAULT ] && . $DEFAULT
-	[ -d /var/run/asterisk ] || mkdir -p /var/run/asterisk
-	[ -d /var/log/asterisk ] || mkdir -p /var/log/asterisk
-        [ -d /var/spool/asterisk ] || mkdir -p /var/spool/asterisk
-
-        # does the board have a fxs relay?
-        local fxsRelayGpio=$(db -q get hw.board.fxsRelayGpio)
-        if [ "$fxsRelayGpio" != "" ]; then
-                /sbin/brcm_fw_tool set -x $fxsRelayGpio -p 1
-        fi
-}
-
-service_triggers() {
-        procd_add_reload_trigger voice_client
-}
-
-start_service() {
-	init_asterisk
-
-	procd_open_instance
-	procd_set_param command "$PROG" -f
-	procd_set_param respawn
-	procd_close_instance
-#	service_start /usr/sbin/asterisk
-}
-
-reload_service() {
-	asterisk -rx "config reload $CONFDIR/sip.conf"
-	sleep 1
-	asterisk -rx "core reload"
-	asterisk -rx "dialplan reload"
-	asterisk -rx "brcm reload"
-}
-
-restart() {
-	reload
-}
-
-stop_service() {
-        service_stop /usr/sbin/asterisk
-}
-

ated/Makefile

@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_VERSION:=f614cba983d827d5185c60a6a5a35530621d44d2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se:/ated
+PKG_SOURCE_URL:=https://dev.iopsys.eu/mediatek/ated.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

brcmslic/Makefile

@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_RELEASE:=1
-PKG_VERSION:=0.1
-PKG_SOURCE_URL:=git@private.inteno.se:brcmslic
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=837ec19e37650e424e77c921672a0806e198ba7b
-PKG_NAME:=brcmslic
-
-
-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/brcmslic
-  CATEGORY:=Utilities
-  TITLE:=Brcmslic
-  URL:=
-  DEPENDS:=
-endef
-
-define Package/brcmslic/description
-	Brcmslic
-endef
-
-
-define Package/brcmslic/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/init.d/
-
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/brcmslic $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/endpt $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,brcmslic))

brcmslic/files/dect.config

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

catv/files/etc/config/catv

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

dectmngr/Makefile

@@ -1,66 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_RELEASE:=1
-PKG_VERSION:=1.0.23
-PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=90aff0da98c626d58201c14c34b3b3a64878ceee
-PKG_NAME:=dectmngr
-
-
-LDFLAGS+= \
-        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-		-Wl,-rpath-link=$(STAGING_DIR)/lib
-
-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/dectmngr
-  CATEGORY:=Utilities
-  TITLE:=Broadcom endpoint test application
-  URL:=
-  DEPENDS:= +libevent2 +libjson +natalie-dect-h bcmkernel
-endef
-
-define Package/dectmngr/description
-	Dect proxy, manager and tools
-endef
-
-
-define Package/dectmngr/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/dect
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_DIR) $(1)/etc/dect/
-	$(INSTALL_DIR) $(1)/etc/config/
-
-	cp $(PKG_BUILD_DIR)/dectmngr $(1)/usr/bin/
-	cp $(PKG_BUILD_DIR)/atohx $(1)/usr/bin/
-	cp $(PKG_BUILD_DIR)/dectproxy $(1)/usr/bin/
-	cp $(PKG_BUILD_DIR)/dectdbgd $(1)/usr/bin/
-	cp $(PKG_BUILD_DIR)/dect $(1)/usr/bin/
-	cp $(PKG_BUILD_DIR)/dectcalib $(1)/usr/bin/
-	cp $(PKG_BUILD_DIR)/dect_testmode $(1)/usr/bin/
-	cp files/etc/init.d/* $(1)/etc/init.d/
-	cp files/etc/hotplug.d/dect/* $(1)/etc/hotplug.d/dect/
-	cp files/etc/dect/* $(1)/etc/dect/
-	cp files/etc/config/* $(1)/etc/config/
-	cp files/sbin/dectreg $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,dectmngr))

dectmngr/files/etc/config/dect

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

dectmngr/files/etc/hotplug.d/dect/00-dectstate

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ "$ACTION" == "led_blink" ]; then
-    ubus call led.dect set '{"state":"notice"}'
-fi
-
-if [ "$ACTION" == "led_on" ]; then
-    ubus call led.dect set '{"state":"ok"}'
-fi
-
-if [ "$ACTION" == "led_off" ]; then
-    ubus call led.dect set '{"state":"off"}'
-fi
-
-

dectmngr/files/etc/init.d/dect

@@ -1,60 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=97
-STOP=10
-USE_PROCD=1
-
-DEST=
-DEFAULT=
-OPTIONS=""
-
-
-start_service() {
-	# avoid fp timing problem
-	echo 1 > /proc/sys/kernel/printk_with_interrupt_enabled
-	
-	# setup board specific dect parameters
-	cat /proc/nvram/rfpi | tr -d ' ' | atohx > /tmp/rfpi
-	cat /proc/nvram/fixed_emc | tr -d ' ' | atohx > /tmp/fixed_emc
-	cat /proc/nvram/bcm_def_freq | tr -d ' ' | atohx > /tmp/bcm_def_freq
-	DECTANTDIV=`db get hw.board.DectAntennaDiversity`
-	case "$DECTANTDIV" in
-		1|off) echo -ne "\x01" > /tmp/dect_antenna_diversity ;;
-		2) echo -ne "\x02" > /tmp/dect_antenna_diversity ;;
-		*) echo -ne "\x00" > /tmp/dect_antenna_diversity ;;
-	esac
-
-	if [ ! -f /etc/dect/nvs ]; then
-		cp /etc/dect/nvs_default /etc/dect/nvs
-		dd of=/etc/dect/nvs if=/tmp/rfpi conv=notrunc bs=1 seek=0
-		dd of=/etc/dect/nvs if=/tmp/fixed_emc conv=notrunc bs=1 seek=10
-		dd of=/etc/dect/nvs if=/tmp/bcm_def_freq conv=notrunc bs=1 seek=6
-		dd of=/etc/dect/nvs if=/tmp/dect_antenna_diversity conv=notrunc bs=1 seek=32
-		fsync /etc/dect/nvs
-	fi
-	
-	# init dectproxy
-	dectproxy > /dev/null 2>&1 &
-	dectmngr > /tmp/dectmngr 2>&1 &
-}
-
-stop_service() {
-        killall -9 dectproxy
-	killall -9 dectmngr
-}
-
-restart_service() {
-	echo "restarting dect"
-	killall dectmngr
-	dectmngr > /tmp/dectmngr 2>&1 &
-}
-
-reload_service() {
-	# reload config
-	dect -c
-}
-
-service_triggers() {
-        procd_add_reload_trigger dect
-}
-

dectmngr/files/sbin/dectreg

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# This script is likely not used. Just exit with
-# an error and see if someone screems... If not,
-# we can delete this file.
-exit 1
-
-
-[ -f /var/dectisregistering ] || {
-	touch /var/dectisregistering 2>/dev/null
-	/usr/bin/dectmngr -r
-	ubus call led.dect  set '{"state" : "notice"}'
-	sleep 20
-	rm /var/dectisregistering 2>/dev/null
-	/usr/bin/dectmngr -s
-	ubus call led.dect  set '{"state" : "ok"}'
-}

dectmngr2/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.0
-PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
+PKG_VERSION:=1.2.0
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=13da1568d57b8e6732dadc16de828d64c81906b8
+PKG_SOURCE_VERSION:=0c029ed2486342e7e7687631b702d5c743f3c41a
 PKG_NAME:=dectmngr2
 
 
@@ -21,6 +21,7 @@ export BUILD_DIR
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,7 +29,7 @@ define Package/dectmngr2
   CATEGORY:=Utilities
   TITLE:=Dectmngr2
   URL:=
-  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus
+  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent
 endef
 
 define Package/dectmngr2/description
@@ -41,6 +42,7 @@ define Package/dectmngr2/install
 	$(INSTALL_DIR) $(1)/etc/dect/
 	$(INSTALL_DIR) $(1)/etc/config/
 	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_DIR) $(1)/etc/uci-defaults/
 
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dectmngr2 $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/target.bin $(1)/etc/dect/
@@ -48,6 +50,7 @@ define Package/dectmngr2/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dect $(1)/etc/init.d/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dectmngr-wrapper.sh $(1)/usr/sbin/
 	$(CP) ./files/dect.config $(1)/etc/config/dect
+	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
 endef
 
 $(eval $(call BuildPackage,dectmngr2))

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

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

dslmngr/Makefile

@@ -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

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

easy-soc-libs/Makefile

@@ -0,0 +1,159 @@
+#
+# Copyright (C) 2018 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+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:=359524ddd8a17df39c70c5ba39e723e9641d5956
+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
+
+define Package/easy-soc-libs
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=IOPSYS easy SoC libraries
+  SUBMENU:=IOPSYS easy SoC libraries
+  DEPENDS:=+libopenssl
+  MENU:=1
+endef
+
+define Package/libwifi/config
+  source "$(SOURCE)/Config.in"
+endef
+
+define Package/libwifi
+  $(call Package/easy-soc-libs)
+  TITLE:= WiFi library (libwifi)
+  DEPENDS+=+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
+endef
+
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+  TARGET_PLATFORM=BROADCOM
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
+  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+  TARGET_PLATFORM=BROADCOM
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
+else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+  TARGET_PLATFORM=MEDIATEK
+  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
+else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
+  TARGET_PLATFORM=MARVELL
+  TARGET_CFLAGS +=-DIOPSYS_MARVELL
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+  TARGET_PLATFORM=INTEL
+  TARGET_CFLAGS +=-DIOPSYS_INTEL
+else
+  $(info Unexpected CONFIG_TARGET)
+endif
+
+export TARGET_PLATFORM
+
+ifdef CONFIG_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) \
+	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/openssl \
+	-I$(STAGING_DIR)/usr/include/libnl3
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
+	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
+	$(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/libethernet
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libethernet/ethernet.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
+endef
+
+define Build/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));)
+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
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
+ifeq ($(CONFIG_LIBDSL_TEST),y)
+	$(CP) $(PKG_BUILD_DIR)/libdsl/test/libdsl_test $(1)/usr/bin/
+endif
+endef
+
+$(eval $(call BuildPackage,libwifi))
+$(eval $(call BuildPackage,libdsl))
+$(eval $(call BuildPackage,libethernet))

endptcfg/Makefile

@@ -1,92 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=endptcfg
-PKG_VERSION:=0.2
-
-PKG_SOURCE_VERSION:=1194b05278bd0945ca5c76436e56617b86871a65
-ifeq ($(CONFIG_ENDPT_OPEN),y)
-BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
-PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
-PKG_NAME:=endptcfg-open
-else
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=git@private.inteno.se:endptcfg
-PKG_SOURCE_PROTO:=git
-endif
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-LDFLAGS+= \
-		-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-		-Wl,-rpath-link=$(STAGING_DIR)/lib
-
-BCMKERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
-export BCMKERNEL_DIR
-
-TARGET_LDFLAGS += $(BCMKERNEL_DIR)/userspace/private/apps/vodsl/telephonyProfiles/telephonyProfiles.o \
-			$(BCMKERNEL_DIR)/userspace/private/apps/vodsl/voip/util/log/vodslLog.o \
-			$(BCMKERNEL_DIR)/userspace/private/apps/vodsl/endpoint/endpoint_user.o \
-			$(BCMKERNEL_DIR)/userspace/private/apps/vodsl/bos/bos.o \
-			-lpthread
-
-TARGET_CFLAGS += -DFAKE_SSP
-
-RSTRIP:=true
-export BUILD_DIR
-
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/endptcfg
-  CATEGORY:=Utilities
-  TITLE:=Broadcom endpoint driver configuration application
-  URL:=
-  DEPENDS:=+libpthread bcmkernel
-endef
-
-define Package/endptcfg/description
-	Broadcom endpoint driver configuration application
-endef
-
-define Package/endptcfg/config
-	source "$(SOURCE)/Config.in"
-endef
-
-ifneq ($(CONFIG_ENDPT_OPEN),y)
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) LINUX_DIR=$(LINUX_DIR) LDFLAGS="$(TARGET_LDFLAGS)" CFLAGS="$(TARGET_CFLAGS) \
-			-I$(LINUX_DIR)/include \
-			-I$(STAGING_DIR)/usr/include \
-			-DRS_ENDIAN_TYPE=RS_BIG_ENDIAN \
-			-DBOS_OS_LINUXUSER -DBOS_CFG_TIME \
-			-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/broadcom/include/bcm963xx \
-			-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
-			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/voice_res_gw/endpt/inc \
-			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/voice_res_gw/inc \
-			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/voice_res_gw/codec \
-			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/xchg_common/bos/publicInc \
-			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/voice_res_gw/casCtl/inc \
-			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/xchg_drivers/inc \
-			-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/private/apps/vodsl/voip/inc \
-			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/xchg_common/bos/LinuxUser"
-endef
-else
-define Build/Compile
-endef
-endif
-
-define Package/endptcfg/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	cp $(PKG_BUILD_DIR)/endptcfg $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,endptcfg))

endptmngr/Makefile

@@ -0,0 +1,66 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_RELEASE:=1
+PKG_VERSION:=0.2
+PKG_SOURCE_VERSION:=44e2472e8c08bef01fab27e8e908d5672f7af136
+
+
+ifeq ($(CONFIG_ENDPT_OPEN),y)
+BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
+PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
+PKG_NAME:=endptmngr-open
+else
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/endptmngr
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_NAME:=endptmngr
+endif
+
+RSTRIP:=true
+export BUILD_DIR
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/endptmngr/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Package/endptmngr
+  CATEGORY:=Utilities
+  TITLE:=Brcmslic
+  URL:=
+  DEPENDS:= +libubox +ubus +libpicoevent +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen
+endef
+
+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/
+	cp $(PKG_BUILD_DIR)/files/etc/init.d/* $(1)/etc/init.d/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/endptmngr $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,endptmngr))

eventlog/Makefile

@@ -1,49 +0,0 @@
-#
-# Copyright (C) 2009-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=eventlog
-PKG_VERSION:=0.2.9
-PKG_RELEASE:=2
-
-PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/eventlog/0.2/
-PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
-PKG_MD5SUM:=76e3d7a0b8f335c12099e9b91191fbf1
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libeventlog
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A new API to format and send structured log messages.
-endef
-
-define Package/eventlog/description
-  A new API to format and send structured log messages. It supports multiple message
-  representations (plain, XML attributes and XML tags) and multiple output methods
-  (local syslogd).
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/eventlog $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevtlog.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/eventlog.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libeventlog/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libevtlog.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libeventlog))

fatrace/Makefile

@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=fatrace
+PKG_VERSION:=0.12
+PKG_RELEASE:=1
+
+PKG_SOURCE_VERSION:=98af6019a4a1b478a6fa35f74528cb3cd404ae40
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://git.launchpad.net/fatrace
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+# support parallel build
+#PKG_BUILD_PARALLEL:=1
+
+#re create configure scripts if not present.
+#PKG_FIXUP:=autoreconf
+
+# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
+# this way we don't need to pick out the resulting files from the build dir.
+PKG_INSTALL:=1
+
+PKG_CONFIG_DEPENDS := CONFIG_KERNEL_FANOTIFY
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/fatrace
+	CATEGORY:=Utilities
+	TITLE:=Report system wide file access events
+	URL:=
+	DEPENDS	:= +@KERNEL_FANOTIFY
+endef
+
+define Package/fatrace/description
+	Report system wide file access events.
+endef
+
+MAKE_INSTALL_FLAGS += PREFIX="/" 
+
+define Package/fatrace/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/fatrace $(1)/sbin/
+#	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,fatrace))
+
+

fatrace/patches/001-fix-O_LARGEFILE.patch

@@ -0,0 +1,14 @@
+diff --git a/fatrace.c b/fatrace.c
+index 1c0899a..b7d1560 100644
+--- a/fatrace.c
++++ b/fatrace.c
+@@ -44,7 +44,8 @@
+  * http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=1e2ee49f7
+  * O_LARGEFILE is usually 0, so hardcode it here
+  */
+-#define KERNEL_O_LARGEFILE 00100000
++//#define KERNEL_O_LARGEFILE 00100000
++#define KERNEL_O_LARGEFILE O_LARGEFILE
+ 
+ /* command line options */
+ static char* option_output = NULL;

fatrace/patches/002-fflush.patch

@@ -0,0 +1,12 @@
+diff --git a/fatrace.c b/fatrace.c
+index b7d1560..6179272 100644
+--- a/fatrace.c
++++ b/fatrace.c
+@@ -149,6 +149,7 @@ print_event(const struct fanotify_event_metadata *data,
+         printf ("%li.%06li ", event_time->tv_sec, event_time->tv_usec);
+     }
+     printf ("%s(%i): %s %s\n", procname, data->pid, mask2str (data->mask), pathname);
++    fflush(stdout);
+ }
+ 
+ /**

gigaset-elements/Makefile

@@ -5,7 +5,7 @@ PKG_NAME:=gigaset-elements
 PKG_VERSION:=2.4.2
 # PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
-PKG_GIGASET_ELEMENTS_SRC_URL ?= git@public.inteno.se:gigaset-elements.git
+PKG_GIGASET_ELEMENTS_SRC_URL ?= git@dev.iopsys.eu:3rdparty/gigaset-elements.git
 PKG_GIGASET_ELEMENTS_VERSION ?= v$(PKG_VERSION)
 
 PKG_SOURCE_URL:=$(PKG_GIGASET_ELEMENTS_SRC_URL)

gryphon-led-module/Makefile

@@ -0,0 +1,62 @@
+# Copyright (c) 2017 Genexis B.V.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=gryphon-led-kernel-module
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/$(PKG_NAME)
+  SUBMENU:=LED modules
+  TITLE:=LED driver for Gryphon
+  FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
+  AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
+  PKG_LICENSE:=Genexis
+  PKG_LICENSE_URL:=
+endef
+
+define KernelPackage/$(PKG_NAME)/description
+  This package contains the LED driver for Gryphon devices.
+endef
+
+EXTRA_KCONFIG:= CONFIG_RGB_LED=m
+
+MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)/kdevlinks/
+	$(CP) -s `pwd`/src/* $(PKG_BUILD_DIR)/kdevlinks/
+	$(CP) src/* $(PKG_BUILD_DIR)
+endef
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH="$(LINUX_KARCH)" \
+		SUBDIRS="$(PKG_BUILD_DIR)" \
+		EXTRA_CFLAGS="-DKERNEL_MODULE $(BUILDFLAGS) -I$(LINUX_DIR)/include -include generated/autoconf.h $(MODULE_INCLUDE)" \
+		modules
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+endef
+
+$(eval $(call KernelPackage,$(PKG_NAME)))

gryphon-led-module/src/Makefile

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

gryphon-led-module/src/main.c

@@ -0,0 +1,256 @@
+/*
+ * Copyright (c) 2017 Genexis B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#define DEBUG 1
+
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/printk.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/gpio/consumer.h>
+#include <linux/of.h>
+#include <linux/version.h>
+
+#include "sk9822.h"
+
+#define DRIVER_NAME			"canyon_led"
+#define DRIVER_AUTHOR		"Genexis B.V."
+#define DRIVER_DESC			"Canyon LED driver for SK9822"
+#define DRIVER_VERSION	"1"
+
+/**
+ * sysfs interfaces
+ */
+
+static ssize_t get_led_color(struct device *dev,
+		struct device_attribute *attr, char *buf)
+{
+	/* [ln] todo: dummy implementation */
+	int len;
+
+	len = sprintf(buf, "%d\n", 123);
+	if (len <= 0) {
+		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
+	}
+
+	return len;
+}
+
+/**
+ * @brief Set complete LED strip to a specific color
+ * @retval count number of bytes written
+ * @retval -EMSGSIZE if the message is too big
+ * @retval -EIO for all other errors (e.g. leds cannot be configured)
+ */
+static ssize_t set_led_color(struct device *dev,
+		struct device_attribute *attr, const char *buf, size_t count)
+{
+	int ret = 0;
+	size_t buflen = count;
+	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
+
+	if (IS_ERR(sk9822)) {
+		printk(KERN_ERR "Platform get drvdata returned NULL\n");
+		return -EIO;
+	}
+
+	/* strip newline */
+	if ((count > 0) && (buf[count-1] == '\n')) {
+		buflen--;
+	}
+
+	if (buflen != 6) { // RRGGBB\0
+		return -EMSGSIZE;
+	}
+
+	// Update the LED array here
+	printk(KERN_DEBUG "Set LED color\n");
+	ret = sk9822_set_color_str(sk9822, buf);
+	if (ret != 0) {
+		printk(KERN_ERR "Failed to set led color\n");
+		return -EIO;
+	}
+
+	// Now push to the HW
+	ret = sk9822_update(sk9822);
+	if (ret != 0) {
+		printk(KERN_ERR "Failed to update led\n");
+		return -EIO;
+	}
+
+	return count;
+}
+static DEVICE_ATTR(led_color, S_IRUGO | S_IWUSR, get_led_color, set_led_color);
+
+static struct attribute *sk9822_dev_attrs[] = {
+	 &dev_attr_led_color.attr,
+	 NULL
+};
+
+static struct attribute_group sk9822_dev_attr_group = {
+	.name = "sk9822",
+	.attrs = sk9822_dev_attrs,
+};
+
+/**
+ * device prope and removal
+ */
+
+static int canyon_led_probe(struct platform_device *pdev)
+{
+	int ret;
+	struct sk9822_leds *leds;
+
+	printk(KERN_NOTICE "Begin probing...\n");
+
+	leds = devm_kzalloc(&pdev->dev, sizeof(*leds), GFP_KERNEL);
+	if (!leds) {
+		return -ENOMEM;
+	}
+	leds->dev = &pdev->dev;
+	leds->led_brightness = SK9822_DEFAULT_BRIGHTNESS;
+
+	ret = of_property_read_u16(pdev->dev.of_node, "led-count", &leds->led_count);
+	if (ret < 0) {
+		dev_warn(&pdev->dev, "Could not read led-count property\n");
+		leds->led_count = SK9822_DEFAULT_NUM_LEDS;
+	}
+
+	leds->led_colors = devm_kzalloc(&pdev->dev,
+			(sizeof(cRGB) * leds->led_count), GFP_KERNEL);
+	if (!leds->led_colors) {
+		return -ENOMEM;
+	}
+
+
+	platform_set_drvdata(pdev, leds);
+
+	printk(KERN_INFO "Allocated memory\n");
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 16, 0)
+	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
+	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0, GPIOD_OUT_HIGH);
+#else
+	dev_warn(&pdev->dev, "Kernel version Not supported\n");
+	exit(1);
+#endif
+
+	gpiod_direction_output(leds->clock_gpio, 1);
+	if (IS_ERR(leds->clock_gpio)) {
+		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
+				PTR_ERR(leds->clock_gpio));
+		leds->clock_gpio = NULL;
+		return PTR_ERR(leds->clock_gpio);
+	} else {
+		printk(KERN_INFO "Got clock gpio\n");
+		gpiod_set_value(leds->clock_gpio, 0);
+	}
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 16, 0)
+	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
+	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1, GPIOD_OUT_HIGH);
+#else
+	dev_warn(&pdev->dev, "Kernel version Not supported\n");
+	exit(1);
+#endif
+
+	gpiod_direction_output(leds->data_gpio, 1);
+	if (IS_ERR(leds->data_gpio)) {
+		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
+				PTR_ERR(leds->data_gpio));
+		leds->data_gpio = NULL;
+		return PTR_ERR(leds->data_gpio);
+	} else {
+		printk(KERN_INFO "Got data gpio\n");
+		gpiod_set_value(leds->data_gpio, 0);
+	}
+
+	printk(KERN_INFO "Attempt to set filefs stuff\n");
+	ret = sysfs_create_group(&pdev->dev.kobj, &sk9822_dev_attr_group);
+	if (ret) {
+		dev_err(&pdev->dev, "sysfs creation failed\n");
+		return ret;
+	}
+
+	printk(KERN_INFO "Flash LEDs to verify they work\n");
+	sk9822_set_color_str(leds, "00FF00");
+	sk9822_update(leds);
+	msleep(200);
+	sk9822_set_color_str(leds, "000000");
+	sk9822_update(leds);
+
+	printk(KERN_NOTICE "We made it, carry on...\n");
+
+	return 0;
+}
+
+static int canyon_led_remove(struct platform_device *pdev)
+{
+	struct sk9822_leds *leds;
+
+	sysfs_remove_group(&pdev->dev.kobj, &sk9822_dev_attr_group);
+
+	leds = platform_get_drvdata(pdev);
+	if (IS_ERR(leds)) {
+		printk(KERN_ERR "Platform get drvdata returned NULL\n");
+		return -1;
+	}
+
+	if (leds->clock_gpio) {
+		gpiod_put(leds->clock_gpio);
+	}
+
+	if (leds->data_gpio) {
+		gpiod_put(leds->data_gpio);
+	}
+
+	printk(KERN_NOTICE "Bye, bye\n");
+
+	return 0;
+}
+
+/**
+ * platform driver metadata
+ */
+
+static const struct of_device_id canyon_led_of_ids[] = {
+	{ .compatible = "canyon,led" },
+	{ }
+};
+
+static struct platform_driver canyon_led = {
+	.probe = &canyon_led_probe,
+	.remove = &canyon_led_remove,
+	.driver = {
+		.name = DRIVER_NAME,
+		.owner = THIS_MODULE,
+		.of_match_table = canyon_led_of_ids,
+	},
+};
+
+MODULE_DEVICE_TABLE(of, canyon_led_of_ids);
+module_platform_driver(canyon_led);
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_VERSION(DRIVER_VERSION);
+MODULE_LICENSE("GPL");

gryphon-led-module/src/sk9822.c

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

gryphon-led-module/src/sk9822.h

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

gryphon-led-module/src/sk9822_bitbang.c

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

gryphon-led-module/src/sk9822_bitbang.h

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

ice-client/Makefile

@@ -19,20 +19,21 @@ 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.0.1
-PKG_RELEASE:=RC1
+BASE_PKG_VERSION:=5.3.6
+PKG_RELEASE:=
 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=a2635dd11c477d70728ab6cbe5c2dee3965dbe14
+PKG_SOURCE_VERSION:=94aab1532fef2caf2d65579614fc413252a517eb
 ifeq ($(CONFIG_ICE_OPEN),y)
 TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
 PKG_SOURCE:=$(PKG_NAME)-$(TARGET_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+SKIPHASH=1
+export SKIPHASH
 else
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git@private.inteno.se:ice-client.git
@@ -131,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

ice-client/files/ice-client.uci_default

@@ -7,6 +7,9 @@ grep -rq "^ice:" /etc/passwd || {
 uci -q delete passwords.ice
 uci -q set passwords.ice=usertype
 uci -q set passwords.ice.password="\$WPAKEY"
+uci -q del_list passwords.ice._access_w=root
+uci -q add_list passwords.ice._access_w=root
+uci -q del_list passwords.ice._access_r=root
 uci -q add_list passwords.ice._access_r=root
 uci -q commit passwords
 
@@ -16,7 +19,7 @@ cat >> /etc/config/rpcd << EOF
 config login
 	option username 'ice'
 	option password '\$p\$ice'
-	list _access_r 'none'
+	list _access_w 'none'
 	list write 'user-user'
 	list write 'juci-broadcom-dsl'
 	list write 'juci-broadcom-dsl-admin'
@@ -63,5 +66,9 @@ config login
 EOF
 }
 
+uci -q del_list dhcp.@domain[0].name="inteno.lan"
+uci -q add_list dhcp.@domain[0].name="inteno.lan"
+uci -q commit dhcp
+
 exit 0
 

icwmp/Config_cwmp.in

@@ -15,33 +15,21 @@ config CWMP_ACS_HDM
 	bool "HDM"
 endchoice
 
-choice
-	prompt "Select Data Model"
-	default tr098
-
-config DATAMODEL_TR098
-	bool "TR-098"
-
-config DATAMODEL_TR181
-	bool "TR-181"
-endchoice
-
 config CWMP_DEBUG
 	bool "Compile with debug options"
 	default y
 
-choice
-	prompt "enable xmpp feature"
-	default disable
-
-config XMPP_DISABLE
-	bool "disable"
-
 config XMPP_ENABLE
-	bool "enable"
-endchoice
+	bool "enable xmpp feature"
+	default n
+
 config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
 
+config LIBDATAMODEL_VENDOR_PREFIX
+    string "Vendor Prefix"
+    default "X_IOPSYS_EU_"
+    
 endif
+

icwmp/Config_datamodel.in

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

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=3.0-2017-11-24
+PKG_VERSION:=4.0-2019-04-01
 PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d74b88913f676ebf9a210c4674555d080e57ff52
+PKG_SOURCE_VERSION:=434174439789e7e78e30063d6cf472f381e5b5f1
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -30,11 +30,39 @@ CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/libdatamodel
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Library for broadband-forum data model
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+endef
+
+define Package/icwmp_stun
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 stun Client
+	DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json
+endef
+
+define Package/icwmp_xmpp
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 xmpp feature
+	DEPENDS:=+libuci +libubox +libexpat +libstrophe
+endef
+
+define Package/icwmp_udpechoserver
+	SECTION:=utils
+	CATEGORY:=Utilities
+	TITLE:=TR-069 udpechoserver feature
+	DEPENDS:=+libuci
+endef
+
 define Package/icwmp/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +libexpat +libstrophe +curl +libtrace
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +libexpat +libstrophe +curl +libtrace +libdatamodel
 endef
 
 define Package/icwmp/description
@@ -56,7 +84,11 @@ define Package/icwmp-zstream
 endef
 
 define Package/icwmp-zstream/config
-	source "$(SOURCE)/Config.in"
+	source "$(SOURCE)/Config_cwmp.in"
+endef
+
+define Package/libdatamodel/config
+	source "$(SOURCE)/Config_datamodel.in"
 endef
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
@@ -66,10 +98,12 @@ define Build/Prepare
 endef
 endif
 
-ifeq ($(CONFIG_TARGET_IBOARDID),"EX400")
+ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
 TARGET_CFLAGS += -DEX400
 endif
 
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBDATAMODEL_VENDOR_PREFIX)\\\"
+
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 
@@ -89,10 +123,17 @@ CONFIGURE_ARGS += \
 	--with-uci-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubus-include-path=$(STAGING_DIR)/usr/include
-
-CONFIGURE_ARGS += $(if $(CONFIG_DATAMODEL_TR181),--enable-datamodel=tr181,--enable-datamodel=tr098)
-CONFIGURE_ARGS += $(if $(CONFIG_XMPP_ENABLE),--enable-xmpp=enable,--enable-xmpp=disable)
-
+	
+ifeq ($(CONFIG_UPNP_TR064),y)
+CONFIGURE_ARGS += \
+	--enable-upnptr064
+endif
+	
+ifeq ($(CONFIG_XMPP_ENABLE),y)
+CONFIGURE_ARGS += \
+	--enable-xmpp
+endif
+	
 ifeq ($(BUILD_VARIANT),zstream)
 CONFIGURE_ARGS += \
 	--enable-http=zstream \
@@ -124,30 +165,71 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
+define Package/libdatamodel/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib/
+endef
+
 define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/icwmpd $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/icwmpd
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmpd.init $(1)/etc/init.d/icwmpd
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmpd.init $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/90-cwmpfirewall
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
-	$(CP) ./files/icwmp.hotplug $(1)/etc/hotplug.d/iface/90-icwmp
 ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)
 	$(INSTALL_DIR) $(1)/usr/share/icwmp
 	$(CP) $(PKG_BUILD_DIR)/scripts/defaults $(1)/usr/share/icwmp
 	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/icwmp
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/icwmp.sh $(1)/usr/sbin/icwmp
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/iwepkeygen $(1)/usr/sbin/iwepkeygen
 endif
+	$(CP) ./files/* $(1)/
 endef
 
+define Package/icwmp_stun/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_stund $(1)/usr/sbin/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_stund $(1)/etc/init.d/icwmp_stund
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_stun $(1)/etc/config
+endef
+
+define Package/icwmp_xmpp/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_xmppd $(1)/usr/sbin/icwmp_xmppd
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmp_xmppd $(1)/etc/init.d/icwmp_xmppd
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp_xmpp $(1)/etc/config
+endef
+
+define 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
+	$(CP) $(PKG_BUILD_DIR)/dm/*.h $(1)/usr/include/libdatamodel
+	$(CP) $(PKG_BUILD_DIR)/dm/dmtree/common/root.h $(1)/usr/include/libdatamodel
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.so* $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libdatamodel.a $(1)/lib
+endef
+
+
 define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
 	echo "$(CWMP_BKP_FILE)" >> $${IPKG_INSTROOT}/etc/sysupgrade.conf
@@ -169,4 +251,8 @@ endef
 
 
 $(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/files/etc/hotplug.d/iface/90-icwmp

@@ -0,0 +1,87 @@
+#!/bin/sh
+
+. /lib/functions/network.sh
+
+[ "$ACTION" == "ifup" ] || exit 0
+
+[ -f /etc/config/cwmp ] || exit 0
+
+handle_icwmp_restart() {
+	[ -f /tmp/switching_mode ] && exit 0
+	[ -f /tmp/wificontrol.txt -a -f /tmp/netmode-conf.pid ] && exit 0
+
+	[ "$INTERFACE" == "loopback" ] && exit 0
+
+	local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
+	[ -n "$defwan" -a "$(uci -q get network.$defwan)" == "interface" -a "$defwan" != "$INTERFACE" ] && exit 0
+
+	local islan="$(uci -q get network.$INTERFACE.is_lan)"
+	[ "$islan" == "1" ] && exit 0
+
+	local proto="$(uci -q get network.$INTERFACE.proto)"
+	[ "$proto" == "none" ] && exit 0
+
+	local ifname="$(uci -q get network.$INTERFACE.ifname)"
+	[ "${ifname:0:1}" == "@" ] && exit 0
+
+	mkdir -p /tmp/ipv4
+
+	network_flush_cache
+
+	local previpaddr=""
+	local curipaddr=""
+	local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
+	previpaddr=$(cat $ipaddrfile 2>/dev/null)
+	network_get_ipaddr curipaddr $INTERFACE
+	[ -n "$curipaddr" ] && echo $curipaddr > $ipaddrfile || rm -f $ipaddrfile
+
+	local prevgateway=""
+	local curgateway=""
+	local gatewayfile=/tmp/ipv4/$INTERFACE-gateway
+	prevgateway=$(cat $gatewayfile 2>/dev/null)
+	network_get_gateway curgateway $INTERFACE
+	[ -n "$curgateway" ] && echo $curgateway > $gatewayfile || rm -f $gatewayfile
+
+	local prevsubnets=""
+	local cursubnets=""
+	local subnetsfile=/tmp/ipv4/$INTERFACE-subnets
+	prevsubnets=$(cat $subnetsfile 2>/dev/null)
+	network_get_subnets cursubnets $INTERFACE
+	[ -n "$cursubnets" ] && echo $cursubnets > $subnetsfile || rm -f $subnetsfile
+
+	local prevdnsservers=""
+	local curdnsservers=""
+	local dnsserverfile=/tmp/ipv4/$INTERFACE-dnsservers
+	prevdnsservers=$(cat $dnsserverfile 2>/dev/null)
+	network_get_dnsserver curdnsservers $INTERFACE
+	[ -n "$curdnsservers" ] && echo $curdnsservers > $dnsserverfile || rm -f $dnsserverfile
+
+	local prevdev=""
+	local curdev=""
+	local devfile=/tmp/ipv4/$INTERFACE-dev
+	prevdev=$(cat $devfile 2>/dev/null)
+	network_get_device curdev $INTERFACE
+	[ -n "$curdev" ] && echo $curdev > $devfile || rm -f $devfile
+
+	local prevopt43url=""
+	local curopt43url=""
+	local opt43urlfile=/tmp/ipv4/$INTERFACE-opt43url
+	prevopt43url=$(cat $opt43urlfile 2>/dev/null)
+	curopt43url="$(uci -P /var/state -q get cwmp.acs.dhcp_url)"
+	[ -n "$curopt43url" ] && echo $curopt43url > $opt43urlfile || rm -f $opt43urlfile
+
+	[ \
+		"$prevdev" == "$curdev" -a \
+		"$previpaddr" = "$curipaddr" -a \
+		"$prevgateway" = "$curgateway" -a \
+		"$prevsubnets" = "$cursubnets" -a \
+		"$prevdnsservers" = "$curdnsservers" \
+	] && {
+		[ "$prevopt43url" = "$curopt43url" ] &&	exit 0
+		[ -z "$prevopt43url" ] && exit 0
+	}
+
+	/etc/init.d/icwmpd reload &
+}
+
+handle_icwmp_restart

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

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

icwmp/files/icwmp.hotplug

@@ -1,44 +0,0 @@
-#!/bin/sh
-
-grep -q "Designated" /etc/banner || exit 0
-
-. /lib/functions/network.sh
-
-[ "$ACTION" == "ifup" ] || exit 0
-
-local islan="$(uci -q get network.$INTERFACE.is_lan)"
-[ "$islan" == "1" ] && exit 0
-
-local proto="$(uci -q get network.$INTERFACE.proto)"
-[ "$proto" == "none" ] && exit 0
-
-local ifname="$(uci -q get network.$INTERFACE.ifname)"
-[ "${ifname:0:1}" == "@" ] && exit 0
-
-mkdir -p /tmp/ipv4
-
-local previpaddr=""
-local curipaddr=""
-local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
-previpaddr=$(cat $ipaddrfile 2>/dev/null)
-network_get_ipaddr curipaddr $INTERFACE
-[ -n "$curipaddr" ] && echo $curipaddr > $ipaddrfile || rm -f $ipaddrfile
-
-local prevgateway=""
-local curgateway=""
-local gatewayfile=/tmp/ipv4/$INTERFACE-gateway
-prevgateway=$(cat $gatewayfile 2>/dev/null)
-network_get_gateway curgateway $INTERFACE
-[ -n "$curgateway" ] && echo $curgateway > $gatewayfile || rm -f $gatewayfile
-
-local prevsubnets=""
-local cursubnets=""
-local subnetsfile=/tmp/ipv4/$INTERFACE-subnets
-prevsubnets=$(cat $subnetsfile 2>/dev/null)
-network_get_subnets cursubnets $INTERFACE
-[ -n "$cursubnets" ] && echo $cursubnets > $subnetsfile || rm -f $subnetsfile
-
-[ "$previpaddr" = "$curipaddr" -a "$prevgateway" = "$curgateway" -a "$prevsubnets" = "$cursubnets" ] && exit 0
-
-[ -f /etc/config/cwmp ] && /etc/init.d/icwmpd reload &
-

ifbt/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Inteno
+# Copyright (C) 2018 iopsys Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
@@ -8,9 +8,9 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=ifbt
 PKG_VERSION:=0.1
 
-PKG_SOURCE_VERSION:=da97d6668d3c0e3f2be226c66b406e90179ada81
+PKG_SOURCE_VERSION:=0286812ed8036dea758f904694dc416481fba64d
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@private.inteno.se:ifbt.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ifbt.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -18,9 +18,25 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+TARGET_PLATFORM:=-DIOPSYS_BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+TARGET_PLATFORM:=-DIOPSYS_BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
+TARGET_PLATFORM:=-DIOPSYS_MARVELL
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+TARGET_PLATFORM:=-DIOPSYS_INTEL
+else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+TARGET_PLATFORM:=-DIOPSYS_MEDIATEK
+else
+$(info (UNEXPECTED CONFIG TARGET))
+endif
+
+export TARGET_PLATFORM
+
 define Package/ifbt
 	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+	DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c  +libwifi +libjson-c
 	TITLE:=Fast BSS Transition
 endef
 

imonitor/Makefile

@@ -0,0 +1,42 @@
+#
+# 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:=https://dev.iopsys.eu/iopsys/imonitor.git
+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>
+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

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

imonitor/files/etc/init.d/imonitor

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

inbd/Makefile

@@ -12,9 +12,9 @@ PKG_NAME:=inbd
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=92f918d26c0ffc22d1704f5ea6cbb0bd7fdbdab9
+PKG_SOURCE_VERSION:=665a72a6bb2b5ea5a17ad6248957fe35525b3782
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=http://public.inteno.se/inbd
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

inteno-netmodes/Makefile

@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2016 Inteno
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=inteno-netmodes
-PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/inteno-netmodes
-  CATEGORY:=Base system
-  DEPENDS:=+fping
-  TITLE:=Predefined Network Modes
-endef
-
-define Package/inteno-netmodes/description
-	Predefined Network Modes
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./files/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Compile
-endef
-
-define Package/inteno-netmodes/install
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,inteno-netmodes))

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

@@ -1,119 +0,0 @@
-#!/bin/sh
-
-[ "$INTERFACE" != "wan" ] && exit
-
-. /lib/functions/network.sh
-
-network_get_ipaddr ip $INTERFACE
-repeaterready="$(uci -q get netmode.setup.repeaterready)"
-
-[ -z "$ip" ] && exit
-
-toggle_firewall() {
-	local section=$1
-	local disable=$2
-	config_get name "$1" name
-	if [ "$name" == "wan" ]; then
-		uci -q set firewall.settings.disabled=$disable
-		if [ "$disable" == "1" ]; then
-			uci -q set firewall.$section.input="ACCEPT"
-		else
-			uci -q set firewall.$section.input="REJECT"
-		fi
-		uci -q commit firewall
-	fi
-}
-
-set_disabled() {
-	config_load firewall
-	config_foreach toggle_firewall zone $1
-	/etc/init.d/firewall reload
-}
-
-is_inteno_macaddr()
-{
-	macaddr=$1
-
-	echo $macaddr | grep -i -e "^00:22:07" \
-				-e "^02:22:07" \
-				-e "^44:D4:37" \
-				-e "^00:0C:07" \
-				-e "^02:0C:07" \
-				-e "^06:0C:07" \
-				-e "^00:0C:43" \
-				-e "^02:0C:43" \
-				-e "^06:0C:43" \
-	&& return
-	false
-}
-
-switch_mode() {
-	[ "$repeaterready" == "1" ] || return
-
-	# 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
-	ip addr flush dev br-lan
-
-	# flush iptables in case the MASTER
-	# tries to configure us before
-	# firewall is disabled the proper way
-	iptables -F
-
-	ubus call leds set  '{"state" : "allflash"}'
-
-	local ret=0
-	# let netmode-conf up to 20 seconds before switching mode
-	for tm in 2 4 6 8; do
-		if [ -f /tmp/wificontrol.txt ]; then
-			ret=1
-			break
-		fi
-		sleep $tm
-	done
-
-	# let netmode-conf take over
-	[ $ret -eq 1 ] && return
-
-	# go head with switching mode
-	touch -f /tmp/switching_mode
-	echo "Switching to 'extender' mode" > /dev/console
-	uci -q set netmode.setup.curmode='repeater'
-	uci set netmode.setup.repeaterready=0
-	uci commit netmode
-	/etc/init.d/netmode reload
-	echo "Restarting network services" > /dev/console
-	ubus call network reload
-	wifi reload nodat
-	ubus call router.network reload
-	ubus call leds set  '{"state" : "normal"}'
-	rm -f /tmp/switching_mode
-}
-
-test_ip() {
-	if [ -n "$(echo $ip | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ]; then
-		# private IP
-		switch_mode
-		set_disabled 1
-	else
-		# public IP
-		set_disabled 0
-		[ "$1" -eq "1" ] && {
-			uci set netmode.setup.repeaterready=0
-			uci commit netmode
-			local pid="$(ps | grep wificontro[l] | awk '/repeater/ {print $1}')"
-			[ "$pid" != "" ] && kill -9 $pid
-			pid="$(pidof netmode-client-detect)"
-			[ "$pid" == "" ] && /sbin/netmode-client-detect &
-
-			# set default JUCI page to overview
-			uci -q set juci.juci.homepage="overview"
-			uci commit juci
-		}
-	fi
-}
-
-case "$(uci -q get netmode.setup.curmode)" in
-		repeater*) test_ip ;;
-		*) [ "$repeaterready" == "1" ] && test_ip 1;;
-esac
-

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

@@ -1,102 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-include /lib/network
-
-ps | grep hotplug | grep button && exit
-
-MTK=0
-[ "$(db -q get hw.board.hardware)" == "EX400" ] && MTK=1
-
-WANDEV="$(uci get layer2_interface_ethernet.Wan.ifname)"
-[ $MTK -eq 1 ] && WANDEV="eth0.2"
-
-[ "$INTERFACE" != "$WANDEV" ] && exit
-
-defroute=$(ip route | grep default | awk '{print$3}')
-
-case "$(uci get netmode.setup.curmode)" in
-		repeater*)
-			echo "Preparing to switch mode"
-		;;
-		*)
-			ping -c 1 -w 5 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
-			exit
-		;;
-esac
-
-get_wifi_wet_interface() {
-	handle_interface() {
-		config_get mode "$1" mode
-		if [ "$mode" == "sta" -o "$mode" == "wet" ] ; then
-			config_get ifname "$1" ifname
-			echo "$ifname"
-		fi
-	}
-	config_load wireless
-	config_foreach handle_interface wifi-iface
-}
-
-get_wifi_iface_cfgstr() {
-	get_cfgno() {
-		config_get ifname "$1" ifname
-		[ "$ifname" == "$2" ] && echo "wireless.$1"
-	}
-	config_load wireless
-	config_foreach get_cfgno wifi-iface $1
-}
-
-link=$(cat /sys/class/net/${WANDEV:0:4}/operstate)
-[ $MTK -eq 1 ] && link=$(swconfig dev switch0 port 0 get link | awk '{print$2}' | cut -d':' -f2)
-
-case "$ACTION" in
-	add|register)
-		[ "$link" == "down" ] && return
-		ubus call leds set  '{"state" : "allflash"}'
-		echo "Autoswitch to Extender mode" > /dev/console
-		sleep 2
-		wetif="$(get_wifi_wet_interface)"
-		# remove wifi client interface
-		case "$(uci get netmode.setup.curmode)" in
-			repeater*)
-				uci -q set $(get_wifi_iface_cfgstr $wetif).disabled=1
-			;;
-		esac
-		uci commit wireless
-		#add wan ethernet port
-		uci set network.wan.ifname="$(echo $WANDEV $(uci get network.wan.ifname) | sed 's/$/ /' | sed -r "s/$wetif //g" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
-		uci commit network
-		ubus call network reload
-		[ -f /usr/sbin/wlctl ] && wlctl -i $wetif bss down 2>/dev/null
-		ping -c 1 -w 10 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
-		ubus call router.network reload
-		ubus call leds set  '{"state" : "normal"}'
-	;;
-	remove|unregister)
-		[ "$link" == "up" ] && return
-		ubus call leds set  '{"state" : "allflash"}'
-		echo "Autoswitch to Repeater mode" > /dev/console
-		sleep 2
-		wetif="$(get_wifi_wet_interface)"
-		# add wifi client interface
-		case "$(uci get netmode.setup.curmode)" in
-			repeater*)
-				uci -q set $(get_wifi_iface_cfgstr $wetif).disabled=0
-			;;
-		esac
-		uci commit wireless
-		#remove wan ethernet port
-		uci set network.wan.ifname="$(echo $wetif $(uci get network.wan.ifname) | sed 's/$/ /' | sed -r "s/$WANDEV //g" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
-		uci commit network
-		ubus call network reload
-		[ -f /usr/sbin/wlctl ] && wlctl -i $wetif bss up 2>/dev/null
-		ping -c 1 -w 10 $defroute >/dev/null 2>&1 || {
-			killall -9 wifi
-			wifi reload nodat
-			killall -USR1 udhcpc
-		}
-		ubus call router.network reload
-		ubus call leds set  '{"state" : "normal"}'
-	;;
-esac
-

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

@@ -1,327 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=10
-USE_PROCD=1
-
-TMPDIR=/var/netmodes
-OLD_MODE_FILE=/var/netmodes/old_mode
-
-. /usr/share/libubox/jshn.sh
-. /lib/network/config.sh
-
-local modedir=$(uci -q get netmode.setup.dir)
-[ -n "$modedir" ] || modedir="/etc/netmodes"
-
-get_device() {
-	local PORT_NAMES=$(db get hw.board.ethernetPortNames)
-	local PORT_ORDER=$(db get hw.board.ethernetPortOrder)
-        local cnt=1
-        local idx=0
-
-	local pnum=$(echo $PORT_NAMES | wc -w)
-
-	if [ $pnum -le 2 ]; then
-		PORT_NAMES=$(echo $PORT_NAMES | sed 's/LAN/LAN1/g')
-	fi
-
-	# get index of interface name
-	for i in $PORT_NAMES; do
-		if [ "$i" == "$1" ]; then
-			idx=$cnt
-		fi
-		cnt=$((cnt+1))
-	done
-
-        # get port name from index
-	cnt=1
-	for i in $PORT_ORDER; do
-		if [ "$cnt" == "$idx" ]; then
-			echo $i
-		fi
-		cnt=$((cnt+1))
-	done
-}
-
-populate_netmodes() {
-	[ -f /etc/config/netmode -a -d $modedir ] || return
-	local curmode
-
-	config_load netmode
-
-	config_get curmode setup curmode
-
-	mkdir -p $TMPDIR
-
-	if [ "$curmode" == "routed" ]; then
-		local hw="$(db -q get hw.board.hardware)"
-		if [ "$hw" == "EX400" ]; then
-			curmode="routed_mtk"
-		else
-			curmode="routed_brcm"
-		fi
-	fi
-
-	echo $curmode > $OLD_MODE_FILE
-
-	delete_netmode() {
-		uci delete netmode.$1
-	}
-
-	config_foreach delete_netmode netmode
-	uci commit netmode
-
-	wan=$(get_device WAN)
-	lan1=$(get_device LAN1)
-	lan2=$(get_device LAN2)
-	lan3=$(get_device LAN3)
-	lan4=$(get_device LAN4)
-	lan5=$(get_device LAN5)
-
-	for file in $(find $modedir -type f); do
-		conf="$(echo $file | cut -d'/' -f5)"
-		if [ "$conf" == "layer2_interface_ethernet" ]; then
-			grep -q "\$WAN" $file && sed -i "s/\$WAN/$wan/g" $file
-		fi
-		if [ "$conf" == "network" ]; then
-			grep -q "\$WAN" $file && sed -i "s/\$WAN/$wan/g" $file
-			grep -q "\$LAN1" $file && sed -i "s/\$LAN1/$lan1/g" $file
-			grep -q "\$LAN2" $file && sed -i "s/\$LAN2/$lan2/g" $file
-			grep -q "\$LAN3" $file && sed -i "s/\$LAN3/$lan3/g" $file
-			grep -q "\$LAN4" $file && sed -i "s/\$LAN4/$lan4/g" $file
-
-			ifname="$(uci -q get $file.wan.ifname | sed 's/[ \t]*$//')"
-			uci -q set $file.wan.ifname="$ifname"
-			uci -q commit $file
-		fi
-	done
-
-	local hardware=$(db get hw.board.hardware)
-	local keys lang desc exp exclude
-	for mode in $(ls $modedir); do
-
-			case "$mode" in
-				repeater*)
-					wlctl -i wl1 ap >/dev/null 2>&1 || ifconfig rai0 2>/dev/null | grep -q rai0 || continue
-				;;
-			esac
-
-			lang=""
-			desc=""
-			exp=""
-			uci -q set netmode.$mode=netmode
-			json_load "$(cat $modedir/$mode/DETAILS)"
-
-			if json_select excluded_boards; then
-				exclude=0
-				_i=1
-				while json_get_var board $_i; do
-					case "$hardware" in
-						$board)
-							uci -q delete netmode.$mode
-							exclude=1
-							break
-						;;
-					esac
-					_i=$((_i+1))
-				done
-				json_select ..
-				[ $exclude -eq 1 ] && continue
-			fi
-
-			if json_select acl; then
-				_i=1
-				while json_get_var user $_i; do
-					uci add_list netmode.$mode._access_r="$user"
-					_i=$((_i+1))
-				done
-				json_select ..
-			fi
-
-			json_select description
-			json_get_keys keys
-			for k in $keys; do
-				json_get_keys lang $k
-				lang=$(echo $lang | sed 's/^[ \t]*//;s/[ \t]*$//')
-				json_select $k
-				json_get_var desc $lang
-				uci -q set netmode.$mode."desc_$lang"="$desc"
-				[ "$lang" == "en" ] && uci -q set netmode.$mode."desc"="$desc"
-				json_select ..
-			done
-			json_select ..
-
-			json_select explanation
-			json_get_keys keys
-			for k in $keys; do
-				json_get_keys lang $k
-				lang=$(echo $lang | sed 's/^[ \t]*//;s/[ \t]*$//')
-				json_select $k
-				json_get_var exp $lang
-				uci -q set netmode.$mode."exp_$lang"="$exp"
-				[ "$lang" == "en" ] && uci -q set netmode.$mode."exp"="$exp"
-				json_select ..
-			done
-			json_select ..
-
-			json_get_var cred credentials
-			uci -q set netmode.$mode.askcred="$cred"
-			json_get_var ulb uplink_band
-			uci -q set netmode.$mode.uplink_band="$ulb"
-			json_get_var reboot reboot
-			uci -q set netmode.$mode.reboot="$reboot"
-	done
-
-	config_get curmode setup curmode
-	[ -d /etc/netmodes/$curmode ] || {
-		[ "$(db -q get hw.board.hardware)" == "EX400" ] && uci -q set netmode.setup.curmode="routed_mtk" || uci -q set netmode.setup.curmode="routed_brcm"
-	}
-
-	uci commit netmode
-}
-
-switch_netmode() {
-	[ -f /etc/config/netmode -a -d $modedir ] || return
-
-	local netreload="$1"
-	local curmode conf repeaterready old_mode
-
-	config_load netmode
-
-	config_get curmode setup curmode
-
-	config_get repeaterready setup repeaterready "0"
-	if [ "$repeaterready" == "1" ] ; then
-		uci -q set netmode.setup.repeaterready="0"
-		uci commit netmode
-	fi
-
-	if [ "$curmode" == "repeater" ]; then
-		local hw="$(db -q get hw.board.hardware)"
-		if [ "$hw" == "EX400" ]; then
-			curmode="repeater_mtk_5g_up_dual_down"
-		else
-			curmode="repeater_brcm_2g_up_dual_down"
-		fi
-		uci set netmode.setup.curmode="$curmode"
-		uci commit netmode
-	fi
-	if [ "$curmode" == "routed" ]; then
-		local hw="$(db -q get hw.board.hardware)"
-		if [ "$hw" == "EX400" ]; then
-			curmode="routed_mtk"
-		else
-			curmode="routed_brcm"
-		fi
-		uci set netmode.setup.curmode="$curmode"
-		uci commit netmode
-	fi
-
-	old_mode=`cat $OLD_MODE_FILE 2>/dev/null`
-
-        # if curmode has not changed do not copy configs
-        if [ "$curmode" == "$old_mode" ]; then
-                /etc/init.d/enviroment reload
-                return
-        fi
-
-        echo $curmode >$OLD_MODE_FILE
-
-	[ -d "/etc/netmodes/$curmode" ] || return
-	cp /etc/netmodes/$curmode/* /etc/config/
-	rm -f /etc/config/DETAILS
-	sync
-	local reboot=$(uci -q get netmode.$curmode.reboot)
-	local askcred=$(uci -q get netmode.$curmode.askcred)
-	if [ "$reboot" == "0" ]; then
-		/etc/init.d/enviroment reload
-		case "$curmode" in
-			routed*)
-				ubus call uci commit '{"config":"network"}'
-			;;
-			repeater*)
-				if [ -f /etc/init.d/omcproxy ]; then
-					/etc/init.d/omcproxy stop
-				fi
-				if [ "$netreload" != "0" ]; then
-					ubus call uci commit '{"config":"network"}'
-				fi
-			;;
-		esac
-	else
-		reboot &
-	fi
-}
-
-start_client_listener() {
-	local curmode repeaterready ulcpid
-
-	config_load netmode
-	config_get repeaterready setup repeaterready 0
-
-	ulcpid=$(ps | grep "ubus listen client" | grep -v grep | awk '{print$1}')
-
-	[ $repeaterready -eq 1 ] && {
-		killall -SIGKILL netmode-client-detect >/dev/null 2>&1
-		kill -9 $ulcpid >/dev/null 2>&1
-		return
-	}
-
-	config_get curmode setup curmode
-
-	case "$curmode" in
-		repeater*)
-			killall -SIGKILL netmode-client-detect >/dev/null 2>&1
-			kill -9 $ulcpid >/dev/null 2>&1
-		;;
-		*)
-			pidof netmode-client-detect || /sbin/netmode-client-detect &
-		;;
-	esac
-}
-
-start_netmode_discover() {
-	local curmode repeaterready
-
-	killall -9 netmode-discover >/dev/null 2>&1
-
-	config_load netmode
-	config_get repeaterready setup repeaterready 0
-
-	[ $repeaterready -eq 1 ] && return
-
-	config_get curmode setup curmode
-
-	case "$curmode" in
-		repeater*)
-			/sbin/netmode-discover &
-		;;
-	esac
-}
-
-start_service() {
-	populate_netmodes
-	start_client_listener
-	start_netmode_discover
-}
-
-reload_service() {
-        switch_netmode "$1"
-
-	# set default JUCI page to overview
-	uci -q set juci.juci.homepage="overview"
-	uci commit juci
-
-	start_client_listener
-	start_netmode_discover
-}
-
-stop_service() {
-	killall -SIGKILL netmode-client-detect >/dev/null 2>&1
-	killall -9 netmode-discover >/dev/null 2>&1
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger netmode
-}
-

inteno-netmodes/files/etc/netmodes/bridged/network

@@ -1,37 +0,0 @@
-
-config interface 'loopback'
-	option is_lan '1'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config interface 'lan'
-	option is_lan '1'
-	option type 'bridge'
-	option proto 'static'
-	option ipaddr '192.168.1.1'
-	option netmask '255.255.255.0'
-	option ifname '$LAN1 $LAN2 $LAN3'
-	option ip6assign '60'
-	
-config interface 'wan'
-	option type 'anywan'
-	option proto 'dhcp'
-	option vendorid '$HARDWAREID-INTENO'
-	option hostname 'Inteno_$MAC4'
-	option ifname 'ptm0.1 atm0.1 $WAN.1'
-	option ipv6 '1'
-
-config interface 'iptv'
-	option type 'bridge'
-	option proto 'dhcp'
-	option gateway '0.0.0.0'
-	option reqopts 'staticroutes'
-	option ifname 'ptm0.100 atm1.1 $WAN.100 $LAN4'
-	option defaultroute '0'
-
-config interface 'wan6'
-	option proto 'dhcpv6'
-	option ifname '@wan'
-

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/DETAILS

@@ -1,22 +0,0 @@
-{
-	"description": [
-		{ "en" : "VoIP + Bridged IPTV" },
-		{ "sv" : "VoIP + Brygg IPTV" }
-	],
-	"explanation": [
-		{ "en" : "VoIP on dedicated VLAN + LAN4 port is bridged with IPTV VLAN" },
-		{ "sv" : "VoIP on dedicated VLAN + LAN4 port överbryggas med IPTV VLAN" }
-	],
-	"credentials" : 0,
-	"excluded_boards" : [
-		"CG300",
-		"CG301",
-		"EX400",
-		"F*"
-	],
-	"acl" : [
-		"admin",
-		"support"
-	]
-}
-

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/firewall

@@ -1,117 +0,0 @@
-config settings 'settings'
-        option disabled '0'
-
-config defaults
-	option syn_flood	1
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		REJECT
-# Uncomment this line to disable ipv6 rules
-#	option disable_ipv6	1
-
-config zone
-	option name		lan
-	list   network		'lan'
-	option input		ACCEPT
-	option output		ACCEPT
-	option forward		ACCEPT
-
-config zone
-	option name		wan
-	list   network		'wan'
-	list   network		'wan6'
-	list   network		'iptv'
-	option input		REJECT
-	option output		ACCEPT
-	option forward		REJECT
-	option masq		1
-	option mtu_fix		1
-
-config forwarding
-	option src		lan
-	option dest		wan
-
-# We need to accept udp packets on port 68,
-# see https://dev.openwrt.org/ticket/4108
-config rule
-	option name		Allow-DHCP-Renew
-	option src		wan
-	option proto		udp
-	option dest_port	68
-	option target		ACCEPT
-	option family		ipv4
-	option hidden		1
-
-# Allow IPv4 ping
-config rule
-	option name		Allow-Ping
-	option src		wan
-	option proto		icmp
-	option icmp_type	echo-request
-	option family		ipv4
-	option target		ACCEPT
-	option hidden		1
-
-# Allow DHCPv6 replies
-# see https://dev.openwrt.org/ticket/10381
-config rule
-	option name		Allow-DHCPv6
-	option src		wan
-	option proto		udp
-	option src_ip		fe80::/10
-	option src_port		547
-	option dest_ip		fe80::/10
-	option dest_port	546
-	option family		ipv6
-	option target		ACCEPT
-	option hidden		1
-
-# Allow essential incoming IPv6 ICMP traffic
-config rule
-	option name		Allow-ICMPv6-Input
-	option src		wan
-	option proto		icmp
-	list icmp_type		echo-request
-	list icmp_type		echo-reply
-	list icmp_type		destination-unreachable
-	list icmp_type		packet-too-big
-	list icmp_type		time-exceeded
-	list icmp_type		bad-header
-	list icmp_type		unknown-header-type
-	list icmp_type		router-solicitation
-	list icmp_type		neighbour-solicitation
-	list icmp_type		router-advertisement
-	list icmp_type		neighbour-advertisement
-	option limit		1000/sec
-	option family		ipv6
-	option target		ACCEPT
-	option hidden		1
-
-# Allow essential forwarded IPv6 ICMP traffic
-config rule
-	option name		Allow-ICMPv6-Forward
-	option src		wan
-	option dest		*
-	option proto		icmp
-	list icmp_type		echo-request
-	list icmp_type		echo-reply
-	list icmp_type		destination-unreachable
-	list icmp_type		packet-too-big
-	list icmp_type		time-exceeded
-	list icmp_type		bad-header
-	list icmp_type		unknown-header-type
-	option limit		1000/sec
-	option family		ipv6
-	option target		ACCEPT
-	option hidden		1
-
-# include a file with users custom iptables rules
-config include
-	option path /etc/firewall.user
-	option reload 1
-
-# include a file with rules for SIP and RTP traffic
-config include
-	option path /etc/firewall.sip
-	option reload 1
-

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/mcpd

@@ -1,18 +0,0 @@
-
-config mcpd 'mcpd'
-	option igmp_query_response_interval '10'
-	option igmp_last_member_query_interval '10'
-	option igmp_robustness_value '2'
-	option igmp_lan_to_lan_multicast '0'
-	option igmp_max_groups '25'
-	option igmp_max_sources '10'
-	option igmp_max_members '25'
-	option igmp_fast_leave '1'
-	option igmp_join_immediate '0'
-	option igmp_proxy_enable '0'
-	option igmp_snooping_enable '2'
-	option igmp_snooping_interfaces 'br-iptv'
-	option igmp_default_version '2'
-	option igmp_query_interval '120'
-	option igmp_proxy_interfaces 'iptv'
-

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/wireless

@@ -1,93 +0,0 @@
-config wifi-status 'status'
-	option wlan '1'
-	option wps '1'
-	option sched_status '0'
-	option schedule '0'
-
-config bandsteering 'bandsteering'
-	option enabled '0'
-	option policy '0'
-
-config apsteering 'apsteering'
-	option enabled '0'
-
-config wifi-device 'wl0'
-	option type 'broadcom'
-	option country 'EU/13'
-	option band 'a'
-	option bandwidth '80'
-	option hwmode 'auto'
-	option channel 'auto'
-	option scantimer '15'
-	option wmm '1'
-	option wmm_noack '0'
-	option wmm_apsd '1'
-	option txpower '100'
-	option rateset 'default'
-	option frag '2346'
-	option rts '2347'
-	option dtim_period '1'
-	option beacon_int '100'
-	option rxchainps '0'
-	option rxchainps_qt '10'
-	option rxchainps_pps '10'
-	option rifs '0'
-	option rifs_advert '0'
-	option maxassoc '32'
-	option beamforming '1'
-	option doth '1'
-	option dfsc '1'
-
-config wifi-iface
-	option device 'wl0'
-	option network 'lan'
-	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option key '$WPAKEY'
-	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
-	option wmf_bss_enable '1'
-	option bss_max '32'
-
-config wifi-device 'wl1'
-	option type 'broadcom'
-	option country 'EU/13'
-	option band 'b'
-	option bandwidth '20'
-	option hwmode 'auto'
-	option channel 'auto'
-	option scantimer '15'
-	option wmm '1'
-	option wmm_noack '0'
-	option wmm_apsd '1'
-	option txpower '100'
-	option rateset 'default'
-	option frag '2346'
-	option rts '2347'
-	option dtim_period '1'
-	option beacon_int '100'
-	option rxchainps '0'
-	option rxchainps_qt '10'
-	option rxchainps_pps '10'
-	option rifs '0'
-	option rifs_advert '0'
-	option maxassoc '32'
-	option doth '0'
-
-config wifi-iface
-	option device 'wl1'
-	option network 'lan'
-	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'mixed-psk'
-	option cipher 'auto'
-	option key '$WPAKEY'
-	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
-	option wmf_bss_enable '1'
-	option bss_max '32'
-

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/DETAILS

@@ -1,20 +0,0 @@
-{
-	"description": [
-		{ "en" : "Repeater 2.4▴▾5" },
-		{ "sv" : "Repeater 2.4▴▾5" }
-	],
-	"explanation": [
-		{ "en" : "Your router is going to act as a wired extender or wireless repeater to the selected Wireless Access Point. Uplink 2.4G & Downlink 5G" },
-		{ "sv" : "Routern kommer att fungera som en trådbunden extender eller trådlös repeater till den valda trådlösa åtkomstpunkten. Uplink 2.4G & Downlink 5G" }
-	],
-	"excluded_boards" : [
-		"DG15*",
-		"DG40*",
-		"EG40*",
-		"EX40*",
-		"F*"
-	],
-	"uplink_band" : "b",
-	"credentials" : 1,
-	"reboot" : 0
-}

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/layer2_interface_ethernet

@@ -1,6 +0,0 @@
-config ethernet_interface 'Wan'
-        option baseifname '$WAN'
-        option ifname '$WAN.1'
-        option name 'WAN'
-	option bridge '1'
-

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/network

@@ -1,15 +0,0 @@
-
-config interface 'loopback'
-	option is_lan '1'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config interface 'wan'
-	option type 'bridge'
-	option proto 'dhcp'
-	option hostname 'Inteno-$BSSID4'
-	option ifname '$WAN.1 $LAN1 $LAN2 $LAN3 $LAN4'
-	option reqopts '43'
-

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/owsd

@@ -1,39 +0,0 @@
-config owsd 'global'
-	option sock '/var/run/ubus.sock'
-	option www '/www'
-	option redirect '/cgi-bin/luci:/cacheflush.html'
-
-config owsd-listen 'loopback'
-	option port '80'
-	option interface 'loopback'
-	option ipv6 'on'
-	list origin '*'
-
-config owsd-listen 'lan'
-	option port '80'
-	option interface 'lan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	option whitelist_dhcp_domains '1'
-
-config owsd-listen 'wan'
-	option port '80'
-	option interface 'wan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	list origin '*'
-
-config owsd-listen 'wan_8080'
-	option port '8080'
-	option interface 'wan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	list origin '*'
-
-config owsd-listen 'wan_8181'
-	option port '8181'
-	option interface 'wan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	list origin '*'
-

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_5g_down/wireless

@@ -1,93 +0,0 @@
-config wifi-status 'status'
-	option wlan '1'
-	option wps '1'
-	option sched_status '0'
-	option schedule '0'
-
-config bandsteering 'bandsteering'
-	option enabled '0'
-	option policy '0'
-
-config apsteering 'apsteering'
-	option enabled '0'
-
-config wifi-device 'wl0'
-	option type 'broadcom'
-	option country 'EU/13'
-	option band 'a'
-	option bandwidth '80'
-	option hwmode '11ac'
-	option channel 'auto'
-	option scantimer '15'
-	option wmm '1'
-	option wmm_noack '0'
-	option wmm_apsd '0'
-	option txpower '100'
-	option rateset 'default'
-	option frag '2346'
-	option rts '2347'
-	option dtim_period '1'
-	option beacon_int '100'
-	option rxchainps '0'
-	option rxchainps_qt '10'
-	option rxchainps_pps '10'
-	option rifs '0'
-	option rifs_advert '0'
-	option maxassoc '32'
-	option beamforming '1'
-	option doth '1'
-	option dfsc '1'
-
-config wifi-iface
-	option device 'wl0'
-	option network 'wan'
-	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option key '$WPAKEY'
-	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
-	option wmf_bss_enable '1'
-	option bss_max '32'
-	option autoconf '1'
-
-config wifi-device 'wl1'
-	option type 'broadcom'
-	option country 'EU/13'
-	option band 'b'
-	option bandwidth '20'
-	option hwmode 'auto'
-	option channel 'auto'
-	option scantimer '15'
-	option wmm '1'
-	option wmm_noack '0'
-	option wmm_apsd '0'
-	option txpower '100'
-	option rateset 'default'
-	option frag '2346'
-	option rts '2347'
-	option dtim_period '1'
-	option beacon_int '100'
-	option rxchainps '0'
-	option rxchainps_qt '10'
-	option rxchainps_pps '10'
-	option rifs '0'
-	option rifs_advert '0'
-	option maxassoc '32'
-	option doth '0'
-	option apsta '1'
-
-config wifi-iface
-	option device 'wl1'
-	option ifname 'wl1'
-	option network 'wan'
-	option mode 'wet'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option wps_pbc '0'
-	option wmf_bss_enable '1'
-	option autoconf '1'
-

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/DETAILS

@@ -1,20 +0,0 @@
-{
-	"description": [
-		{ "en" : "Repeater 2.4▴▾2.4&5" },
-		{ "sv" : "Repeater 2.4▴▾2.4&5" }
-	],
-	"explanation": [
-		{ "en" : "Your router is going to act as a wired extender or wireless repeater to the selected Wireless Access Point. Uplink 2.4G & Downlink 2.4G + 5G" },
-		{ "sv" : "Routern kommer att fungera som en trådbunden extender eller trådlös repeater till den valda trådlösa åtkomstpunkten. Uplink 2.4G & Downlink 2.4G + 5G" }
-	],
-	"excluded_boards" : [
-		"DG15*",
-		"DG40*",
-		"EG40*",
-		"EX40*",
-		"F*"
-	],
-	"uplink_band" : "b",
-	"credentials" : 1,
-	"reboot" : 0
-}

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/layer2_interface_ethernet

@@ -1,6 +0,0 @@
-config ethernet_interface 'Wan'
-        option baseifname '$WAN'
-        option ifname '$WAN.1'
-        option name 'WAN'
-	option bridge '1'
-

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/network

@@ -1,15 +0,0 @@
-
-config interface 'loopback'
-	option is_lan '1'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config interface 'wan'
-	option type 'bridge'
-	option proto 'dhcp'
-	option hostname 'Inteno-$BSSID4'
-	option ifname '$WAN.1 $LAN1 $LAN2 $LAN3 $LAN4'
-	option reqopts '43'
-

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/owsd

@@ -1,39 +0,0 @@
-config owsd 'global'
-	option sock '/var/run/ubus.sock'
-	option www '/www'
-	option redirect '/cgi-bin/luci:/cacheflush.html'
-
-config owsd-listen 'loopback'
-	option port '80'
-	option interface 'loopback'
-	option ipv6 'on'
-	list origin '*'
-
-config owsd-listen 'lan'
-	option port '80'
-	option interface 'lan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	option whitelist_dhcp_domains '1'
-
-config owsd-listen 'wan'
-	option port '80'
-	option interface 'wan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	list origin '*'
-
-config owsd-listen 'wan_8080'
-	option port '8080'
-	option interface 'wan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	list origin '*'
-
-config owsd-listen 'wan_8181'
-	option port '8181'
-	option interface 'wan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	list origin '*'
-

inteno-netmodes/files/etc/netmodes/repeater_brcm_2g_up_dual_down/wireless

@@ -1,108 +0,0 @@
-config wifi-status 'status'
-	option wlan '1'
-	option wps '1'
-	option sched_status '0'
-	option schedule '0'
-
-config bandsteering 'bandsteering'
-	option enabled '0'
-	option policy '0'
-
-config apsteering 'apsteering'
-	option enabled '0'
-
-config wifi-device 'wl0'
-	option type 'broadcom'
-	option country 'EU/13'
-	option band 'a'
-	option bandwidth '80'
-	option hwmode '11ac'
-	option channel 'auto'
-	option scantimer '15'
-	option wmm '1'
-	option wmm_noack '0'
-	option wmm_apsd '0'
-	option txpower '100'
-	option rateset 'default'
-	option frag '2346'
-	option rts '2347'
-	option dtim_period '1'
-	option beacon_int '100'
-	option rxchainps '0'
-	option rxchainps_qt '10'
-	option rxchainps_pps '10'
-	option rifs '0'
-	option rifs_advert '0'
-	option maxassoc '32'
-	option beamforming '1'
-	option doth '1'
-	option dfsc '1'
-
-config wifi-iface
-	option device 'wl0'
-	option network 'wan'
-	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option key '$WPAKEY'
-	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
-	option wmf_bss_enable '1'
-	option bss_max '32'
-	option autoconf '1'
-
-config wifi-device 'wl1'
-	option type 'broadcom'
-	option country 'EU/13'
-	option band 'b'
-	option bandwidth '20'
-	option hwmode 'auto'
-	option channel 'auto'
-	option scantimer '15'
-	option wmm '1'
-	option wmm_noack '0'
-	option wmm_apsd '0'
-	option txpower '100'
-	option rateset 'default'
-	option frag '2346'
-	option rts '2347'
-	option dtim_period '1'
-	option beacon_int '100'
-	option rxchainps '0'
-	option rxchainps_qt '10'
-	option rxchainps_pps '10'
-	option rifs '0'
-	option rifs_advert '0'
-	option maxassoc '32'
-	option doth '0'
-	option apsta '1'
-
-config wifi-iface
-	option device 'wl1'
-	option ifname 'wl1'
-	option network 'wan'
-	option mode 'wet'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option wps_pbc '0'
-	option wmf_bss_enable '1'
-	option autoconf '1'
-
-config wifi-iface
-	option device 'wl1'
-	option network 'wan'
-	option mode 'ap'
-	option ssid 'Inteno-$BSSID4'
-	option encryption 'psk2'
-	option cipher 'auto'
-	option key '$WPAKEY'
-	option gtk_rekey '3600'
-	option macfilter '0'
-	option wps_pbc '1'
-	option wmf_bss_enable '1'
-	option bss_max '32'
-	option autoconf '1'
-

inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/DETAILS

@@ -1,17 +0,0 @@
-{
-	"description": [
-		{ "en" : "Repeater 2.4▴▾2.4&5" },
-		{ "sv" : "Repeater 2.4▴▾2.4&5" }
-	],
-	"explanation": [
-		{ "en" : "Your router is going to act as a wired extender or wireless repeater to the selected Wireless Access Point. Uplink 2.4G & Downlink 2.4G + 5G" },
-		{ "sv" : "Routern kommer att fungera som en trådbunden extender eller trådlös repeater till den valda trådlösa åtkomstpunkten. Uplink 2.4G & Downlink 2.4G + 5G" }
-	],
-	"excluded_boards" : [
-		"*G*",
-		"F*"
-	],
-	"uplink_band" : 'b',
-	"credentials" : 1,
-	"reboot" : 0
-}

inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/owsd

@@ -1,39 +0,0 @@
-config owsd 'global'
-	option sock '/var/run/ubus.sock'
-	option www '/www'
-	option redirect '/cgi-bin/luci:/cacheflush.html'
-
-config owsd-listen 'loopback'
-	option port '80'
-	option interface 'loopback'
-	option ipv6 'on'
-	list origin '*'
-
-config owsd-listen 'lan'
-	option port '80'
-	option interface 'lan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	option whitelist_dhcp_domains '1'
-
-config owsd-listen 'wan'
-	option port '80'
-	option interface 'wan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	list origin '*'
-
-config owsd-listen 'wan_8080'
-	option port '8080'
-	option interface 'wan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	list origin '*'
-
-config owsd-listen 'wan_8181'
-	option port '8181'
-	option interface 'wan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	list origin '*'
-

inteno-netmodes/files/etc/netmodes/repeater_mtk_2g_up_dual_down/wireless

@@ -1,59 +0,0 @@
-config wifi-status 'status'
-	option wlan '1'
-	option wps '1'
-	option sched_status '0'
-	option schedule '0'
-
-config bandsteering 'bandsteering'
-	option enabled '0'
-	option policy '0'
-
-config apsteering 'apsteering'
-	option enabled '0'
-
-config wifi-device  ra0
-	option band b
-	option channel  auto
-	option bandwidth '20'
-	option hwmode   auto
-	option htmode   HT20
-	option country 'DE'
-
-config wifi-iface
-	option device   ra0
-	option network  wan
-	option mode     ap
-	option ssid     Inteno-$BSSID4
-	option encryption psk2
-	option key      $WPAKEY
-	option ifname	ra0
-	option wps_pbc	1
-
-config wifi-device  rai0
-	option band a
-	option channel  auto
-	option bandwidth '80'
-	option hwmode   11ac
-	option htmode   VHT80
-	option country 'DE'
-	option beamforming 1
-
-config wifi-iface
-	option device   rai0
-	option network  wan
-	option mode     ap
-	option ssid     Inteno-$BSSID4
-	option encryption psk2
-	option key      $WPAKEY
-	option ifname	rai0
-	option wps_pbc	1
-
-config wifi-iface
-	option device   ra0
-	option network  wan
-	option mode     wet
-	option ssid     Inteno-$BSSID4
-	option encryption psk2
-	option key      $WPAKEY
-	option ifname	apcli0
-

inteno-netmodes/files/etc/netmodes/repeater_mtk_5g_up_dual_down/network

@@ -1,41 +0,0 @@
-config interface 'loopback'
-	option ifname 'lo'
-	option proto 'static'
-	option ipaddr '127.0.0.1'
-	option netmask '255.0.0.0'
-
-config device 'lan_dev'
-	option name 'eth0.1'
-	option macaddr '$MACLAN'
-
-config interface 'wan'
-	option type 'bridge'
-	option ifname 'eth0.2 eth0.1'
-	option proto 'dhcp'
-	option hostname 'Inteno-$BSSID4'
-	option reqopts '66 67 128 224'
-	option igmp_snooping '0'
-
-config device 'wan_dev'
-	option name 'eth0.2'
-	option macaddr '$MACWAN'
-
-config interface 'wan6'
-	option ifname '@wan'
-	option proto 'dhcpv6'
-
-config switch
-	option name 'switch0'
-	option reset '1'
-	option enable_vlan '1'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '1'
-	option ports '1 6t'
-
-config switch_vlan
-	option device 'switch0'
-	option vlan '2'
-	option ports '0 5t'
-

inteno-netmodes/files/etc/netmodes/repeater_mtk_5g_up_dual_down/owsd

@@ -1,39 +0,0 @@
-config owsd 'global'
-	option sock '/var/run/ubus.sock'
-	option www '/www'
-	option redirect '/cgi-bin/luci:/cacheflush.html'
-
-config owsd-listen 'loopback'
-	option port '80'
-	option interface 'loopback'
-	option ipv6 'on'
-	list origin '*'
-
-config owsd-listen 'lan'
-	option port '80'
-	option interface 'lan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	option whitelist_dhcp_domains '1'
-
-config owsd-listen 'wan'
-	option port '80'
-	option interface 'wan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	list origin '*'
-
-config owsd-listen 'wan_8080'
-	option port '8080'
-	option interface 'wan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	list origin '*'
-
-config owsd-listen 'wan_8181'
-	option port '8181'
-	option interface 'wan'
-	option ipv6 'on'
-	option whitelist_interface_as_origin '1'
-	list origin '*'
-

inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_adsl

@@ -1,13 +0,0 @@
-
-config atm_bridge
-        option link_type 'EoA'
-        option encapseoa 'llcsnap_eth'
-        option unit '0'
-        option ifname 'atm0.1'
-        option baseifname 'atm0'
-        option atmtype 'ubr'
-        option name 'atm_inet'
-        option vpi '8'
-        option vci '35'
-
-

inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_ethernet

@@ -1,5 +0,0 @@
-config ethernet_interface 'Wan'
-        option baseifname '$WAN'
-        option ifname '$WAN.1'
-        option name 'WAN'
-

inteno-netmodes/files/etc/netmodes/routed_brcm/layer2_interface_vdsl

@@ -1,9 +0,0 @@
-config vdsl_interface
-	option unit '0'
-	option ifname 'ptm0.1'
-	option baseifname 'ptm0'
-	option name 'VDSL2'
-	option dslat '1'
-	option ptmprio '1'
-	option ipqos '1'
-

inteno-netmodes/files/etc/netmodes/routed_mtk/dhcp

@@ -1,22 +0,0 @@
-config dnsmasq
-	option domainneeded	1
-	option boguspriv	1
-	option filterwin2k	0
-	option localise_queries	1
-	option rebind_protection 0
-	option rebind_localhost 1
-	option local	'/lan/'
-	option domain	'lan'
-	option expandhosts	1
-	option nonegcache	0
-	option authoritative	1
-	option readethers	1
-	option leasefile	'/tmp/dhcp.leases'
-	option resolvfile	'/tmp/resolv.conf.auto'
-
-config dhcp lan
-	option interface	lan
-	option start 	100
-	option limit	150
-	option leasetime	12h
-

inteno-netmodes/files/sbin/netmode-repeater-correction

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-MTK=0
-[ "$(db -q get hw.board.hardware)" == "EX400" ] && MTK=1
-
-if [ $MTK -eq 1 ]; then
-	WANDEV="eth0.2"
-	link=$(swconfig dev switch0 port 0 get link | awk '{print$2}' | cut -d':' -f2)
-else
-	WANDEV="$(uci get layer2_interface_ethernet.Wan.ifname)"
-	link=$(cat /sys/class/net/${WANDEV:0:4}/operstate)
-fi
-
-[ "$link" == "up" ] && action=add
-[ "$link" == "down" ] && action=remove
-[ -z "$action" ] && exit
-
-# trigger a fake hotplug net event
-INTERFACE=$WANDEV ACTION=$action /sbin/hotplug-call net

iop/config

@@ -3,11 +3,9 @@ CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
 CONFIG_DEVEL=y
-CONFIG_LOCALMIRROR="http://mirror.inteno.se/mirror"
 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,80 +15,57 @@ 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_inteno-netmodes=y
-CONFIG_PACKAGE_iperf-mt=y
+CONFIG_PACKAGE_ifbt=y
+CONFIG_PACKAGE_imonitor=y
+CONFIG_PACKAGE_inbd=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=y
+# CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_juci=y
-CONFIG_PACKAGE_juci-broadcom-dsl=y
-CONFIG_PACKAGE_juci-broadcom-ethernet=y
-CONFIG_PACKAGE_juci-broadcom-iptv=y
-CONFIG_PACKAGE_juci-broadcom-pwrmgmt=y
-CONFIG_PACKAGE_juci-broadcom-vlan=y
-CONFIG_PACKAGE_juci-wireless=y
-CONFIG_PACKAGE_juci-broadcom-xdsl=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-ethernet=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-inteno-backup=y
-CONFIG_PACKAGE_juci-mwan3=y
-CONFIG_PACKAGE_juci-inteno-provisioning=y
-CONFIG_PACKAGE_juci-inteno-qos=y
-CONFIG_PACKAGE_juci-inteno-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
+CONFIG_PACKAGE_juci-network-dsl=y
 CONFIG_PACKAGE_juci-network-netifd=y
+CONFIG_PACKAGE_juci-network-port=y
+CONFIG_PACKAGE_juci-openvpn=y
 CONFIG_PACKAGE_juci-owsd=y
-CONFIG_PACKAGE_juci-printer=y
 CONFIG_PACKAGE_juci-realtime-graphs=y
 CONFIG_PACKAGE_juci-samba=y
-CONFIG_PACKAGE_juci-simple-gui=y
 CONFIG_PACKAGE_juci-snmpd=y
 CONFIG_PACKAGE_juci-sysupgrade=y
-CONFIG_PACKAGE_juci-theme-inteno=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_layer2interface=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
@@ -98,35 +73,35 @@ 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
 CONFIG_PACKAGE_odhcpd=y
 CONFIG_PACKAGE_openssl-util=y
+CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_PACKAGE_p910nd=y
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_power-management=y
 CONFIG_PACKAGE_ppp-mod-pppoa=y
+CONFIG_PACKAGE_ppp-mod-pppoe=y
 CONFIG_PACKAGE_ppp-mod-pppol2tp=y
 CONFIG_PACKAGE_ppp-mod-pptp=y
 CONFIG_PACKAGE_ppp-multilink=y
 # CONFIG_PACKAGE_ppp is not set
-CONFIG_PACKAGE_qos-scripts=y
+# CONFIG_PACKAGE_qos-scripts is not set
 CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rdisc6=y
 CONFIG_PACKAGE_rdnssd=y
 CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rulengd=y
 CONFIG_PACKAGE_samba3=y
 CONFIG_PACKAGE_samba3-nmbd=y
 CONFIG_PACKAGE_snmpd=y
@@ -142,15 +117,19 @@ CONFIG_PACKAGE_usb-modeswitch=y
 CONFIG_PACKAGE_usbreset=y
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
+CONFIG_PACKAGE_libwifi=y
+CONFIG_PACKAGE_wifilife=y
+CONFIG_PACKAGE_wifimngr=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
-CONFIG_TARGET_CUSTOMER="INT"
+CONFIG_TARGET_CUSTOMER="IOPSYS"
 CONFIG_TARGET_ROOTFS_TARGZ=y
 # CONFIG_USE_SSTRIP is not set
 CONFIG_USE_STRIP=y
 CONFIG_BUILD_LOG=y
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
+CONFIG_BUSYBOX_CONFIG_ARPING=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
 CONFIG_BUSYBOX_CONFIG_DELUSER=y
@@ -158,9 +137,9 @@ CONFIG_BUSYBOX_CONFIG_DELUSER=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q=y
 CONFIG_BUSYBOX_CONFIG_FIRST_SYSTEM_ID=100
 CONFIG_BUSYBOX_CONFIG_HTTPD=y
-CONFIG_BUSYBOX_CONFIG_INSMOD=y
-CONFIG_BUSYBOX_CONFIG_MODINFO=y
-CONFIG_BUSYBOX_CONFIG_MODPROBE=y
+# CONFIG_BUSYBOX_CONFIG_INSMOD is not set
+# CONFIG_BUSYBOX_CONFIG_MODINFO is not set
+# CONFIG_BUSYBOX_CONFIG_MODPROBE is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_MODPROBE_BLACKLIST=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_MODUTILS_ALIAS=y
@@ -169,14 +148,13 @@ CONFIG_BUSYBOX_CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 CONFIG_BUSYBOX_CONFIG_LAST_SYSTEM_ID=999
 CONFIG_BUSYBOX_CONFIG_LOGIN=y
-CONFIG_BUSYBOX_CONFIG_LSMOD=y
+# CONFIG_BUSYBOX_CONFIG_LSMOD is not set
 CONFIG_BUSYBOX_CONFIG_LSPCI=y
 CONFIG_BUSYBOX_CONFIG_LSUSB=y
 CONFIG_BUSYBOX_CONFIG_MICROCOM=y
-CONFIG_BUSYBOX_CONFIG_RMMOD=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
@@ -190,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
@@ -203,9 +179,15 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
 # CONFIG_BUSYBOX_CONFIG_LOGIN_SESSION_AS_CHILD is not set
 # CONFIG_BUSYBOX_CONFIG_PAM is not set
 # CONFIG_BUSYBOX_CONFIG_TFTP_DEBUG is not set
+# CONFIG_BUSYBOX_CONFIG_NTPD is not set
 CONFIG_LIBCURL_CRYPTO_AUTH=y
+# CONFIG_LIBCURL_MBEDTLS is not set
+CONFIG_LIBCURL_OPENSSL=y
 CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_SAMBA3_CONFIG_NO_PRINTING is not set
 # CONFIG_SIGNED_PACKAGES is not set
 CONFIG_KERNEL_DEVTMPFS=y
 CONFIG_KERNEL_DEVTMPFS_MOUNT=y
+# CONFIG_BUSYBOX_CONFIG_IP is not set
+LOCAL_MIRROR="http://download.iopsys.eu/iopsys/mirror/"
+

iop/configs/luci.diff

@@ -1,38 +0,0 @@
-CONFIG_PACKAGE_luci=y
-CONFIG_PACKAGE_luci-mod-admin-core=y
-CONFIG_PACKAGE_luci-mod-admin-full=y
-CONFIG_PACKAGE_luci-app-ddns=y
-CONFIG_PACKAGE_luci-app-dslstats=y
-CONFIG_PACKAGE_luci-app-firewall=y
-CONFIG_PACKAGE_luci-app-iup=y
-CONFIG_PACKAGE_luci-app-mcpd=y
-CONFIG_PACKAGE_luci-app-minidlna=y
-CONFIG_PACKAGE_luci-app-multiwan=y
-CONFIG_PACKAGE_luci-app-p910nd=y
-CONFIG_PACKAGE_luci-app-parental-control=y
-CONFIG_PACKAGE_luci-app-port-management=y
-CONFIG_PACKAGE_luci-app-power-mgmt=y
-CONFIG_PACKAGE_luci-app-samba=y
-CONFIG_PACKAGE_luci-app-sfp=y
-CONFIG_PACKAGE_luci-app-snmp=y
-CONFIG_PACKAGE_luci-app-speedtest=y
-CONFIG_PACKAGE_luci-app-upnp=y
-CONFIG_PACKAGE_luci-app-voice=y
-CONFIG_PACKAGE_luci-theme-base=y
-CONFIG_PACKAGE_luci-theme-bootstrap=y
-CONFIG_PACKAGE_luci-i18n-english=y
-CONFIG_PACKAGE_luci-proto-3g=y
-CONFIG_PACKAGE_luci-proto-4g=y
-CONFIG_PACKAGE_luci-proto-core=y
-CONFIG_PACKAGE_luci-proto-ipv6=y
-CONFIG_PACKAGE_luci-proto-ppp=y
-CONFIG_PACKAGE_luci-sgi-cgi=y
-CONFIG_PACKAGE_luci-lib-core=y
-CONFIG_PACKAGE_luci-lib-core_source=y
-CONFIG_PACKAGE_luci-lib-ipkg=y
-CONFIG_PACKAGE_luci-lib-json=y
-CONFIG_PACKAGE_luci-lib-nixio=y
-CONFIG_PACKAGE_luci-lib-nixio_notls=y
-CONFIG_PACKAGE_luci-lib-sys=y
-CONFIG_PACKAGE_luci-lib-web=y
-

iop/iop.completion

@@ -5,14 +5,14 @@
 
 _iop_get_profiles()
 {
-    find feeds/feed_inteno_targets/iopsys-*/ -name '*.diff' \
+    find feeds/targets/iopsys-*/ -name '*.diff' \
         |awk -F'/' '{print$NF}' \
         |awk -F. '{print$1}'
 }
 
 _iop_get_models()
 {
-    find feeds/feed_inteno_targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
+    find feeds/targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
         |awk -F'/' '{print$NF}' \
         |egrep '^(cg|dg|eg|vg|vox)[0-9]'
 }
@@ -34,9 +34,8 @@ _iop()
 
     iopcmds="bootstrap cfe_upgrade cfe_upgrade_latest extract_core \
              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"
+             scp_changes setup_host ssh_install_key status \
+             update_package update_feed_branches ssh_upgrade"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 
@@ -76,7 +75,13 @@ _iop()
                 fi
                 return 0
                 ;;
-
+            ssh_upgrade)
+	        if [ "$prev" == "-f" ] ; then
+		    _filedir
+		else
+		    COMPREPLY=( $(compgen -W "-f -t -i -n -x -b" -- ${cur}) )
+		fi
+	         ;;
             *)
                 # No arguments or arguments not supported yet
                 ;;

iop/scripts/annexconfig.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+function disable_add_config () {
+	local COPTION="$1"
+
+	HAVE_OPTION=`grep $COPTION .config | wc -l`
+	HAVE_OPTION_DISABLED=`grep "# $COPTION" .config | wc -l`
+	if [ "$HAVE_OPTION" = "1" ]
+	then
+		if [ "$HAVE_OPTION_DISABLED" = "0" ]
+		then
+			sed -i -e "s,$COPTION=y,# $COPTION is not set,g" .config
+		fi
+	else
+		echo "# $COPTION is not set" >> .config
+	fi
+}
+
+function enable_option () {
+	local COPTION="$1"
+#	cat .config| grep DSL
+	sed -i -e "s,# $COPTION is not set,$COPTION=y,g" .config
+#	cat .config| grep DSL
+}
+
+function annexconfig {
+
+	v() {
+		[ "$VERBOSE" -ge 1 ] && echo "$@"
+	}
+
+	local ANNEX="$1"
+
+	disable_add_config CONFIG_TARGET_NO_DSL
+	disable_add_config CONFIG_TARGET_DSL_ANNEX_A
+	disable_add_config CONFIG_TARGET_DSL_ANNEX_B
+	disable_add_config CONFIG_TARGET_DSL_ANNEX_C
+	disable_add_config CONFIG_TARGET_DSL_SADSL
+	disable_add_config CONFIG_TARGET_DSL_GFAST
+
+
+	if [ "$ANNEX" = "no" ]
+	then
+		echo "No DSL"
+		enable_option CONFIG_TARGET_NO_DSL
+	elif [ "$ANNEX" = "a" ]
+	then
+		echo "Annex A"
+		enable_option CONFIG_TARGET_DSL_ANNEX_A
+	elif [ "$ANNEX" = "b" ]
+	then
+		echo "Annex B"
+		enable_option CONFIG_TARGET_DSL_ANNEX_B
+	elif [ "$ANNEX" = "c" ]
+	then
+		echo "Annex C"
+		enable_option CONFIG_TARGET_DSL_ANNEX_C
+	elif [ "$ANNEX" = "sadsl" ]
+	then
+		echo "sadsl"
+		enable_option CONFIG_TARGET_DSL_SADSL
+	elif [ "$ANNEX" = "gfast" ]
+	then
+		echo "G.fast"
+		enable_option CONFIG_TARGET_DSL_GFAST
+	else
+		echo "Only option no,a,b,c,sadsl,gfast supported"
+	fi
+
+}
+
+register_command "annexconfig" "Select configuration annex"

iop/scripts/build_branch.sh

@@ -0,0 +1,60 @@
+#!/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/extract_core.sh

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

iop/scripts/extract_top.sh

@@ -0,0 +1,71 @@
+#!/bin/bash
+
+function extract_top {
+	tmp_dir=extract_top_tmp
+
+	# Paths to packages that should be ignored.
+	paths+='package/network/services/dnsmasq '
+	paths+='package/network/config/firewall '
+	paths+='package/network/config/netifd '
+	paths+='package/network/config/qos-scripts '
+	paths+='package/utils/busybox '
+	paths+='package/base-files '
+	paths+='package/system/procd '
+	paths+='package/system/rpcd '
+	paths+='package/network/services/openvpn '
+
+	function extract {
+
+		current_branch=$(git rev-parse --abbrev-ref HEAD)
+		git format-patch $start_commit -o $tmp_dir #> /dev/null
+
+		ls $tmp_dir |
+			while read file; do
+				# Remove feed patches.
+				#			echo $file | grep -i Update-feed > /dev/null && \
+				#				rm $tmp_dir/$file && continue
+				cat $tmp_dir/$file | grep "+++ b/feeds.conf" > /dev/null && \
+					rm $tmp_dir/$file && continue
+				
+				# Remove core patches.
+				for path in $paths; do
+					cat $tmp_dir/$file | grep $path > /dev/null && \
+						rm $tmp_dir/$file && break
+				done
+			done
+
+		git checkout -b ${current_branch}-new $start_commit
+		git am $tmp_dir/*
+		git checkout $current_branch
+		rm -rf $tmp_dir
+	}
+	
+	function print_usage {
+
+		echo "Usage:"
+		echo "  $0 -s <start_commit>"
+	}
+
+	# Execute user command
+	while getopts "s:" opt; do
+		case $opt in
+			s)
+				start_commit=${OPTARG}
+				;;
+			\?)
+				print_usage
+				exit 1
+				;;
+		esac
+	done
+
+	if [ ! -n "$start_commit" ]; then
+   		print_usage
+		exit 1
+	fi
+
+	extract
+
+}
+
+register_command "extract_top" "Extract commits made to top repo"

iop/scripts/feeds_update.sh

@@ -28,16 +28,19 @@ function feeds_update {
 
     # replace core packages with iopsys versions
     if [ $override == 1 ]; then
-	./scripts/feeds install -f -p feed_inteno_openwrt -a
+		./scripts/feeds install -f -p lede_core -a
     fi
 
     # targets need to be installed explicitly
-    ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-mips
-    ./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-arm
-    ./scripts/feeds install -p feed_inteno_targets iopsys-ramips
-    
+    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
@@ -46,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