Ticket refs #14120: TR-069: Add STUN support

ated/Makefile

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

catv/files/etc/config/catv

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

dectmngr2/Makefile

@@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
 PKG_VERSION:=1.2.0
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
+PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0c029ed2486342e7e7687631b702d5c743f3c41a
+PKG_SOURCE_VERSION:=dafaf749e89d1efaa7eb02709a3c0ef3e813c052
 PKG_NAME:=dectmngr2
 
 
@@ -21,7 +21,6 @@ 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
 
@@ -29,7 +28,7 @@ define Package/dectmngr2
   CATEGORY:=Utilities
   TITLE:=Dectmngr2
   URL:=
-  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent
+  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus
 endef
 
 define Package/dectmngr2/description
@@ -42,7 +41,6 @@ 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/
@@ -50,7 +48,6 @@ 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

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

easy-soc-libs/Config.in

@@ -1,19 +0,0 @@
-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
-
-endmenu
-endif

endptmngr/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
 PKG_VERSION:=0.2
-PKG_SOURCE_VERSION:=a78fe95d5c5a0a320f3b62b9d2faafd07b56e3a7
+PKG_SOURCE_VERSION:=0cb8accbac3355b97a17064ec7da010a2c42db7b
 
 
 ifeq ($(CONFIG_ENDPT_OPEN),y)
@@ -18,7 +18,7 @@ PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION
 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_URL:=git@private.inteno.se:endptmngr
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_NAME:=endptmngr

endptmngr/files/dect.config

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

eventlog/Makefile

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

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@dev.iopsys.eu:3rdparty/gigaset-elements.git
+PKG_GIGASET_ELEMENTS_SRC_URL ?= git@public.inteno.se:gigaset-elements.git
 PKG_GIGASET_ELEMENTS_VERSION ?= v$(PKG_VERSION)
 
 PKG_SOURCE_URL:=$(PKG_GIGASET_ELEMENTS_SRC_URL)

ice-client/Makefile

@@ -19,14 +19,14 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=5.3.6
+BASE_PKG_VERSION:=5.1.1
 PKG_RELEASE:=
-PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
+PKG_VERSION:=$(BASE_PKG_VERSION)$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=94aab1532fef2caf2d65579614fc413252a517eb
+PKG_SOURCE_VERSION:=e8bf50630e6ba12dc2d223112643077c4db49189
 ifeq ($(CONFIG_ICE_OPEN),y)
 TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/

ice-client/files/ice-client.uci_default

@@ -7,9 +7,6 @@ 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
 
@@ -19,7 +16,7 @@ cat >> /etc/config/rpcd << EOF
 config login
 	option username 'ice'
 	option password '\$p\$ice'
-	list _access_w 'none'
+	list _access_r 'none'
 	list write 'user-user'
 	list write 'juci-broadcom-dsl'
 	list write 'juci-broadcom-dsl-admin'
@@ -66,9 +63,5 @@ 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

@@ -29,7 +29,7 @@ config CWMP_DEVEL_DEBUG
 
 config LIBDATAMODEL_VENDOR_PREFIX
     string "Vendor Prefix"
-    default "X_IOPSYS_EU_"
+    default "X_Inteno_SE_"
     
 endif
 

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-04-25
+PKG_VERSION:=4.0-2018-07-16
 PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
+PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cd777bbd2dbe7477ec7665f12d3d20e6b2e9e052
+PKG_SOURCE_VERSION:=d22821b251277584cfbcce98a98a4261813418ce
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -22,7 +22,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
 	CONFIG_CWMP_ACS_HDM \
 	CONFIG_CWMP_DEBUG \
-	CONFIG_CWMP_DEVEL_DEBUG
+	CONFIG_CWMP_DEVEL_DEBUG 
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -44,13 +44,6 @@ define Package/icwmp_stun
 	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/Default
   SECTION:=utils
   CATEGORY:=Utilities
@@ -191,16 +184,7 @@ define Package/icwmp_stun/install
 	$(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
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/icwmp_stun $(1)/etc/config
 endef
 
 define Build/InstallDev
@@ -237,5 +221,4 @@ endef
 $(eval $(call BuildPackage,icwmp-curl))
 $(eval $(call BuildPackage,libdatamodel))
 $(eval $(call BuildPackage,icwmp_stun))
-$(eval $(call BuildPackage,icwmp_xmpp))
 $(eval $(call BuildPackage,icwmp-zstream))

icwmp/files/etc/hotplug.d/iface/90-icwmp

@@ -63,23 +63,13 @@ handle_icwmp_restart() {
 	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
-	}
+	] && exit 0
 
 	/etc/init.d/icwmpd reload &
 }

ifbt/Makefile

@@ -1,52 +0,0 @@
-#
-# Copyright (C) 2018 iopsys Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ifbt
-PKG_VERSION:=0.1
-
-PKG_SOURCE_VERSION:=0286812ed8036dea758f904694dc416481fba64d
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ifbt.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-TARGET_PLATFORM:=-DIOPSYS_BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-TARGET_PLATFORM:=-DIOPSYS_BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-TARGET_PLATFORM:=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-TARGET_PLATFORM:=-DIOPSYS_INTEL
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-TARGET_PLATFORM:=-DIOPSYS_MEDIATEK
-else
-$(info (UNEXPECTED CONFIG TARGET))
-endif
-
-export TARGET_PLATFORM
-
-define Package/ifbt
-	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c  +libwifi +libjson-c
-	TITLE:=Fast BSS Transition
-endef
-
-define Package/ifbt/description
-	ifbt is Iopsys application for fast BSS transition
-endef
-
-define Package/ifbt/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ifbt $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,ifbt))

imonitor/Makefile

@@ -11,7 +11,7 @@ PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
+PKG_SOURCE_URL:=http://public.inteno.se/imonitor.git
 PKG_SOURCE_VERSION:=532f4900862bcb45d8cd4bf37555fabda81750b6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}

inbd/Makefile

@@ -12,9 +12,9 @@ PKG_NAME:=inbd
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=12755fccb8ef87965ac684d62d56e19e73a255bd
+PKG_SOURCE_VERSION:=f81c146f0b07540877545e5ab644ec8e29905a4d
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
+PKG_SOURCE_URL:=http://public.inteno.se/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,11 +1,15 @@
+#
+# Copyright (C) 2016 Inteno
+#
+
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=netmode
+PKG_NAME:=inteno-netmodes
 PKG_VERSION:=0.2.0
 
-PKG_SOURCE_VERSION:=9fa23664b3bdd963e4556f5921c9f9be1c9c578f
+PKG_SOURCE_VERSION:=fbd7dcfab03df19b3c32675940e0aee708c7cf75
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/netmoded
+PKG_SOURCE_URL:=http://public.inteno.se:/netmoded
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -13,20 +17,20 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/netmode
+define Package/inteno-netmodes
 	CATEGORY:=Base system
 	DEPENDS:=+fping +ubus +libubox +libuci
 	TITLE:=Predefined Network Modes
 endef
 
-define Package/netmode/description
+define Package/inteno-netmodes/description
 	Predefined Network Modes
 endef
 
-define Package/netmode/install
+define Package/inteno-netmodes/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netmoded $(1)/sbin/
 endef
 
-$(eval $(call BuildPackage,netmode))
+$(eval $(call BuildPackage,inteno-netmodes))

inteno-netmodes/files/etc/config/netmode

@@ -3,7 +3,3 @@ config mode 'setup'
         option detail ''
         option curmode 'routed'
 
-config tools 'tools'
-	option wificontrol 1
-	option arp_discovery 1
-

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

@@ -18,8 +18,8 @@ config interface 'lan'
 config interface 'wan'
 	option type 'anywan'
 	option proto 'dhcp'
-	option hostname 'iopsys-$MAC'
-	option vendorid '$HARDWAREID'
+	option vendorid '$HARDWAREID-INTENO'
+	option hostname 'Inteno_$MAC4'
 	option ifname 'ptm0.1 atm0.1 $WAN.1'
 	option ipv6 '1'
 

inteno-netmodes/files/etc/netmodes/bridged/wireless

@@ -18,7 +18,7 @@ config wifi-device 'wl0'
 	option bandwidth '80'
 	option hwmode 'auto'
 	option channel 'auto'
-	option scantimer '60'
+	option scantimer '15'
 	option wmm '1'
 	option wmm_noack '0'
 	option wmm_apsd '1'
@@ -42,7 +42,7 @@ config wifi-iface
 	option device 'wl0'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'iopsys-$BSSID4'
+	option ssid 'Inteno-$BSSID4'
 	option encryption 'psk2'
 	option cipher 'auto'
 	option key '$WPAKEY'
@@ -60,7 +60,7 @@ config wifi-device 'wl1'
 	option bandwidth '20'
 	option hwmode 'auto'
 	option channel 'auto'
-	option scantimer '60'
+	option scantimer '15'
 	option wmm '1'
 	option wmm_noack '0'
 	option wmm_apsd '1'
@@ -82,7 +82,7 @@ config wifi-iface
 	option device 'wl1'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'iopsys-$BSSID4'
+	option ssid 'Inteno-$BSSID4'
 	option encryption 'mixed-psk'
 	option cipher 'auto'
 	option key '$WPAKEY'

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

@@ -0,0 +1,23 @@
+{
+	"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*",
+		"SDX810-AP"
+	],
+	"acl" : [
+		"admin",
+		"support"
+	]
+}
+

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

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

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

@@ -0,0 +1,88 @@
+
+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 $WAN.100 $LAN4'
+	option defaultroute '0'
+
+config interface 'voip'
+	option type 'anywan'
+	option proto 'dhcp'
+	option gateway '0.0.0.0'
+	option reqopts 'staticroutes'
+	option ifname 'ptm0.200 $WAN.200'
+	option defaultroute '0'
+
+config interface 'wan6'
+	option proto 'dhcpv6'
+	option ifname '@wan'
+
+config device 'atmwan'
+	option type 'untagged'
+	option ifname 'atm0'
+	option name 'atm0.1'
+
+config device 'ptmwan'
+	option type 'untagged'
+	option ifname 'ptm0'
+	option name 'ptm0.1'
+
+config device 'ethwan'
+	option type 'untagged'
+	option ifname '$WAN'
+	option name '$WAN.1'
+
+config device 'ethtv'
+	option type '8021q'
+	option name '$WAN.100'
+	option ifname '$WAN'
+	option vid '100'
+	option priority '0'
+
+config device 'ptmtv'
+	option type '8021q'
+	option name 'ptm0.100'
+	option ifname 'ptm0'
+	option vid '100'
+	option priority '0'
+
+config device 'ethvoip'
+	option type '8021q'
+	option name '$WAN.200'
+	option ifname '$WAN'
+	option vid '200'
+	option priority '0'
+
+config device 'ptmvoip'
+	option type '8021q'
+	option name 'ptm0.200'
+	option ifname 'ptm0'
+	option vid '200'
+	option priority '0'
+

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

@@ -18,7 +18,7 @@ config wifi-device 'wl0'
 	option bandwidth '80'
 	option hwmode 'auto'
 	option channel 'auto'
-	option scantimer '60'
+	option scantimer '15'
 	option wmm '1'
 	option wmm_noack '0'
 	option wmm_apsd '1'
@@ -42,7 +42,7 @@ config wifi-iface
 	option device 'wl0'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'iopsys-$BSSID4'
+	option ssid 'Inteno-$BSSID4'
 	option encryption 'psk2'
 	option cipher 'auto'
 	option key '$WPAKEY'
@@ -60,7 +60,7 @@ config wifi-device 'wl1'
 	option bandwidth '20'
 	option hwmode 'auto'
 	option channel 'auto'
-	option scantimer '60'
+	option scantimer '15'
 	option wmm '1'
 	option wmm_noack '0'
 	option wmm_apsd '1'
@@ -82,7 +82,7 @@ config wifi-iface
 	option device 'wl1'
 	option network 'lan'
 	option mode 'ap'
-	option ssid 'iopsys-$BSSID4'
+	option ssid 'Inteno-$BSSID4'
 	option encryption 'mixed-psk'
 	option cipher 'auto'
 	option key '$WPAKEY'

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

@@ -0,0 +1,21 @@
+{
+	"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*",
+		"SDX*",
+		"F*"
+	],
+	"uplink_band" : "b",
+	"credentials" : 1,
+	"reboot" : 0
+}

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

@@ -0,0 +1,20 @@
+
+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'
+
+config device 'ethwan'
+	option type 'untagged'
+	option ifname '$WAN'
+	option name '$WAN.1'
+

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

@@ -0,0 +1,93 @@
+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 ifname 'wl0'
+
+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 ifname 'wl1'
+

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

@@ -0,0 +1,21 @@
+{
+	"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*",
+		"SDX*",
+		"F*"
+	],
+	"uplink_band" : "b",
+	"credentials" : 1,
+	"reboot" : 0
+}

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

@@ -0,0 +1,20 @@
+
+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'
+
+config device 'ethwan'
+	option type 'untagged'
+	option ifname '$WAN'
+	option name '$WAN.1'
+

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

@@ -0,0 +1,108 @@
+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 ifname 'wl0'
+
+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 ifname 'wl1'
+

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

@@ -0,0 +1,17 @@
+{
+	"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/network

@@ -13,10 +13,9 @@ config interface 'wan'
 	option type 'bridge'
 	option ifname 'eth0.2 eth0.1'
 	option proto 'dhcp'
-	option hostname 'iopsys-$MAC'
+	option hostname 'Inteno-$BSSID4'
 	option reqopts '66 67 128 224'
 	option igmp_snooping '0'
-	option macaddr '$MACWAN'
 
 config device 'wan_dev'
 	option name 'eth0.2'
@@ -40,5 +39,5 @@ config switch_vlan
 config switch_vlan
 	option device 'switch0'
 	option vlan '2'
-	option ports '0 6t'
+	option ports '0 5t'
 

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

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

@@ -0,0 +1,43 @@
+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'
+	option vid 1
+
+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'
+	option vid 2
+
+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/wireless

@@ -23,7 +23,7 @@ config wifi-iface
 	option device   ra0
 	option network  wan
 	option mode     ap
-	option ssid     iopsys-$BSSID4
+	option ssid     Inteno-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
 	option ifname	ra0
@@ -42,7 +42,7 @@ config wifi-iface
 	option device   rai0
 	option network  wan
 	option mode     ap
-	option ssid     iopsys-$BSSID4
+	option ssid     Inteno-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
 	option ifname	rai0
@@ -52,7 +52,7 @@ config wifi-iface
 	option device   rai0
 	option network  wan
 	option mode     wet
-	option ssid     iopsys-$BSSID4
+	option ssid     Inteno-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
 	option ifname	apclii0

inteno-netmodes/files/etc/netmodes/routed_brcm/network

@@ -18,8 +18,8 @@ config interface 'lan'
 config interface 'wan'
 	option type 'anywan'
 	option proto 'dhcp'
-	option hostname 'iopsys-$MAC'
-	option vendorid '$HARDWAREID'
+	option vendorid '$HARDWAREID-INTENO'
+	option hostname 'Inteno_$MAC4'
 	option ifname 'ptm0.1 atm0.1 $WAN.1'
 	option ipv6 '1'
 

inteno-netmodes/files/etc/netmodes/routed_brcm/wireless

@@ -0,0 +1,95 @@
+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'
+	option ifname 'wl0'
+
+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'
+	option ifname 'wl1'
+

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

@@ -0,0 +1,22 @@
+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/etc/netmodes/routed_mtk/network

@@ -21,8 +21,8 @@ config device 'lan_dev'
 config interface 'wan'
 	option ifname 'eth0.2'
 	option proto 'dhcp'
-	option hostname 'iopsys-$MAC'
-	option vendorid '$HARDWAREID'
+	option hostname '$IOPHOSTNAME-$MAC'
+	option vendorid '$HARDWAREID-INTENO'
 	option reqopts '66 67 128 224'
 
 config device 'wan_dev'
@@ -47,5 +47,5 @@ config switch_vlan
 config switch_vlan
 	option device 'switch0'
 	option vlan '2'
-	option ports '0 6t'
+	option ports '0 5t'
 

inteno-netmodes/files/etc/netmodes/routed_mtk/wireless

@@ -18,13 +18,12 @@ config wifi-device  ra0
 	option hwmode   auto
 	option htmode   HT20
 	option country 'DE'
-	option scantimer '60'
 
 config wifi-iface
 	option device   ra0
 	option network  lan
 	option mode     ap
-	option ssid     iopsys-$BSSID4
+	option ssid     Inteno-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
 	option wps_pbc	1
@@ -38,13 +37,12 @@ config wifi-device  rai0
 	option htmode   VHT80
 	option country 'DE'
 	option beamforming 1
-	option scantimer '60'
 
 config wifi-iface
 	option device   rai0
 	option network  lan
 	option mode     ap
-	option ssid     iopsys-$BSSID4
+	option ssid     Inteno-$BSSID4
 	option encryption psk2
 	option key      $WPAKEY
 	option wps_pbc	1

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

@@ -34,7 +34,7 @@ disable_firewall() {
 	/etc/init.d/firewall reload
 }
 
-is_known_macaddr()
+is_inteno_macaddr()
 {
 	macaddr=$1
 
@@ -91,43 +91,22 @@ correct_uplink() {
 		wetcfg="$(get_wifi_iface_cfgstr $WETIF)"
 		wetnet="$(uci -q get $wetcfg.network)"
 		wetmac="$(ifconfig $WETIF | grep HWaddr | awk '{print$NF}')"
-		ethwanmac="$(ifconfig $WANDEV | grep HWaddr | awk '{print$NF}')"
 		if [ -d /sys/class/net/br-$wetnet ]; then
-			if [ "$link" == "up" ]; then
-				ifconfig br-$wetnet hw ether $ethwanmac
-			else
-				ifconfig br-$wetnet hw ether $wetmac
-			fi
+			ifconfig br-$wetnet hw ether $wetmac
 			#touch -f /tmp/netmodes/uplink-macaddr-corrected
 		fi
 	fi
 
 	if [ "$link" == "up" ]; then
 		ubus call network.device set_state "{\"name\":\"$WETIF\", \"defer\":true}"
-		ifconfig $WETIF down
-		echo ethernet > /tmp/netmodes/uplink_type
 		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":false}"
 	else
 		ubus call network.device set_state "{\"name\":\"$WETIF\", \"defer\":false}"
-		ifconfig $WETIF up
-		echo wireless > /tmp/netmodes/uplink_type
 		ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":true}"
 		ubus call led.internet  set '{"state" : "notice"}'
 	fi
 }
 
-run_netmode_scripts() {
-	local mode=$1
-	local when=$2
-	local script
-	if [ -d /etc/netmodes/$mode/scripts/$when ]; then
-		logger -s -p user.info -t $0 "[netmode] Executing $when netmode scripts" >/dev/console
-		for script in $(ls /etc/netmodes/$mode/scripts/$when/); do
-			sh /etc/netmodes/$mode/scripts/$when/$script
-		done
-	fi
-}
-
 switch_netmode() {
 	local newmode="$1"
 
@@ -176,26 +155,14 @@ switch_netmode() {
         echo $curmode >$OLD_MODE_FILE
 
 	[ -d "/etc/netmodes/$curmode" ] || return
-
-	run_netmode_scripts $curmode "pre"
-
 	logger -s -p user.info -t $0 "[netmode] Copying /etc/netmodes/$curmode in /etc/config" >/dev/console
-
-	for file in $(ls /etc/netmodes/$curmode/); do
-		case "$file" in
-			DETAILS|scripts) continue ;;
-		esac
-		cp /etc/netmodes/$curmode/$file /etc/config/
-	done
+	cp /etc/netmodes/$curmode/* /etc/config/
+	rm -f /etc/config/DETAILS
 	sync
 
-	#commit owsd to reload all init.d scripts dependent on its config
-	ubus call uci commit '{"config":"owsd"}'
-
 	local reboot=$(uci -q get netmode.$curmode.reboot)
 
 	if [ "$reboot" != "0" ]; then
-		run_netmode_scripts $curmode "post"
 		reboot &
 		exit
 	fi
@@ -207,7 +174,6 @@ switch_netmode() {
 			logger -s -p user.info -t $0 "Switching to $curmode mode" > /dev/console
 			ubus call leds set  '{"state" : "allflash"}'
 			[ -f /etc/init.d/omcproxy ] && /etc/init.d/omcproxy stop
-			[ -f /etc/init.d/igmpproxy ] && /etc/init.d/igmpproxy stop
 			[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
 			ubus call network reload
 			wifi reload nodat
@@ -222,8 +188,6 @@ switch_netmode() {
 			ubus call uci commit '{"config":"network"}'
 		;;
 	esac
-
-	run_netmode_scripts $curmode "post"
 }
 
 wificontrol_takes_over() {
@@ -386,10 +350,7 @@ populate_netmodes() {
 			if json_select acl; then
 				_i=1
 				while json_get_var user $_i; do
-					uci del_list netmode.$mode._access_r="$user"
-					uci del_list netmode.$mode._access_w="$user"
 					uci add_list netmode.$mode._access_r="$user"
-					uci add_list netmode.$mode._access_w="$user"
 					_i=$((_i+1))
 				done
 				json_select ..
@@ -438,19 +399,17 @@ populate_netmodes() {
 }
 
 start_netmode_tools() {
-	local curmode repeaterready wificontrol discover
+	local curmode repeaterready
 
 	killall -9 wificontrol >/dev/null 2>&1
 	killall -9 netmode-discover >/dev/null 2>&1
 
 	config_load netmode
 	config_get_bool repeaterready setup repeaterready 0
-	config_get_bool wificontrol tools wificontrol 1
-	config_get_bool arp_discovery tools arp_discovery 1
 
 	[ $repeaterready -eq 1 ] && {
-		[ $arp_discovery -eq 1 ] && /sbin/netmode-discover &
-		[ $wificontrol -eq 1 ] && /sbin/wificontrol --repeater &
+		/sbin/netmode-discover &
+		/sbin/wificontrol --repeater &
 		return
 	}
 
@@ -458,8 +417,8 @@ start_netmode_tools() {
 
 	case "$curmode" in
 		repeater*)
-			[ $arp_discovery -eq 1 ] && /sbin/netmode-discover &
-			[ $wificontrol -eq 1 ] && /sbin/wificontrol --repeater &
+			/sbin/netmode-discover &
+			/sbin/wificontrol --repeater &
 		;;
 	esac
 }

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

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

inteno-netmodes/files/sbin/testnet

@@ -51,11 +51,6 @@ ping_uplink()
 	elif [ "$hasmode" == "1" ]; then
 		arping -f -q -c1 -w3 -I $device $ipaddr
 		[ $? -eq 1 ] && rv=0 || rv=1
-
-		if [ "$rv" == "0" ]; then
-			ping -c2 -w5 $ipaddr >/dev/null
-			[ $? -eq 1 ] && rv=0 || rv=1
-		fi
 	else
 		SLEEP_TIME=5
 		ubus call led.internet  set '{"state" : "off"}'
@@ -133,8 +128,7 @@ ping_uplink()
 	else
 		grep -q "true" /tmp/internet_connection_status 2>/dev/null || logger -s -p user.info -t "testnet" "Uplink connection is gained" >/dev/console
 		echo "{ \"online\" : true }" > /tmp/internet_connection_status
-		leden="$(uci -q get leds.internet.enable)"
-		[ "$leden" == "1" ] && ubus call led.internet  set '{"state" : "eok"}'
+		ubus call led.internet  set '{"state" : "eok"}'
 
 		SLEEP_TIME=5
 
@@ -205,21 +199,19 @@ internet_test() {
 	fi
 }
 
-iptv_test() {
+iptvtest() {
+	ubus list led.ext >/dev/null 2>&1 && TVCON=1 || return
+
 	local dest="$(uci -q get system.@system[0].tvping_addr)"
 
-	[ -n "$dest" ] || return
-
-	ubus list led.ext >/dev/null 2>&1 || return
-
 	test_connection $dest
 
 	if [ "$?" -eq 0 ]; then
 		TVCON=1
-		ubus call led.ext set '{"state" : "ok"}'
+		[ -n "$dest" ] && ubus call led.ext  set '{"state" : "ok"}'
 	else
 		TVCON=0
-		ubus call led.ext set '{"state" : "off"}'
+		[ -n "$dest" ] && ubus call led.ext  set '{"state" : "off"}'
 	fi
 }
 
@@ -252,8 +244,6 @@ connectivity_test() {
 		[ "$CURSTATUS" == "$LASTSTATUS" ] || ubus send internet '{"status" : "offline"}'
 		LASTSTATUS=0
 	fi
-
-	iptv_test
 }
 
 if [ "$1" == "once" ]; then

iop-lla-libs/Config.in

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

iop-lla-libs/Makefile

@@ -4,47 +4,44 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=easy-soc-libs
+PKG_NAME:=iop-lla-libs
 PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6a311af7cd17fc410c27de3cfae33b658195fd0b
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
+PKG_SOURCE_VERSION:=cf38a6165251709c0d60b33eafd7f32dcc0675d7
+PKG_SOURCE_URL:=http://public.inteno.se:/iop-lla-libs
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/easy-soc-libs
+define Package/iop-lla-libs
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=IOPSYS easy SoC libraries
-  SUBMENU:=IOPSYS easy SoC libraries
+  SUBMENU:=IOPSYS low level libraries
   DEPENDS:=+libopenssl
-  MENU:=1
-endef
-
-define Package/libwifi/config
-  source "$(SOURCE)/Config.in"
 endef
 
 define Package/libwifi
-  $(call Package/easy-soc-libs)
+  $(call Package/iop-lla-libs)
   TITLE:= WiFi library (libwifi)
 endef
 
 define Package/libdsl
-  $(call Package/easy-soc-libs)
+  $(call Package/iop-lla-libs)
   TITLE:= XDSL library (libdsl)
 endef
 
 define Package/libethernet
-  $(call Package/easy-soc-libs)
+  $(call Package/iop-lla-libs)
   TITLE:= Ethernet library (libethernet)
-  DEPENDS:=+TARGET_iopsys_ramips:swconfig
+DEPENDS:=+TARGET_iopsys_ramips:swconfig
+endef
+
+define Package/iop-lla-libs/config
+  source "$(SOURCE)/Config.in"
 endef
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
@@ -60,9 +57,9 @@ else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
 else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
   TARGET_PLATFORM=MARVELL
   TARGET_CFLAGS +=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-  TARGET_PLATFORM=INTEL
-  TARGET_CFLAGS +=-DIOPSYS_INTEL
+else ifeq ($(CONFIG_TARGET_lantiq_xrx500),y)
+  TARGET_PLATFORM=LANTIQ
+  TARGET_CFLAGS +=-DIOPSYS_LANTIQ
 else
   $(info (UNEXPECTED CONFIG TARGET))
 endif
@@ -88,6 +85,7 @@ MAKE_FLAGS += \
 	subdirs="$(subdirs)"
 
 define Build/InstallDev/libwifi
+	echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX $(1)"
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/

iop/configs/config

@@ -3,7 +3,7 @@ CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
 CONFIG_DEVEL=y
-# CONFIG_LOCALMIRROR is not set
+CONFIG_LOCALMIRROR="http://mirror.inteno.se/mirror"
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
@@ -32,10 +32,9 @@ CONFIG_PACKAGE_ice-client-netrounds=m
 CONFIG_PACKAGE_ice-client-rshell=m
 CONFIG_PACKAGE_ice-client-texec=m
 CONFIG_PACKAGE_icwmp-curl=y
-CONFIG_PACKAGE_ifbt=y
 CONFIG_PACKAGE_imonitor=y
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_netmode=y
+CONFIG_PACKAGE_inteno-netmodes=y
 CONFIG_PACKAGE_iperf-mt=y
 CONFIG_PACKAGE_ipset=y
 CONFIG_PACKAGE_iptables=y
@@ -43,11 +42,10 @@ CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
 CONFIG_PACKAGE_iup=y
-# CONFIG_PACKAGE_iwatchdog is not set
+CONFIG_PACKAGE_iwatchdog=y
 CONFIG_PACKAGE_juci=y
 CONFIG_PACKAGE_juci-broadcom-iptv=y
 CONFIG_PACKAGE_juci-broadcom-pwrmgmt=y
-CONFIG_PACKAGE_juci-wifilife=y
 CONFIG_PACKAGE_juci-wireless=y
 CONFIG_PACKAGE_juci-ddns=y
 CONFIG_PACKAGE_juci-diagnostics=y
@@ -81,7 +79,7 @@ CONFIG_PACKAGE_juci-samba=y
 CONFIG_PACKAGE_juci-simple-gui=y
 CONFIG_PACKAGE_juci-snmpd=y
 CONFIG_PACKAGE_juci-sysupgrade=y
-CONFIG_PACKAGE_juci-theme-iopsys=y
+CONFIG_PACKAGE_juci-theme-inteno=y
 CONFIG_PACKAGE_juci-ubus-core=y
 CONFIG_PACKAGE_juci-upnp=y
 CONFIG_PACKAGE_juci-usb=y
@@ -149,13 +147,11 @@ 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_wlng=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
-CONFIG_TARGET_CUSTOMER="IOPSYS"
+CONFIG_TARGET_CUSTOMER="INT"
 CONFIG_TARGET_ROOTFS_TARGZ=y
 # CONFIG_USE_SSTRIP is not set
 CONFIG_USE_STRIP=y
@@ -224,7 +220,3 @@ CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_SIGNED_PACKAGES is not set
 CONFIG_KERNEL_DEVTMPFS=y
 CONFIG_KERNEL_DEVTMPFS_MOUNT=y
-CONFIG_PACKAGE_ip-full=y
-# CONFIG_BUSYBOX_CONFIG_IP is not set
-CONFIG_PACKAGE_iopupgrade=y
-

iop/configs/luci.diff

@@ -0,0 +1,38 @@
+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/configs/target/iopsys_brcm63xx_arm/config

@@ -0,0 +1,15 @@
+# CONFIG_PACKAGE_libcgroup-daemon is not set
+# CONFIG_PACKAGE_libcgroup is not set
+
+# CONFIG_PACKAGE_juci-broadcom-wl is not set
+# CONFIG_PACKAGE_juci-minisnmpd is not set
+# CONFIG_PACKAGE_juci-router-openwrt is not set
+# CONFIG_PACKAGE_speedsvc is not set
+
+# CONFIG_juci_broadcom_wl is not set
+# CONFIG_juci_minisnmpd is not set
+# CONFIG_juci_router_openwrt is not set
+
+# CONFIG_PACKAGE_brcminfo is not set
+CONFIG_PACKAGE_brcm_fw_tool=y
+

iop/configs/target/iopsys_brcm63xx_arm/dg400/config

@@ -0,0 +1,4 @@
+
+# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_TARGET_NO_DECT=y
+

iop/configs/target/iopsys_brcm63xx_arm/dg400prime/config

@@ -0,0 +1,4 @@
+
+# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_TARGET_NO_DECT=y
+

iop/configs/target/iopsys_brcm63xx_arm/eg400/config

@@ -0,0 +1,7 @@
+CONFIG_BCM_I2C=y
+
+# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_TARGET_NO_DECT=y
+
+CONFIG_TARGET_NO_DSL=y
+

iop/configs/target/iopsys_brcm63xx_arm/f104/config

@@ -0,0 +1,6 @@
+
+# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_TARGET_NO_DECT=y
+
+CONFIG_USE_DSL=y
+CONFIG_TARGET_DSL_GFAST=y

iop/configs/target/iopsys_brcm63xx_arm/f104w/config

@@ -0,0 +1,6 @@
+
+# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_TARGET_NO_DECT=y
+
+CONFIG_USE_DSL=y
+CONFIG_TARGET_DSL_GFAST=y

iop/configs/target/iopsys_brcm63xx_arm/sdx810_rg/config

@@ -0,0 +1,5 @@
+
+# Disable kernel internal Dect. External Dect can still operate.
+CONFIG_TARGET_NO_DECT=y
+
+CONFIG_TARGET_NO_DSL=y

iop/configs/target/iopsys_brcm63xx_mips/cg300/config

@@ -0,0 +1,3 @@
+CONFIG_TARGET_NO_DSL=y
+CONFIG_BCM_I2C=y
+

iop/configs/target/iopsys_brcm63xx_mips/config

@@ -0,0 +1,16 @@
+# CONFIG_PACKAGE_libcgroup-daemon is not set
+# CONFIG_PACKAGE_libcgroup is not set
+
+# CONFIG_PACKAGE_natalie-dect is not set
+# CONFIG_PACKAGE_juci-broadcom-wl is not set
+# CONFIG_PACKAGE_juci-minisnmpd is not set
+# CONFIG_PACKAGE_juci-router-openwrt is not set
+# CONFIG_PACKAGE_speedsvc is not set
+
+# CONFIG_juci_broadcom_wl is not set
+# CONFIG_juci_minisnmpd is not set
+# CONFIG_juci_router_openwrt is not set
+
+# CONFIG_PACKAGE_brcminfo is not set
+CONFIG_PACKAGE_brcm_fw_tool=y
+

iop/configs/target/iopsys_brcm63xx_mips/dg200/config

@@ -0,0 +1,3 @@
+CONFIG_BCM_I2C=y
+CONFIG_TARGET_NO_DECT=y
+

iop/configs/target/iopsys_brcm63xx_mips/dg200al/config

@@ -0,0 +1,3 @@
+CONFIG_TARGET_NO_VOICE=y
+CONFIG_BCM_I2C=y
+

iop/configs/target/iopsys_brcm63xx_mips/dg301/config

@@ -0,0 +1,2 @@
+CONFIG_BCM_I2C=y
+

iop/configs/target/iopsys_brcm63xx_mips/dg301al/config

@@ -0,0 +1,3 @@
+CONFIG_TARGET_NO_VOICE=y
+CONFIG_BCM_I2C=y
+

iop/configs/target/iopsys_brcm63xx_mips/eg200/config

@@ -0,0 +1,5 @@
+CONFIG_BCM_I2C=y
+CONFIG_TARGET_NO_DECT=y
+CONFIG_TARGET_NO_DSL=y
+CONFIG_BCM_ENDPOINT_MODULE=y
+

iop/configs/target/iopsys_brcm63xx_mips/eg300/config

@@ -0,0 +1,3 @@
+CONFIG_TARGET_NO_DSL=y
+CONFIG_BCM_I2C=y
+

iop/configs/target/iopsys_brcm63xx_mips/vg50/config

@@ -0,0 +1,4 @@
+CONFIG_TARGET_NO_DHD=y
+CONFIG_TARGET_NO_VOICE=y
+CONFIG_BCM_I2C=y
+

iop/configs/target/iopsys_ramips/config

@@ -0,0 +1,14 @@
+# CONFIG_PACKAGE_libcgroup-daemon is not set
+# CONFIG_PACKAGE_libcgroup is not set
+# CONFIG_PACKAGE_power-management is not set
+# CONFIG_PACKAGE_qos-scripts is not set
+# CONFIG_PACKAGE_mtd-utils-deubinize is not set
+# CONFIG_PACKAGE_mtd-utils-imagewrite is not set
+# CONFIG_PACKAGE_mtd-utils-mkfs.jffs2 is not set
+# CONFIG_PACKAGE_mtd-utils-nanddump is not set
+CONFIG_PACKAGE_mtd-utils-nandwrite=y
+CONFIG_PACKAGE_mtk-bndstrg=y
+CONFIG_PACKAGE_omcproxy=y
+CONFIG_PACKAGE_kmod-nf-nathelper=y
+CONFIG_PACKAGE_kmod-nf-nathelper-extra=y
+# CONFIG_PACKAGE_endptmngr is not set

iop/iop.completion

@@ -5,14 +5,14 @@
 
 _iop_get_profiles()
 {
-    find feeds/targets/iopsys-*/ -name '*.diff' \
+    find feeds/feed_inteno_targets/iopsys-*/ -name '*.diff' \
         |awk -F'/' '{print$NF}' \
         |awk -F. '{print$1}'
 }
 
 _iop_get_models()
 {
-    find feeds/targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
+    find feeds/feed_inteno_targets/iopsys-*/ -mindepth 1 -maxdepth 1 -type d \
         |awk -F'/' '{print$NF}' \
         |egrep '^(cg|dg|eg|vg|vox)[0-9]'
 }
@@ -34,8 +34,9 @@ _iop()
 
     iopcmds="bootstrap cfe_upgrade cfe_upgrade_latest extract_core \
              feeds_update genconfig generate_tarballs install_key \
-             scp_changes setup_host ssh_install_key status \
-             update_package update_feed_branches ssh_upgrade"
+             scp_changes setup_host ssh_install_key ssh_sysupgrade \
+             ssh_sysupgrade_latest ssh_sysupgrade_latest_w status \
+             update_package update_feed_branches"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 
@@ -75,13 +76,7 @@ _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/extract_core.sh

@@ -24,7 +24,7 @@ function extract_core {
 		echo ""
 		echo "Example: $0 extract_core"
 		echo "  -p package/utils/busybox"
-		echo "  -r feeds/lede_core"
+		echo "  -r feeds/feed_inteno_openwrt"
 		echo "  -b devel"
 	}
 

iop/scripts/feeds_update.sh

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

iop/scripts/genconfig.sh

@@ -7,71 +7,52 @@ function genconfig {
 	export FILEDIR="files/"
 	export THEMEDIR="themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
-	export CONFIGPATH="package/feeds/iopsys/iop"
+	export CONFIGPATH="package/feeds/feed_inteno_packages/iop/configs"
 	CUSTPATH="customerconfigs"
 	export CUSTCONF="customerconfigs/customers"
 	export VERBOSE=0
 	export DEVELOPER=0
 	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
 
+	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02 eg200"
+	iopsys_brcm63xx_arm="dg400 eg400 sdx810_rg f104w f104 dg400prime dg400primeb 963138REF_P502"
+	iopsys_ramips="ex400 sdx810_ap"
+	ramips="mt7621"
 	target="bogus"
-	config_path=""
+	masterconfig=1
 
-	# Takes a board name and returns the target name in global var $target
-	set_target() {
-	    local profile=$1
+	set_target()
+	{
+	local profile=$1
 
-	    local iopsys_brcm63xx_mips=$(cd target/linux/iopsys-brcm63xx-mips; ./genconfig)
-	    local iopsys_brcm63xx_arm=$(cd target/linux/iopsys-brcm63xx-arm; ./genconfig)
-	    local iopsys_ramips=$(cd target/linux/iopsys-ramips; ./genconfig)
-	    local intel_mips=$(cd target/linux/intel_mips; ./genconfig)
-
-	    if [ "$profile" == "LIST" ]
-	    then
-		for list in iopsys_brcm63xx_mips iopsys_brcm63xx_arm iopsys_ramips intel_mips
-		do
-		    echo "$list based boards:"
-		    for b in ${!list}
-		    do
-			echo -e "\t$b"
-		    done
-		done
-		return
-	    fi
-
-	    local targets
-
-	    for p in $iopsys_brcm63xx_mips; do
+	for p in $iopsys_brcm63xx_mips; do
 		if [ $p == $profile ]; then
-		    target="iopsys_brcm63xx_mips"
-			config_path="target/linux/iopsys-brcm63xx-mips/config"
-		    return
+			target="iopsys_brcm63xx_mips"
+			return
 		fi
-	    done
+	done
 
-	    for p in $iopsys_brcm63xx_arm; do
+	for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
-		    target="iopsys_brcm63xx_arm"
-			config_path="target/linux/iopsys-brcm63xx-arm/config"
-		    return
+			target="iopsys_brcm63xx_arm"
+			return
 		fi
-	    done
+	done
 
-	    for p in $iopsys_ramips; do
+	for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
-		    target="iopsys_ramips"
-			config_path="target/linux/iopsys-ramips/config"
-		    return
+			target="iopsys_ramips"
+			return
 		fi
-	    done
+	done
 
-	    for p in $intel_mips; do
+	for p in $ramips; do
 		if [ $p == $profile ]; then
-		    target="intel_mips"
-			config_path="target/linux/intel_mips/config"
-		    return
+			target="ramips"
+			masterconfig=0
+			return
 		fi
-	    done
+	done
 
 	}
 
@@ -83,7 +64,6 @@ function genconfig {
 		endptAllowed=0
 		natalieAllowed=0
 		mediatekAllowed=0
-		wifilifeAllowed=0
 
 		allowedRepos="$(ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null | grep -w 'R\|W' | awk '{print$NF}')"
 		for repo in $allowedRepos; do
@@ -93,7 +73,6 @@ function genconfig {
 			endptcfg) endptAllowed=1 ;;
 			natalie-dect*) natalieAllowed=1 ;;
 			linux) mediatekAllowed=1 ;;
-			wifilife) wifilifeAllowed=1 ;;
 			esac
 		done
 	}
@@ -104,16 +83,16 @@ function genconfig {
 
 	usage() {
 		echo
-		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
+		echo 1>&2 "Usage: $0 [ OPTIONS ] < Board_Type > [ Customer ]"
 		echo
 		echo -e "  -c|--clean\tRemove all files under ./files and import from config "
 		echo -e "  -v|--verbose\tVerbose"
 		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
+		echo -e "  -p|--profile\tSet profile (if exists) default juci"
 		echo -e "  -s|--override\tEnable 'Package source tree override'"
 		echo -e "  -h|--help\tShow this message"
 		echo -e "  -l|--list [customer]\tList all Customers or all boards for one customer"
 		echo -e "  -a|--list-all\tList all Customers and their board types"
-		echo -e "  -b|--boards\tList all board types"
 		echo
 		echo "Example ./iop genconfig vg50 TELIA"
 		echo "(if no customerconfig is chosen the Inteno Config will be used)"
@@ -207,84 +186,90 @@ function genconfig {
 	create_and_copy_files()
 	{
 		local BOARDTYPE=$1
-		shift
-		local CUSTOMERS=$@
+		local CUSTOMER=$2
 
-		# Validate seleced board and customers
+		# Validate seleced board and customer
 		set_target $BOARDTYPE
 		if [ $target == "bogus" ]; then
 			echo "Hardware profile does not exist"
 			exit 1
-		elif [ -n "$CUSTOMERS" ]; then
-			for CUSTOMER in $CUSTOMERS; do
-				if [ ! -d "$CUSTCONF/$CUSTOMER/" ]; then
-					echo "Customer profile for '$CUSTOMER' does not exist"
+		elif [ -n "$CUSTOMER" ]; then
+			if [ ! -d "$CUSTCONF/$CUSTOMER/" ]; then
+				echo "Customer profile for '$CUSTOMER' does not exist"
+				exit 1
+			elif [ ! -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/" ]; then
+				echo "'$BOARDTYPE' board profile does not exist for customer '$CUSTOMER'"
+				if [ -f "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
+					echo "Common profile configuration will be used"
+				else
 					exit 1
-				elif [ ! -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/" ]; then
-					echo "'$BOARDTYPE' board profile does not exist for customer '$CUSTOMER'"
-					if [ -f "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
-						echo "Common profile configuration will be used"
-					else
-						exit 1
-					fi
 				fi
-			done
+			fi
 		fi
 
 		# Generate base config
+		# Used only for iopsys targets, not openwrt targets
 		rm -f .config
-		v "Config $BOARDTYPE selected"
-		v "cp $CONFIGPATH/config .config"
-		cp $CONFIGPATH/config .config
-
-		if [ -f $config_path/config ]; then
-		    cat $config_path/config >> .config
-		fi
-		if [ -f $config_path/$BOARDTYPE/config ]; then
-		    cat $config_path/$BOARDTYPE/config >> .config
+		if [ $masterconfig -eq 1 ]; then
+			v "Config $BOARDTYPE selected"
+			v "cp $CONFIGPATH/config .config"
+			cp $CONFIGPATH/config .config
 		fi
 
-		#special handling for intel_mips which use TARGET_DEVICES
-		if [ "$target" = "intel_mips" ]; then
-			subtarget="xrx500"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
-			device=$(echo $BOARDTYPE | tr a-z A-Z)
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
+		# Add target (soc/board specific )
+		if [ -f $CONFIGPATH/target/config ]; then
+		    cat $CONFIGPATH/target/config >> .config
+		fi
+		if [ -f $CONFIGPATH/target/$target/config ]; then
+		    cat $CONFIGPATH/target/$target/config >> .config
+		fi
+		if [ -f $CONFIGPATH/target/$target/$BOARDTYPE/config ]; then
+		    cat $CONFIGPATH/target/$target/$BOARDTYPE/config >> .config
+		fi
+
+		# Apply profile diff to master config if selected
+		if [ -n "$PROFILE" ]; then
+			if [ -e "$CONFIGPATH/$PROFILE.diff" ]; then
+				cat $CONFIGPATH/$PROFILE.diff >> .config
+			elif [ "$PROFILE" == "juci" ]; then
+				v "Default profile (juci) is selected."
+			else
+				echo "ERROR: profile $PROFILE does not exist!"
+				exit 1
+			fi
 		else
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
+			v "No profile selected! Using default."
 		fi
 
-		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
+		# Set target and profile
+		echo "CONFIG_TARGET_${target}=y" >> .config
+		echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
+
+		echo "$CUSTOMER $BOARDTYPE" > $CURRENT_CONFIG_FILE
 
 		# Add customerconfig diff if a customer is selected
-		if [ -n "$CUSTOMERS" ]; then
-			for CUSTOMER in $CUSTOMERS; do
-				if [ -d "$CUSTCONF/$CUSTOMER/common/fs" ]; then
-					v "cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR"
-					cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR
-				fi
-				if [ -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/fs" ]; then
-					v "cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR"
-					cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR
-				fi
-				if [ -d "$CUSTCONF/$CUSTOMER/juci-theme" ]; then
-					customer="$(echo $CUSTOMER | tr 'A-Z' 'a-z')"
-					v "cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer"
-					cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer
-				fi
-				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
-					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
-					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
-				fi
-				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
-					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
-					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
-				fi
-			done
+		if [ -n "$CUSTOMER" ]; then
+			if [ -d "$CUSTCONF/$CUSTOMER/common/fs" ]; then
+				v "cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR"
+				cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR
+			fi
+			if [ -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/fs" ]; then
+				v "cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR"
+				cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR
+			fi
+			if [ -d "$CUSTCONF/$CUSTOMER/juci-theme" ]; then
+				customer="$(echo $CUSTOMER | tr 'A-Z' 'a-z')"
+				v "cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer"
+				cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer
+			fi
+			if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
+				v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
+				cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
+			fi
+			if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
+				v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
+				cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
+			fi
 		fi
 
 		# Set target version
@@ -304,7 +289,6 @@ function genconfig {
 			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
 			[ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
 			[ $mediatekAllowed -eq 0 ] && echo "CONFIG_MEDIATEK_OPEN=y" >> .config
-			[ $wifilifeAllowed -eq 0 ] && echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		else
 			echo "CONFIG_GITMIRROR_REWRITE=n" >>.config
 			echo "CONFIG_BCM_OPEN=y" >> .config
@@ -312,11 +296,10 @@ function genconfig {
 			echo "CONFIG_ENDPT_OPEN=y" >> .config
 			echo "CONFIG_NATALIE_OPEN=y" >> .config
 			echo "CONFIG_MEDIATEK_OPEN=y" >> .config
-			echo "CONFIG_WIFILIFE_OPEN=y" >> .config
 		fi
 
 		# Force regeneration of themes
-		touch package/feeds/juci/juci/Makefile
+		touch package/feeds/feed_inteno_juci/juci/Makefile
 
 		# Force regeneration of kernel Makefile
 		# Needed to disable kmods for iopsys-brcm targets
@@ -326,11 +309,20 @@ function genconfig {
 		# currently boardparms.c and boardparms_voice.c is the only place that is depending on inteno boardid name
 		# so just touch that file.
 		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
-
+				
 		# Set default values based on selected parameters
 		v "$(make defconfig 2>&1)"
 
-		echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
+		# Temporary fixup for juci/luci profile
+		if [ "$PROFILE" == "luci" ]; then
+			sed -i '/CONFIG_DEFAULT_juci/d' .config
+			sed -i '/CONFIG_PACKAGE_juci/d' .config
+			sed -i '/CONFIG_PACKAGE_uhttpd/d' .config
+		fi
+
+		if [ $masterconfig -eq 1 ]; then
+			echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
+		fi
 
 		# Clean base-file package to force rebuild when changing profile
 		v "$(make package/base-files/clean 2>&1)"
@@ -361,7 +353,6 @@ function genconfig {
 			-h|--help) usage;;
 			-l|--list) list_customers 0 $2;;
 			-a|--list-all)list_customers 1;;
-			-b|--boards)set_target LIST;exit 0;;
 			-*)
 				echo "Invalid option: $1 "
 				echo "Try -h or --help for more information."
@@ -375,7 +366,7 @@ function genconfig {
 		CUSTREPO="${CUSTREPO:-git@private.inteno.se:customerconfigs}"
 
 		setup_dirs
-		create_and_copy_files "$@"
+		create_and_copy_files "$1" "$2"
 	fi
 }
 

iop/scripts/generate_tarballs.sh

@@ -1,96 +1,79 @@
-#!/bin/bash
+#!/bin/sh
 
 
 build_bcmkernel_consumer() {
 	local tarfile bcmkernelcommith sdkversion
 	sdkversion=$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')
 	sdkversion=${sdkversion:0:4}${sdkversion:(-1)}
-	bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/broadcom/bcmkernel/${sdkversion:0:5}*.mk | cut -d'=' -f2)
+	bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/feed_inteno_broadcom/bcmkernel/${sdkversion:0:5}*.mk | cut -d'=' -f2)
 	# do not build bcmopen sdk if it was already built before
 	[ -n "$board" -a -n "$bcmkernelcommith" ] || return
-	ssh $SERVER "test -f $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz" && return
+	ssh $SERVER "ls $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz" && return
 	cd ./build_dir/target-*/bcmkernel-*-${sdkversion:0:4}*/bcm963xx/release
-	bash do_consumer_release -p $profile -y -F
+	sh do_consumer_release -p $profile -y -F
 	tarfile='out/bcm963xx_*_consumer.tar.gz'
 	[ $(ls -1 $tarfile |wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
-	scp -pv $tarfile $SERVER:$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz
-	ssh $SERVER "[ -f $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz ] && ln -sf $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz $FPATH/bcmopen-$board-$majver.$minver-latest"
+	scp $tarfile $SERVER:$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz
+	ssh $SERVER "ln -s $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz $FPATH/bcmopen-$board-$majver.$minver.tar.gz"
 	rm -f $tarfile
-	cd "$curdir"
+	cd $curdir
 }
 
 build_natalie_consumer() {
 	# create natalie-dect open version tar file
 	local natalieversion nataliecommith
 	grep -q "CONFIG_TARGET_NO_DECT=y" .config && return
-	natalieversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
-	nataliecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/natalie-dect/Makefile | cut -d'=' -f2)
+	natalieversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/natalie-dect/Makefile | cut -d'=' -f2)
+	nataliecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/natalie-dect/Makefile | cut -d'=' -f2)
 	[ -n "$profile" -a -n "$natalieversion" -a -n "$nataliecommith" ] || return
-	ssh $SERVER "test -f $FPATH/natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz" && return
+	ssh $SERVER "ls $FPATH/natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz" && return
 	cd ./build_dir/target-*/natalie-dect-$natalieversion/
 	mkdir natalie-dect-open-$natalieversion
-	cp -f ipkg-*/natalie-dect/lib/modules/*/extra/dect.ko natalie-dect-open-$natalieversion/dect.ko
+	cp NatalieFpCvm6362/Src/Projects/NatalieV3/FpCvm/Linux6362/dects.ko natalie-dect-open-$natalieversion/dect.ko
 	tar -czv  natalie-dect-open-$natalieversion/ -f natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz
-	scp -pv natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $SERVER:$FPATH/
+	scp natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $SERVER:$FPATH/
 	cp natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz $curdir/
 	rm -rf natalie-dect-open-$natalieversion
 	rm -f natalie-dect-$profile-$natalieversion-$nataliecommith.tar.gz
-	cd "$curdir"
+	cd $curdir
 }
 
 build_endptmngr_consumer() {
 	# create endptmngr open version tar file
 	local endptversion endptcommith
 	grep -q "CONFIG_TARGET_NO_VOICE=y" .config && return
-	endptversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
-	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
+	endptversion=$(grep -w "PKG_VERSION:" ./feeds/feed_inteno_packages/endptmngr/Makefile | cut -d'=' -f2)
+	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/endptmngr/Makefile | cut -d'=' -f2)
 	[ -n "$profile" -a -n "$endptversion" -a -n "$endptcommith" ] || return
-	ssh $SERVER "test -f $FPATH/endptmngr-$profile-$endptversion-$endptcommith.tar.gz" && return
+	ssh $SERVER "ls $FPATH/endptmngr-$profile-$endptversion-$endptcommith.tar.gz" && return
 	cd ./build_dir/target-*/endptmngr-$endptversion/
 	mkdir endptmngr-open-$endptversion
 	mkdir endptmngr-open-$endptversion/src
 	cp ./src/endptmngr endptmngr-open-$endptversion/src
 	cp -r ./files/ endptmngr-open-$endptversion/
 	tar -czv  endptmngr-open-$endptversion/ -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
-	scp -pv endptmngr-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
+	scp endptmngr-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
 	cp endptmngr-$profile-$endptversion-$endptcommith.tar.gz $curdir/
 	rm -rf endptmngr-open-$endptversion
 	rm -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
-	cd "$curdir"
+	cd $curdir
 }
 
 build_ice_consumer() {
 	# create ice-client open version tar file
 	local iceversion icebasever icerelease icecommith
-	icecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/ice-client/Makefile | head -1 | cut -d'=' -f2)
-	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
-	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/iopsys/ice-client/Makefile | cut -d'=' -f2)
+	icecommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/feed_inteno_packages/ice-client/Makefile | head -1 | cut -d'=' -f2)
+	icebasever=$(grep -w "BASE_PKG_VERSION:" ./feeds/feed_inteno_packages/ice-client/Makefile | cut -d'=' -f2)
+	icerelease=$(grep -w "PKG_RELEASE:" ./feeds/feed_inteno_packages/ice-client/Makefile | cut -d'=' -f2)
 	iceversion=$icebasever$icerelease
 	[ -n "$target" -a -n "$iceversion" -a -n "$icecommith" ] || return
-	ssh $SERVER "test -f $FPATH/ice-client-$target-$iceversion-$icecommith.tar.gz" && return
+	ssh $SERVER "ls $FPATH/ice-client-$target-$iceversion-$icecommith.tar.gz" && return
 	cd ./build_dir/target-*/ice-client-$icebasever/ipkg-* || cd ./build_dir/target-mips*musl-*/ice-client-$icebasever/ipkg-*
 	tar -czv  ice-client -f ice-client-$target-$iceversion-$icecommith.tar.gz
-	scp -pv ice-client-$target-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
+	scp ice-client-$target-$iceversion-$icecommith.tar.gz $SERVER:$FPATH/
 	cp ice-client-$target-$iceversion-$icecommith.tar.gz $curdir/
 	rm -f ice-client-$target-$iceversion-$icecommith.tar.gz
-	cd "$curdir"
-}
-
-build_wifilife_consumer() {
-	local ver commit
-	ver=$(grep -w "PKG_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
-	commit=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
-	[ -n "$ver" -a -n "$commit" ] || return
-	ssh $SERVER "test -f $FPATH/wifilife-$target-${ver}_${commit}.tar.xz" && return
-	cd ./build_dir/target-*/wifilife-$ver/ipkg-* || cd ./build_dir/target-mips*musl-*/wifilife-$ver/ipkg-*
-	mkdir -p wifilife-$ver/src
-	cp -rf wifilife/usr/sbin/* wifilife-$ver/src/
-	tar Jcf wifilife-${target}-${ver}_${commit}.tar.xz wifilife-$ver
-	scp -pv wifilife-$target-${ver}_${commit}.tar.xz $SERVER:$FPATH/
-	cp wifilife-${target}-${ver}_${commit}.tar.xz $curdir/
-	rm -rf wifilife-$ver
-	rm -f wifilife-${target}-${ver}_${commit}.tar.xz
-	cd "$curdir"
+	cd $curdir
 }
 
 build_mediatek_kernel() {
@@ -100,7 +83,7 @@ build_mediatek_kernel() {
 	kernel_version=$(grep KERNEL_PATCHVER target/linux/iopsys-ramips/Makefile  | cut -d '=' -f2)
 	kernel=linux-${kernel_version}.*
 	[ -n "$mediatek_commit" ] || return
-	ssh $SERVER "test -f $FPATH/mediatek-kernel-open-$mediatek_commit.tar.gz" && return
+	ssh $SERVER "ls $FPATH/mediatek-kernel-open-$mediatek_commit.tar.gz" && return
 	echo "Building mediatek kernel tarball from kernel commit:"	
 	echo $mediatek_commit
 	cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips*/$kernel
@@ -118,8 +101,8 @@ build_mediatek_kernel() {
 	cd ..
 
 	tar -czv $kernel -f mediatek-kernel-open-$mediatek_commit.tar.gz
-	scp -pv mediatek-kernel-open-$mediatek_commit.tar.gz $SERVER:$FPATH/
-	cd "$curdir"
+	scp mediatek-kernel-open-$mediatek_commit.tar.gz $SERVER:$FPATH/
+	cd $curdir
 }
 
 function print_usage {
@@ -132,7 +115,6 @@ function generate_tarballs {
     SERVER="god@software.inteno.se"
     FPATH="/var/www/html/iopsys/consumer"
 
-    set -e
     git remote -v | grep -q http && return # do not continue if this is an open SDK environment
 
     target=$(grep CONFIG_TARGET_BOARD .config | cut -d'=' -f2 | tr -d '"')
@@ -140,7 +122,7 @@ function generate_tarballs {
     profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
     majver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f1 -d .)
     minver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f2 -d .)
-    curdir="$PWD"
+    curdir=$(pwd)
 
 
 	# Execute user command
@@ -170,11 +152,9 @@ function generate_tarballs {
 		build_natalie_consumer
 		build_endptmngr_consumer
 		build_ice_consumer
-		build_wifilife_consumer
 	elif [ "$stk_target" == "mediatek" ]; then
 		build_mediatek_kernel
 		build_ice_consumer		
-		build_wifilife_consumer
 	else
 		echo "Invalid target: $stk_target"
 		print_usage

iop/scripts/iopupgrade.sh

@@ -1,326 +0,0 @@
-# this is a developer helper script to install firmware on a remote host with SSH
-
-function upd_usage {
-    echo "usage: $0 iopupgrade -t <host> -f <file> [opts] "
-    echo ""
-    echo "   Default host is 192.168.1.1"
-    echo "   Default firmware file is the newest one found"
-    echo "   Default is to not keep configuration"
-    echo "opts:"
-    echo ""
-    echo "	-i	Interactive use, Allows to select firmware file"
-    echo "	-n	Do not do the final reboot of the target board"
-    echo "	-c	Keep configuration"
-    echo "	-x	Force install even if firmware is not for this board"
-    echo "	-b	Force install of bootloader regardless of version installed"
-    echo "	-s	Use sysupgade. old upgrade method, needed for old releases that do not have iopu"
-}
-
-function set_config_string {
-    eval `grep $1 .config`
-}
-
-function upd_ask_ok {
-    echo "Will Continue with the following settings"
-    echo "-----------------------------------------"
-    printf "%20s: %s\n"  "Firmare file" "$upd_fw_base"
-    printf "%20s: %s\n"  "Host ip" "$upd_host"
-    printf "%20s: " "Reboot";               if [ "$upd_noreboot"   == "0" ] ;then printf "Yes\n" ;else printf "No\n";fi
-    printf "%20s: " "Keep config";          if [ "$upd_keepconf"   == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
-    printf "%20s: " "Force bootloader";     if [ "$upd_forceboot"  == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
-    printf "%20s: " "Force image upgrade";  if [ "$upd_forceimage" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
-    printf "%20s: " "Use sysupgrade";       if [ "$upd_sysupgrade" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
-    echo "-----------------------------------------"
-
-    if [ "$upd_sysupgrade" == "0" ]
-       then
-	   if [ "$upd_keepconf"   == "1" ] ;then echo "keeping config is just a fantasy it's not yet implemented, try sysupgrade";fi
-    fi
-
-    echo -n "Continue? [Y/n/q]:"
-    read answer
-
-    case $answer in
-	n|N)
-	    return 1;;
-	q|Q)
-	    exit 1;;
-	y|Y|*)
-	    return 0;;
-    esac
-}
-
-function upd_select_file {
-
-    dialog --keep-tite --title "To select file use TAB/ARROW to hilight then press SPACEBAR -> RETURN" \
-	   --fselect "bin/targets/$CONFIG_TARGET_BOARD/generic/" \
-	   $((lines -10)) $((cols -5)) \
-	   2> $tempfile
-
-    new_file=$(cat $tempfile)
-    if [ -n "$new_file" ]
-    then
-	upd_fw="$new_file"
-	upd_fw_base=$(basename $upd_fw);
-    fi
-}
-
-function upd_select_target {
-
-    dialog --keep-tite --title "Input the name/ip number of target board" \
-	   --inputbox "Name/IP" \
-	   $((lines -10)) $((cols -5)) \
-	   "$upd_host" \
-	   2> $tempfile
-
-    new_file=$(cat $tempfile)
-    if [ -n "$new_file" ]
-    then
-	upd_host="$new_file"
-    fi
-}
-
-
-function upd_select_reboot {
-    dialog --keep-tite --radiolist "Should the board reboot after download finished" \
-	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
-	   "Reboot" "Restart board after done"       `if [ "$upd_noreboot" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   "No reboot" "Continue running old system" `if [ "$upd_noreboot" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   2> $tempfile
-
-    res=$(cat $tempfile)
-    case $res in
-	"No reboot")
-	    upd_noreboot=1
-	;;
-	"Reboot")
-	    upd_noreboot=0
-	    ;;
-    esac
-}
-
-function upd_select_config {
-    dialog --keep-tite --radiolist "Should the configuration be keept" \
-	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
-	   "Keep" "Keep the config from old system"      `if [ "$upd_keepconf" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   "Default" "Use default config for new system" `if [ "$upd_keepconf" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   2> $tempfile
-
-    res=$(cat $tempfile)
-    case $res in
-	"Keep")
-	    upd_keepconf=1
-	    ;;
-	"Default")
-	    upd_keepconf=0
-	    ;;
-    esac
-}
-
-function upd_select_forceboot {
-    dialog --keep-tite --radiolist "Should the boot loader be updated reagardless of version installed" \
-	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
-	   "Force" "Alwasy update boot loader"                `if [ "$upd_forceboot" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   "Version check" "Only upgrade if version is newer" `if [ "$upd_forceboot" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   2> $tempfile
-
-    res=$(cat $tempfile)
-    case $res in
-	"Force")
-	    upd_forceboot=1
-	    ;;
-	"Version check")
-	    upd_forceboot=0
-	    ;;
-    esac
-}
-
-function upd_select_forceimage {
-    dialog --keep-tite --radiolist "Should the image be stored in flash even if sanity checks would reject it" \
-	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
-	   "Force" "Dissable sanity check and force use of image (dangerous)" `if [ "$upd_forceimage" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   "Only compatible" "Normal checks apply"                            `if [ "$upd_forceimage" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   2> $tempfile
-
-    res=$(cat $tempfile)
-    case $res in
-	"Force")
-	    upd_forceimage=1
-	    ;;
-	"Only compatible")
-	    upd_forceimage=0
-	    ;;
-    esac
-}
-
-function upd_select_sysupgrade {
-    dialog --keep-tite --radiolist "Use the old way to upgrade a board" \
-	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
-	   "iopu" "Use the iop upgrade methode"          `if [ "$upd_sysupgrade" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   "sysupgrade" "Use the old sysupgrade methode" `if [ "$upd_sysupgrade" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   2> $tempfile
-
-    res=$(cat $tempfile)
-    case $res in
-	"iopu")
-	    upd_sysupgrade=0
-	    ;;
-	"sysupgrade")
-	    upd_sysupgrade=1
-	    ;;
-    esac
-}
-
-function upd_select {
-
-    dialog --keep-tite --ok-label "Select" --cancel-label "Done" --menu "Select Item to change" \
-	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
-	   "Firmare file" "$upd_fw_base"\
-	   "Host ip" "$upd_host" \
-	   "Reboot"               `if [ "$upd_noreboot"   == "0" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
-	   "Keep config"          `if [ "$upd_keepconf"   == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
-	   "Force bootloader"     `if [ "$upd_forceboot"  == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
-	   "Force image upgrade"  `if [ "$upd_forceimage" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
-	   "sysupgrade"           `if [ "$upd_sysupgrade" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
-	   2> $tempfile
-
-
-    case $(cat $tempfile) in
-	"Firmare file")
-	    upd_select_file
-	    ;;
-	"Host ip")
-	    upd_select_target
-	    ;;
-	"Reboot")
-	    upd_select_reboot
-	    ;;
-	"Keep config")
-	    upd_select_config
-	    ;;
-	"Force bootloader")
-	    upd_select_forceboot
-	    ;;
-	"Force image upgrade")
-	    upd_select_forceimage
-	    ;;
-	"sysupgrade")
-	    upd_select_sysupgrade
-	    ;;
-	*)
-	    return
-	;;
-    esac
-    upd_select
-}
-function upd_select_start {
-    lines=$(tput lines)
-    cols=$(tput cols)
-    tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-    trap "rm -f $tempfile" 0 1 2 5 15
-    upd_select
-
-}
-
-function ssh_upgrade {
-    upd_noreboot=0
-    upd_forceboot=0
-    upd_keepconf=0
-    upd_forceimage=0
-    upd_fw_base=""
-    upd_fw=""
-    upd_host="192.168.1.1"
-    upd_sysupgrade=0
-    do_dialog=0
-
-    while getopts "f:hnxt:iscb" opt; do
-	case $opt in
-	    n)
-		upd_noreboot=1
-		;;
-	    x)
-		upd_forceimage=1
-		;;
-	    b)
-		upd_forceboot=1
-		;;
-	    c)
-		upd_keepconf=1
-		;;
-	    v)
-		verbose=$OPTARG
-		;;
-	    f)
-		upd_fw=$OPTARG
-		;;
-	    t)
-		upd_host=$OPTARG
-		;;
-	    i)
-		do_dialog=1
-		;;
-	    s)
-		upd_sysupgrade=1
-		;;
-	    h)
-		upd_usage
-		exit 1
-		;;
-	    \?)
-		echo "Invalid option: -$OPTARG" >&2
-		exit 1
-		;;
-	esac
-    done
-
-    if [ -n "$upd_fw" ]
-    then
-	upd_fw_base=$(basename $upd_fw);
-    else
-	set_config_string CONFIG_TARGET_BOARD
-	firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t *[0-9].y[3])
-
-	for upd_fw_base in $firmwares
-	do
-	    #echo "firmware $upd_fw"
-	    break
-	done
-	upd_fw="bin/targets/$CONFIG_TARGET_BOARD/generic/$upd_fw_base"
-    fi
-
-    [ $do_dialog -eq 1 ] && upd_select_start
-
-    if ! upd_ask_ok
-    then
-	upd_select_start
-	if ! upd_ask_ok
-	then
-	    exit 1
-	fi
-    fi
-
-    if [ ! -f $upd_fw ]
-    then
-	echo "firmware file $firmware do not exist"
-	exit 1
-    fi
-
-    if [ $upd_sysupgrade -eq 0 ]
-    then
-	extra_args=""
-	[ $upd_noreboot   -eq 1 ] && extra_args="$extra_args -n"
-	[ $upd_forceimage -eq 1 ] && extra_args="$extra_args -x"
-	[ $upd_forceboot  -eq 1 ] && extra_args="$extra_args -b"
-
-	file_size_kb=`du -k "$upd_fw" | cut -f1`
-	cat $upd_fw | pv -s ${file_size_kb}k | ssh root@$upd_host "iopu $extra_args"
-    else
-	scp $upd_fw root@$upd_host:/tmp/ &&
-	    ssh -o ConnectTimeout=60 root@$upd_host "sysupgrade -v $3 /tmp/$upd_fw_base" &&
-	    echo "sysupgrade done!"
-    fi
-}
-
-register_command "ssh_upgrade" "-h <host> -f <file> [opts]  Install firmware on remote host with SSH"
-
-

iop/scripts/ssh_sysupgrade.sh

@@ -0,0 +1,56 @@
+# this is a developer helper script to install firmware on a remote host with SSH
+
+function usage {
+	echo "usage: $0 ssh_sysupgrade <host> <file> [opts]"
+}
+
+function ssh_sysupgrade {
+	if [ -z "$1" ] ; then
+		usage
+		echo "Error: host required"
+		exit 1
+	fi
+	if [ -z "$2" ] ; then
+		usage
+		echo "Error: firmware filename required"
+		exit 1
+	fi
+	if [ ! -e $2 ] ; then
+		usage
+		echo "Error: firmware file does not exist"
+		exit 1
+	fi
+	IMAGE=`basename $2`
+	echo "sysupgrade host: $1 with file $IMAGE"
+	[ "$2" ] && [ -e "$2" ] && scp $2 root@$1:/tmp/ && ssh -o ConnectTimeout=60 root@$1 "sysupgrade -v $3 /tmp/$IMAGE" && echo "sysupgrade done!"
+}
+
+register_command "ssh_sysupgrade" "<host> <file> [opts]  Install firmware on remote host with SSH"
+
+function ssh_sysupgrade_latest {
+	if [ -z "$1" ] ; then
+		echo "usage: $0 ssh_sysupgrade_latest <host> [opts]"
+		echo "Error: host required"
+		exit 1
+	fi
+	{ cd `dirname $0`
+		IMAGE=`ls -Art bin/*/*/*/*.y[23] | tail -n1`
+		[ "$IMAGE" ] && [ -e "$IMAGE" ] && ./iop ssh_sysupgrade $1 $IMAGE $2
+	}
+}
+
+register_command "ssh_sysupgrade_latest" "<host> [opts]  Install latest ubifs firmware on remote host with SSH"
+
+function ssh_sysupgrade_latest_w {
+	if [ -z "$1" ] ; then
+		echo "usage: $0 ssh_sysupgrade_latest_w <host> [opts]"
+		echo "Error: host required"
+		exit 1
+	fi
+	{ cd `dirname $0`
+		IMAGE=`ls -Art bin/*/*.w | tail -n1`
+		[ "$IMAGE" ] && [ -e "$IMAGE" ] && ./iop ssh_sysupgrade $1 $IMAGE $2
+	}
+}
+
+register_command "ssh_sysupgrade_latest_w" "<host> [opts]  Install latest jffs2 firmware on remote host with SSH"

iop/scripts/update_feed_branches.sh

@@ -36,13 +36,13 @@ function update_feed_branches {
 		echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo"
 	fi
 
-	ifeeds="$(grep -r 'dev.iopsys.eu' feeds.conf | awk '{print$2}' | tr '\n' ' ')"
+	ifeeds="$(grep -r feed_inteno feeds.conf  | awk '{print$2}' | cut -d'_' -f3 | tr '\n' ' ')"
 
 	for f in $ifeeds; do
-		commith=$(grep $f feeds.conf | cut -d'^' -f2)
-		cd $ipath/feeds/$f
+		commith=$(grep feed_inteno_$f feeds.conf | cut -d'^' -f2)
+		cd $ipath/feeds/feed_inteno_$f
 		git branch -D $release 2>/dev/null
-		echo "$f: updating release branch $release to commit $commith"
+		echo "feed_inteno_$f: updating release branch $release to commit $commith"
 		git checkout $commith
 		git push origin :$release
 		git checkout -b $release

iop/scripts/update_package.sh

@@ -387,7 +387,7 @@ insert_hash_in_feeds_config()
     local feed=$(get_feed_name ${PKG_DIR})
     local TO=$(cd ${PKG_DIR}; git rev-parse HEAD)
 
-    sed -i feeds.conf -e "/ ${feed} / s/\(.*\)[;^].*/\1^${TO}/"
+    sed -i feeds.conf -e "/${feed}/ s/\(.*\)[;^].*/\1^${TO}/"
     git add feeds.conf
 }
 
@@ -441,7 +441,7 @@ check_packages()
 
 feeds_hash()
 {
-    grep -v "^#" feeds.conf | grep " $1 " | grep "\^" | sed -e "s/.*[;^]\(.*\)/\1/"
+    grep -v "^#" feeds.conf | grep " $1" | sed -e "s/.*[;^]\(.*\)/\1/"
 }
 
 insert_feed_hash_in_feeds_config()
@@ -495,60 +495,55 @@ check_feeds()
     feeds=$(grep -v "^#" feeds.conf| awk '{print $2}')
     for feed in `echo $feeds`
     do
-		feed_hash=$(feeds_hash $feed)
-		[ -n "$feed_hash" ] || continue
-		if [ -d feeds/$feed ]; then
-			in_git=$(cd feeds/$feed; git rev-parse HEAD)
+	feed_hash=$(feeds_hash $feed)
+	in_git=$(cd feeds/$feed; git rev-parse HEAD)
 
-			if [ "$feed_hash" != "$in_git" ]
-			then
+	if [ "$feed_hash" != "$in_git" ]
+	then
 
-				name=$(cd feeds/$feed;git symbolic-ref -q HEAD)
-				if [ -z "$name" ]
-				then
-					echo "Feed feeds/${feed} is at a git commit which is different from feeds.conf"
-					#echo "git id from feeds.conf [$feed_hash] git id from feeds/${feed} [$in_git]"
-					on_a_branch feeds/${feed} feed
+	    name=$(cd feeds/$feed;git symbolic-ref -q HEAD)
+	    if [ -z "$name" ]
+	    then
+		echo "Feed feeds/${feed} is at a git commit which is different from feeds.conf"
+		on_a_branch feeds/${feed} feed
 
-					#redo the test here and see if the feeds.conf and git is still different.
-					in_git=$(cd feeds/$feed; git rev-parse HEAD)
-					if [ "$feed_hash" = "$in_git" ]
-					then
-						continue
-					fi
-				fi
-
-				LOCAL=$(cd feeds/$feed;git rev-parse @)
-				REMOTE=$(cd feeds/$feed;git rev-parse @{u})
-				BASE=$(cd feeds/$feed;git merge-base @ @{u})
-
-				# if we are behind the remote automatically do a pull
-				if [ $LOCAL = $BASE ]; then
-					(cd feeds/$feed ; git pull 1>/dev/null)
-
-					#redo the test here and see if the feeds.conf and git is still different.
-					in_git=$(cd feeds/$feed; git rev-parse HEAD)
-					if [ "$feed_hash" = "$in_git" ]
-					then
-						continue
-					fi
-				fi
-
-				echo "Feed feeds/${feed} is at different commit than what is in feeds.conf"
-				#echo "git id from feeds.conf [$feed_hash] git id from feeds/${feed} [$in_git]"
-				echo -n "Should we update feeds.conf to reflect the new version ? [y/N]:"
-				read answer
-
-				case $answer in
-					n|N|'')
-						continue;;
-				esac
-				branch_uptodate feeds/${feed}
-				create_feed_message ${feed} $feed_hash $in_git  >tmp/msg
-				insert_feed_hash_in_feeds_config ${feed}
-				commit_feeds_config tmp/msg
-			fi
+		#redo the test here and see if the feeds.conf and git is still different.
+		in_git=$(cd feeds/$feed; git rev-parse HEAD)
+		if [ "$feed_hash" = "$in_git" ]
+		then
+		    continue
 		fi
+	    fi
+
+	    LOCAL=$(cd feeds/$feed;git rev-parse @)
+	    REMOTE=$(cd feeds/$feed;git rev-parse @{u})
+	    BASE=$(cd feeds/$feed;git merge-base @ @{u})
+
+	    # if we are behind the remote automatically do a pull
+	    if [ $LOCAL = $BASE ]; then
+		(cd feeds/$feed ; git pull 1>/dev/null)
+
+		#redo the test here and see if the feeds.conf and git is still different.
+		in_git=$(cd feeds/$feed; git rev-parse HEAD)
+		if [ "$feed_hash" = "$in_git" ]
+		then
+		    continue
+		fi
+	    fi
+
+	    echo "Feed feeds/${feed} is at different commit than what is in feeds.conf"
+	    echo -n "Should we update feeds.conf to reflect the new version ? [y/N]:"
+	    read answer
+
+	    case $answer in
+		n|N|'')
+		    continue;;
+	    esac
+	    branch_uptodate feeds/${feed}
+	    create_feed_message ${feed} $feed_hash $in_git  >tmp/msg
+	    insert_feed_hash_in_feeds_config ${feed}
+	    commit_feeds_config tmp/msg
+	fi
     done
 }