From 06068d3950edda7e911a6bf5b9bc911302a49412 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 5 Apr 2016 15:06:50 +0200 Subject: [PATCH 01/67] questd hosts uscriptd and ueventd as well --- questd/Makefile | 4 ++-- questd/files/etc/init.d/quest | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/questd/Makefile b/questd/Makefile index 694479d67..69504d8ba 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd -PKG_VERSION:=3.0.0 +PKG_VERSION:=3.0.1 -PKG_SOURCE_VERSION:=4ec2f7e451941fbfbb990113b82c82bc8d906f57 +PKG_SOURCE_VERSION:=f6d17788f84a7493c1e3b3a64c00c7e8e5ae6a86 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd diff --git a/questd/files/etc/init.d/quest b/questd/files/etc/init.d/quest index 48185f8f2..bccb6463d 100755 --- a/questd/files/etc/init.d/quest +++ b/questd/files/etc/init.d/quest @@ -5,17 +5,28 @@ STOP=96 USE_PROCD=1 NAME=questd -PROG=/sbin/questd start_service() { procd_open_instance - procd_set_param command "$PROG" + procd_set_param command "/sbin/questd" + procd_set_param respawn + procd_close_instance + + procd_open_instance + procd_set_param command "/sbin/uscriptd" + procd_set_param respawn + procd_close_instance + + procd_open_instance + procd_set_param command "/sbin/ueventd" procd_set_param respawn procd_close_instance } stop() { service_stop /sbin/questd + service_stop /sbin/uscriptd + service_stop /sbin/ueventd } service_triggers() From 23a4f853015dbd12c3b60fa93fd09297c748152b Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 5 Apr 2016 15:48:23 +0200 Subject: [PATCH 02/67] Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * 5de4432 do not share object ------------------------------------------------------------------------------- commit 5de4432d19b043677b9c729701057ae8c0c37589 Author: Sukru Senli Date: 2016-04-05 15:47:48 +0200 do not share object Base directory -> / Makefile | 4 ++-- scriptd.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-- tools.c | 2 +- 3 files changed, 53 insertions(+), 5 deletions(-) ------------------------------------------------------------------------------- --- questd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/questd/Makefile b/questd/Makefile index 69504d8ba..5e355d6fd 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd PKG_VERSION:=3.0.1 -PKG_SOURCE_VERSION:=f6d17788f84a7493c1e3b3a64c00c7e8e5ae6a86 +PKG_SOURCE_VERSION:=5de4432d19b043677b9c729701057ae8c0c37589 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd From 4209b2f153ff90413ecb17efd96aeece52f45eeb Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 5 Apr 2016 16:54:47 +0200 Subject: [PATCH 03/67] questd: install ueventd and uscriptd --- questd/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/questd/Makefile b/questd/Makefile index 5e355d6fd..c2fd4e208 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd -PKG_VERSION:=3.0.1 +PKG_VERSION:=3.0.2 -PKG_SOURCE_VERSION:=5de4432d19b043677b9c729701057ae8c0c37589 +PKG_SOURCE_VERSION:=dd7371d62252de413d763c2cd7d1317e6e87394f PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd @@ -45,6 +45,8 @@ define Package/questd/install $(INSTALL_DIR) $(1)/sbin $(INSTALL_DIR) $(1)/tmp $(INSTALL_BIN) $(PKG_BUILD_DIR)/questd $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ueventd $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/uscriptd $(1)/sbin/ endef $(eval $(call BuildPackage,questd)) From 737efb21cf4d29a3e5a0591da9b3f7d3a9e32ab8 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 5 Apr 2016 17:52:43 +0200 Subject: [PATCH 04/67] set iup dhcp opts on all management interfaces --- iup/files/etc/init.d/iup | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/iup/files/etc/init.d/iup b/iup/files/etc/init.d/iup index 697a1fced..21826ebfd 100755 --- a/iup/files/etc/init.d/iup +++ b/iup/files/etc/init.d/iup @@ -13,6 +13,23 @@ include /lib/network CRONPATH="/etc/crontabs/root" RANGE=60 +management_interfaces() { + local DHCP_IFACES="" + + is_notbridged_dhcp() { + local config="$1" + local proto="$(uci -q get network.$config.proto)" + local typ="$(uci -q get network.$config.type)" + if [ "$proto" == "dhcp" -a "$typ" != "bridge" ]; then + DHCP_IFACES="$DHCP_IFACES $config" + fi + } + + config_load network + config_foreach is_notbridged_dhcp interface + echo $DHCP_IFACES +} + init_iup() { local interval local starttime @@ -35,9 +52,9 @@ init_iup() { local newreqopts= local baseopts= local reqopts="$(uci -q get network.wan.reqopts)" - local proto="$(uci -q get network.wan.proto)" local iupopts="66 67 128 224" local ropt iopt + local net config_get enabled iup enabled "on" for ropt in $reqopts; do case $ropt in @@ -53,12 +70,13 @@ init_iup() { *) newreqopts="$newreqopts $ropt" ;; esac done - if [ "$proto" == "dhcp" ]; then - newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')" - uci -q set network.wan.reqopts="$newreqopts" - uci commit network - ubus call network reload - fi + + newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')" + for net in $(management_interfaces); do + uci -q set network.$net.reqopts="$newreqopts" + done + uci commit network + ubus call network reload ################################################################# if [ $interval == "weekly" ]; then From 5d5890b591a5960d68e7e7d3665352f48f39001f Mon Sep 17 00:00:00 2001 From: Erik Horemans Date: Thu, 14 Apr 2016 09:44:34 +0200 Subject: [PATCH 05/67] new ice-client 3.4.1-RC9 --- ice-client/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ice-client/Makefile b/ice-client/Makefile index ba61a9e6c..8fc338647 100644 --- a/ice-client/Makefile +++ b/ice-client/Makefile @@ -16,14 +16,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:=3.4.1 -PKG_RELEASE:=RC8 +PKG_RELEASE:=RC9 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN) export PKG_VERSION ###########################--RELEASE--################################ PKG_SOURCE_URL:=ssh://git@private.inteno.se/ice-client.git -PKG_SOURCE_VERSION:=ecad8b60183b43ecf86543c0c29db46cda8aae29 +PKG_SOURCE_VERSION:=d3065ee24d72d3fffd5ff75b617bf54fb5377561 ifeq ($(CONFIG_ICE_OPEN),y) BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g) PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz @@ -897,10 +897,20 @@ endef define Package/ice-client-bcmspeedmgr/install $(INSTALL_DIR) $(1)/bin $(CP) $(PKG_BUILD_DIR)/daemons/bcmspeedmgr/obj/iopsys/bcmspeedmgr $(1)/bin + $(CP) $(PKG_BUILD_DIR)/daemons/bcmspeedmgr/obj/iopsys/speedsvc $(1)/bin $(INSTALL_DIR) $(1)/etc/init.d $(CP) $(PKG_BUILD_DIR)/platforms/iopsys/bcmspeedtestservice $(1)/etc/init.d/bcmspeedtestservice endef + +define Package/ice-client-bcmspeedmgr/postinst +#!/bin/sh +/etc/init.d/bcmspeedtestservice stop +/etc/init.d/bcmspeedtestservice start +exit 0 +endef + endif + # This line executes the necessary commands to compile our program. # The above define directives specify all the information needed, but this # line calls BuildPackage which in turn actually uses this information to From aa4aa231084b857cb583634d7325d6848f8588ba Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Fri, 15 Apr 2016 13:00:41 +0200 Subject: [PATCH 06/67] questd-3.1.0 --- questd/Makefile | 4 ++-- questd/files/tmp/igmp_snooping | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 questd/files/tmp/igmp_snooping diff --git a/questd/Makefile b/questd/Makefile index c2fd4e208..7c1b570a9 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd -PKG_VERSION:=3.0.2 +PKG_VERSION:=3.1.0 -PKG_SOURCE_VERSION:=dd7371d62252de413d763c2cd7d1317e6e87394f +PKG_SOURCE_VERSION:=13f6e7f89f1b0a86820a8239f739a5e8797f95ca PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd diff --git a/questd/files/tmp/igmp_snooping b/questd/files/tmp/igmp_snooping deleted file mode 100644 index 795f34e8d..000000000 --- a/questd/files/tmp/igmp_snooping +++ /dev/null @@ -1,5 +0,0 @@ -igmp snooping 2 proxy 1 lan2lan-snooping 0/0, rate-limit 0pps, priority -1 -bridge device src-dev #tags lan-tci wan-tci group mode RxGroup source reporter timeout Index ExcludPt -br-lan eth5 eth2.1 00 0x0000 0xffffffff 0xe0027ffe EX 0xe0027ffe 0x00000000 0xc0a801f1 258 0x401e0001 -1 -br-lan eth5 eth2.1 00 0x0000 0xffffffff 0xefc3ffff EX 0xefc3ffff 0x00000000 0xc0a801f1 258 0x400e0001 -1 -br-lan eth5 eth2.1 00 0x0000 0xffffffff 0xefffffff EX 0xefffffff 0x00000000 0xc0a801f1 258 0x40070001 -1 From c1f7ac0e5ec09e74a34e6d8cdada4217b06aa16c Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 19 Apr 2016 18:22:16 +0200 Subject: [PATCH 07/67] questd: updated Makefile --- questd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/questd/Makefile b/questd/Makefile index 7c1b570a9..88304f45e 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd PKG_VERSION:=3.1.0 -PKG_SOURCE_VERSION:=13f6e7f89f1b0a86820a8239f739a5e8797f95ca +PKG_SOURCE_VERSION:=f7e856ec68627842c1e79eadb5b856ec629bb637 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd From e89af64b6b2507c4ab78ef08fd15e99f287eab57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=85sberg?= Date: Fri, 22 Apr 2016 16:49:18 +0200 Subject: [PATCH 08/67] questd: makefile corrected --- questd/Makefile | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/questd/Makefile b/questd/Makefile index 88304f45e..b0e960bd4 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd PKG_VERSION:=3.1.0 -PKG_SOURCE_VERSION:=f7e856ec68627842c1e79eadb5b856ec629bb637 +PKG_SOURCE_VERSION:=d7e9195cfda57cfe361548a3cff35273c65626f3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd @@ -18,6 +18,24 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk +ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y) +EXTRA_CPPFLAGS += -DIOPSYS_BROADCOM +else +ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y) +EXTRA_CPPFLAGS += -DIOPSYS_BROADCOM +else +ifeq ($(CONFIG_TARGET_iopsys_marvell_arm),y) +EXTRA_CPPFLAGS += -DIOPSYS_MARVELL +else +ifeq ($(CONFIG_TARGET_lantiq_xrx500),y) +EXTRA_CPPFLAGS += -DIOPSYS_LANTIQ +else +$(info NO RECOGNIZED CONFIG_TARGET DEFINED) +endif +endif +endif +endif + LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/lib @@ -43,7 +61,6 @@ endef define Package/questd/install $(CP) ./files/* $(1)/ $(INSTALL_DIR) $(1)/sbin - $(INSTALL_DIR) $(1)/tmp $(INSTALL_BIN) $(PKG_BUILD_DIR)/questd $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ueventd $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/uscriptd $(1)/sbin/ From ab0c5c06b2cc70533aed80587840c614da70b080 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Sat, 23 Apr 2016 18:18:37 +0200 Subject: [PATCH 09/67] Revert "questd: makefile corrected" This reverts commit e89af64b6b2507c4ab78ef08fd15e99f287eab57. --- questd/Makefile | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/questd/Makefile b/questd/Makefile index b0e960bd4..88304f45e 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd PKG_VERSION:=3.1.0 -PKG_SOURCE_VERSION:=d7e9195cfda57cfe361548a3cff35273c65626f3 +PKG_SOURCE_VERSION:=f7e856ec68627842c1e79eadb5b856ec629bb637 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd @@ -18,24 +18,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk -ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y) -EXTRA_CPPFLAGS += -DIOPSYS_BROADCOM -else -ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y) -EXTRA_CPPFLAGS += -DIOPSYS_BROADCOM -else -ifeq ($(CONFIG_TARGET_iopsys_marvell_arm),y) -EXTRA_CPPFLAGS += -DIOPSYS_MARVELL -else -ifeq ($(CONFIG_TARGET_lantiq_xrx500),y) -EXTRA_CPPFLAGS += -DIOPSYS_LANTIQ -else -$(info NO RECOGNIZED CONFIG_TARGET DEFINED) -endif -endif -endif -endif - LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ -Wl,-rpath-link=$(STAGING_DIR)/lib @@ -61,6 +43,7 @@ endef define Package/questd/install $(CP) ./files/* $(1)/ $(INSTALL_DIR) $(1)/sbin + $(INSTALL_DIR) $(1)/tmp $(INSTALL_BIN) $(PKG_BUILD_DIR)/questd $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ueventd $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/uscriptd $(1)/sbin/ From 4f0d7b0de4002fc9b08a8ab3116ce6e46d8f86e8 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 12 Apr 2016 17:50:21 +0200 Subject: [PATCH 10/67] auto populate layer2 configs --- .../uci-defaults/20-layer2-config-generate | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 layer2interface/broadcom/etc/uci-defaults/20-layer2-config-generate diff --git a/layer2interface/broadcom/etc/uci-defaults/20-layer2-config-generate b/layer2interface/broadcom/etc/uci-defaults/20-layer2-config-generate new file mode 100644 index 000000000..16fa5d547 --- /dev/null +++ b/layer2interface/broadcom/etc/uci-defaults/20-layer2-config-generate @@ -0,0 +1,100 @@ +#!/bin/sh + +local hasEthWan="1" +local hasAdsl="$(db -q get hw.board.hasAdsl)" +local hasVdsl="$(db -q get hw.board.hasVdsl)" + +# populate layer2_interface_ethernet # +if [ "$hasEthWan" == "1" ]; then + local wanEthernetPort="$(db -q get hw.board.ethernetWanPort)" + wanEthernetPort="${wanEthernetPort:-eth0}" + if [ ! -f /etc/config/layer2_interface_ethernet -o -z "$(uci -q get layer2_interface_ethernet.@ethernet_interface[0].ifname)" ]; then + cat > /etc/config/layer2_interface_ethernet < /etc/config/layer2_interface_ethernet +fi + +# populate layer2_interface # +if [ "$hasAdsl" == "1" ]; then + if [ ! -f /etc/config/layer2_interface -o -z "$(uci -q get layer2_interface.capabilities)" ]; then + cat > /etc/config/layer2_interface < /etc/config/layer2_interface +fi + +# populate layer2_interface_adsl # +if [ "$hasAdsl" == "1" ]; then + local wanAdslPort=$(db -q get hw.board.adslWanPort) + wanAdslPort="${wanAdslPort:-atm0}" + if [ ! -f /etc/config/layer2_interface_adsl -o -z "$(uci -q get layer2_interface_adsl.@atm_bridge[0].ifname)" ]; then + cat > /etc/config/layer2_interface_adsl < /etc/config/layer2_interface_adsl +fi + +# populate layer2_interface_vdsl # +if [ "$hasVdsl" == "1" ]; then + local wanVdslPort=$(db -q get hw.board.vdslWanPort) + wanVdslPort="${wanVdslPort:-ptm0}" + if [ ! -f /etc/config/layer2_interface_vdsl -o -z "$(uci -q get layer2_interface_vdsl.@vdsl_interface[0].ifname)" ]; then + cat > /etc/config/layer2_interface_vdsl < /etc/config/layer2_interface_vdsl +fi + +sync From c595f79545776580499703872d8434ce223465f6 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 12 Apr 2016 18:24:03 +0200 Subject: [PATCH 11/67] layer2interface: for now populate network config ifnames along with layer2 configs --- .../etc/uci-defaults/20-layer2-config-generate | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/layer2interface/broadcom/etc/uci-defaults/20-layer2-config-generate b/layer2interface/broadcom/etc/uci-defaults/20-layer2-config-generate index 16fa5d547..dab9bb16f 100644 --- a/layer2interface/broadcom/etc/uci-defaults/20-layer2-config-generate +++ b/layer2interface/broadcom/etc/uci-defaults/20-layer2-config-generate @@ -4,6 +4,9 @@ local hasEthWan="1" local hasAdsl="$(db -q get hw.board.hasAdsl)" local hasVdsl="$(db -q get hw.board.hasVdsl)" +local LANPORTS="$(db -q get hw.board.ethernetLanPorts)" +local WANPORTS="" + # populate layer2_interface_ethernet # if [ "$hasEthWan" == "1" ]; then local wanEthernetPort="$(db -q get hw.board.ethernetWanPort)" @@ -16,6 +19,8 @@ config ethernet_interface 'Wan' option ifname '${wanEthernetPort}.1' EOF fi + local ifname="$(uci -q get layer2_interface_ethernet.@ethernet_interface[0].ifname)" + [ -n "$WANPORTS" ] && WANPORTS="$WANPORTS $ifname" || WANPORTS="$ifname" elif [ "$hasEthWan" == "0" ]; then echo "" > /etc/config/layer2_interface_ethernet fi @@ -73,6 +78,8 @@ config atm_bridge option 'atmtype' 'ubr' EOF fi + local ifname="$(uci -q get layer2_interface_adsl.@atm_bridge[0].ifname)" + [ -n "$WANPORTS" ] && WANPORTS="$WANPORTS $ifname" || WANPORTS="$ifname" elif [ "$hasAdsl" == "0" ]; then echo "" > /etc/config/layer2_interface_adsl fi @@ -93,8 +100,15 @@ config vdsl_interface option 'ipqos' '1' EOF fi + local ifname="$(uci -q get layer2_interface_vdsl.@vdsl_interface[0].ifname)" + [ -n "$WANPORTS" ] && WANPORTS="$WANPORTS $ifname" || WANPORTS="$ifname" elif [ "$hasVdsl" == "0" ]; then echo "" > /etc/config/layer2_interface_vdsl fi +# populate network config ifnames # +uci -q get network.lan.ifname >/dev/null || uci -q set network.lan.ifname="$LANPORTS" +uci -q get network.wan.ifname >/dev/null || uci -q set network.wan.ifname="$WANPORTS" +uci commit network + sync From 5433164b0827aa7464f40233bd83de9a94896b60 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Mon, 25 Apr 2016 13:54:32 +0200 Subject: [PATCH 12/67] ice-client-3.4.1RC11 --- ice-client/Makefile | 60 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 5 deletions(-) diff --git a/ice-client/Makefile b/ice-client/Makefile index 8fc338647..537c2557b 100644 --- a/ice-client/Makefile +++ b/ice-client/Makefile @@ -16,14 +16,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:=3.4.1 -PKG_RELEASE:=RC9 +PKG_RELEASE:=RC11 PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN) export PKG_VERSION ###########################--RELEASE--################################ PKG_SOURCE_URL:=ssh://git@private.inteno.se/ice-client.git -PKG_SOURCE_VERSION:=d3065ee24d72d3fffd5ff75b617bf54fb5377561 +PKG_SOURCE_VERSION:=184d29446fe6103f567c968bf35569625326a82c ifeq ($(CONFIG_ICE_OPEN),y) BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g) PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz @@ -136,7 +136,7 @@ define Package/ice-client/install $(CP) $(PKG_BUILD_DIR)/core/ice $(1)/bin $(CP) $(PKG_BUILD_DIR)/modules/system/ubusevent/obj/iopsys/ubusevent $(1)/bin $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/core/lib/{systemService.so.1.0.1,libconfStore.so.1,networkService.so.1.0.1,packageService.so.1.0.1,monitorService.so.1.0.1,iperfService.so.1.0.1,logService.so.1.0.1} $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/core/lib/{systemService.so.1.0.1,libconfStore.so.1,networkService.so.1.0.1,packageService.so.1.0.1,monitorService.so.1.0.1,iperfService.so.1.0.1,logService.so.1.0.1,texecService.so.1.0.1} $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/lib/wsice/obj/iopsys/libwsice.so $(1)/usr/lib $(INSTALL_DIR) $(1)/bin/ifs/iperf/execute $(INSTALL_DIR) $(1)/bin/ifs/iperf/progress @@ -162,8 +162,8 @@ cp /tmp/iopsysserver.ini /etc/iopsys/server.ini rm -f /tmp/iopsysserver.ini cp /tmp/ice.back /etc/config/ice rm -f /tmp/ice.back -if [ -f "/etc/rc.d/S99ice-client" ]; then - /etc/init.d/ice-client start +if [ -f "/etc/rc.d/S98ice-client" ]; then + /etc/init.d/ice-client restart fi exit 0 endef @@ -883,6 +883,55 @@ fi exit 0 endef +# texec +define Package/ice-client-texec + $(call Package/ice-client/Default) + TITLE:=texec + DEPENDS+= +endef + +define Package/ice-client-texec/description +remote script execution module for ice-client +endef + +define Package/ice-client-texec/prerm +#!/bin/sh +if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi +PROC_ID=$$(cat /tmp/ice.pid) +PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID}) +if [ -n "$$PROC_EXISTS" ]; then + read -t 1 <>/tmp/cfout + echo "system moduleRemove topic=texec" > /tmp/cfin +fi +exit 0 +endef + +define Package/ice-client-texec/preinst +#!/bin/sh +if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi +PROC_ID=$$(cat /tmp/ice.pid) +PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID}) +if [ -n "$$PROC_EXISTS" ]; then + read -t 1 <>/tmp/cfout + echo "system moduleRemove topic=tExecMgr" > /tmp/cfin +fi +exit 0 +endef + +define Package/ice-client-texec/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/core/lib/texecService.so.1.0.1 $(1)/usr/lib +endef + +define Package/ice-client-texec/postinst +#!/bin/sh +read -t 1 <>/tmp/cfout +if [ -f /tmp/ice.pid ]; then + echo "system moduleAdd file=texecService.so.1.0.1" package="ice-client-texec" > /tmp/cfin +fi +exit 0 +endef + # bmspeedtest define Package/ice-client-bcmspeedmgr $(call Package/ice-client/Default) @@ -931,5 +980,6 @@ $(eval $(call BuildPackage,ice-client-rework)) $(eval $(call BuildPackage,ice-client-sip)) $(eval $(call BuildPackage,ice-client-monitor)) $(eval $(call BuildPackage,ice-client-gigaset)) +$(eval $(call BuildPackage,ice-client-texec)) $(eval $(call BuildPackage,ice-client-bcmspeedmgr)) endif From 063e270ec494205ef45faef8400f77358998782a Mon Sep 17 00:00:00 2001 From: Alex Oprea Date: Wed, 27 Apr 2016 16:16:32 +0200 Subject: [PATCH 13/67] iup224 file permissions --- iup/files/sbin/iup224 | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 iup/files/sbin/iup224 diff --git a/iup/files/sbin/iup224 b/iup/files/sbin/iup224 old mode 100644 new mode 100755 From ca9ba7c9f8f690a75dcdbd4d1056ca7cafc1d6e5 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Fri, 29 Apr 2016 10:46:41 +0200 Subject: [PATCH 14/67] iup: option 224 follows standard --- iup/files/sbin/iup224 | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/iup/files/sbin/iup224 b/iup/files/sbin/iup224 index 587013611..40efb9037 100755 --- a/iup/files/sbin/iup224 +++ b/iup/files/sbin/iup224 @@ -32,7 +32,7 @@ elif [ $a ] && [ $b ] && [ $a -lt 25 ] ; then now=$(date +%s) end=$((begin+3600*$b)) if [ $now -gt $begin ] && [ $now -lt $end ] ; then - active=1 + active=1 fi elif [ $a ] && [ $b ] && [ $c ] && [ $a -gt 25 ] ; then #Date @@ -43,7 +43,7 @@ elif [ $a ] && [ $b ] && [ $c ] && [ $a -gt 25 ] ; then now=$(date +%s) end=$((begin+3600*$c)) if [ $now -gt $begin ] && [ $now -lt $end ] ; then - active=1 + active=1 fi else echo "Bad format" @@ -53,23 +53,25 @@ fi sofwareminuspath=${url##*/} if [ $url ] && [ $active -eq 1 ]; then - echo "Software version to download $sofwareminuspath" + echo "Software version to download $sofwareminuspath" local sysinfo=$(ubus call router quest "{ \"info\": \"system\" }") json_load "$sysinfo" json_get_var firmware firmware json_get_var filesystem filesystem - if [ "$filesystem" == "JFFS2" ] ; then - firmware=$firmware.w - else - firmware=$firmware.y - fi - if [ "$sofwareminuspath" == "${sofwareminuspath/$firmware/}" ] ; then + if [ "$filesystem" == "JFFS2" ] ; then + firmware=$firmware.w + firmware2=$firmware.w + else + firmware=$firmware.y + firmware2=$firmware.y2 + fi + if [ "$sofwareminuspath" == "${sofwareminuspath/$firmware/}" -o "$sofwareminuspath" == "${sofwareminuspath/$firmware2/}" ] ; then echo "Image found $url will start flashing" - /sbin/sysupgrade -v $url + /sbin/sysupgrade -v $url & + exit 1 else echo "Will not update software, already up to date" + exit 0 fi fi - - From 48a036c8aa63f9d3b984e6ca9b6746712963ee68 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Sat, 30 Apr 2016 11:58:17 +0200 Subject: [PATCH 15/67] questd-3.1.2 --- questd/Makefile | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/questd/Makefile b/questd/Makefile index 88304f45e..6e9319615 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd -PKG_VERSION:=3.1.0 +PKG_VERSION:=3.1.2 -PKG_SOURCE_VERSION:=f7e856ec68627842c1e79eadb5b856ec629bb637 +PKG_SOURCE_VERSION:=36c8dc05fc27577c9ae8acf8ba6ab8e10b7ac2fd PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd @@ -18,16 +18,21 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk -LDFLAGS+= \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath-link=$(STAGING_DIR)/lib - -ifeq ($(CONFIG_PACKAGE_bcmkernel),y) -BCMKERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx +ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y) +QUESTD_CLFAGS:=-DIOPSYS_BROADCOM +KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx +else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y) +QUESTD_CLFAGS:=-DIOPSYS_BROADCOM +else ifeq ($(CONFIG_TARGET_iopsys_linksys),y) +QUESTD_CLFAGS:=-DIOPSYS_MARVELL +else ifeq ($(CONFIG_TARGET_lantiq_xrx500),y) +QUESTD_CLFAGS:=-DIOPSYS_LANTIQ else -BCMKERNEL_DIR:=$(BUILD_DIR)/bcmopen-consumer/bcm963xx +$(info (UNEXPECTED CONFIG TARGET)) endif -export BCMKERNEL_DIR + +export KERNEL_DIR +export QUESTD_CLFAGS define Package/questd CATEGORY:=Utilities @@ -43,7 +48,6 @@ endef define Package/questd/install $(CP) ./files/* $(1)/ $(INSTALL_DIR) $(1)/sbin - $(INSTALL_DIR) $(1)/tmp $(INSTALL_BIN) $(PKG_BUILD_DIR)/questd $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ueventd $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/uscriptd $(1)/sbin/ From 2d1e46af5dd0152a217c574899c1bd9f8226799c Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Mon, 2 May 2016 11:35:29 +0200 Subject: [PATCH 16/67] questd-3.1.3 --- questd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/questd/Makefile b/questd/Makefile index 6e9319615..4ddc38ac2 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd -PKG_VERSION:=3.1.2 +PKG_VERSION:=3.1.3 -PKG_SOURCE_VERSION:=36c8dc05fc27577c9ae8acf8ba6ab8e10b7ac2fd +PKG_SOURCE_VERSION:=8ec68d943e733c3007d1eecbeecdad153e733fe1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd From 3384f5ae7f17769561c2454b9a417ebd11b4fba6 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 19 Apr 2016 15:29:34 +0200 Subject: [PATCH 17/67] port_management: populate ports config if it has invalid config --- port-management/files/etc/init.d/port_management | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/port-management/files/etc/init.d/port_management b/port-management/files/etc/init.d/port_management index 53cadfeb0..f2a7a4fa4 100755 --- a/port-management/files/etc/init.d/port_management +++ b/port-management/files/etc/init.d/port_management @@ -12,14 +12,14 @@ check_for_config(){ if [ -s "/etc/config/ports" ] then debug_print "file exists and has content" - if uci -q show ports >/dev/null #are there any valid content then continue + if uci -q get ports.@ethport[0] >/dev/null #are there any valid content then continue then return 0 else rm -f /etc/config/ports fi fi - debug_print "file doesent exsists or is empty" + debug_print "ports config file doesn't exsist or is empty" touch /etc/config/ports local portnames="$(db get hw.board.ethernetPortNames)" local portorder="$(db get hw.board.ethernetPortOrder)" From a4b44d7415248cb6f5af1e86453d6e712b129c08 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Mon, 4 Apr 2016 18:31:23 +0200 Subject: [PATCH 18/67] icwmp-3.0-2016-03-30 --- icwmp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icwmp/Makefile b/icwmp/Makefile index dfb10c7c7..72bcd9369 100644 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icwmp -PKG_VERSION:=3.0-2016-03-14 +PKG_VERSION:=3.0-2016-03-30 PKG_FIXUP:=autoreconf PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=dd333f6ce85bbc66bfbd00f10dbbcade6a6d236a +PKG_SOURCE_VERSION:=dc22607a3da41e5c3c095dc5fed33d4ec7b3fbb5 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) From eccfa20011daef792dc19c8001555be52192ef0f Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 3 May 2016 12:06:18 +0200 Subject: [PATCH 19/67] Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * 9467625 add some more wireless info to clients ------------------------------------------------------------------------------- commit 9467625ceb2636ca1487e400ef119f374946beb0 Author: Sukru Senli Date: 2016-05-03 12:05:37 +0200 add some more wireless info to clients Base directory -> / questd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ------------------------------------------------------------------------------- --- questd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/questd/Makefile b/questd/Makefile index 4ddc38ac2..d29c35d75 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd PKG_VERSION:=3.1.3 -PKG_SOURCE_VERSION:=8ec68d943e733c3007d1eecbeecdad153e733fe1 +PKG_SOURCE_VERSION:=9467625ceb2636ca1487e400ef119f374946beb0 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd From d3e9574cccdc595398e2cac0fc9f69dcf33cacf6 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 3 May 2016 12:37:00 +0200 Subject: [PATCH 20/67] questd: install wificontrol --- questd/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/questd/Makefile b/questd/Makefile index d29c35d75..7e432aff7 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd -PKG_VERSION:=3.1.3 +PKG_VERSION:=3.1.4 -PKG_SOURCE_VERSION:=9467625ceb2636ca1487e400ef119f374946beb0 +PKG_SOURCE_VERSION:=027cbe5e5860b921b8d9dd95548499d18533d976 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd @@ -51,6 +51,7 @@ define Package/questd/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/questd $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ueventd $(1)/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/uscriptd $(1)/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/wificontrol $(1)/sbin/ endef $(eval $(call BuildPackage,questd)) From 75e0d5a48154af29d5d04029df5d460994cd5b34 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Wed, 4 May 2016 13:22:32 +0200 Subject: [PATCH 21/67] Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * ff58bac questd: add missing _ to parameters * 0866c35 wificontrol: check arp list too ------------------------------------------------------------------------------- commit ff58bac2696667ecab36afa2d93e7595fe9a992e Author: Sukru Senli Date: 2016-05-04 13:21:39 +0200 questd: add missing _ to parameters Base directory -> / questd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ------------------------------------------------------------------------------- commit 0866c3584e4ff0295b6b30afa30105fe3076a1bb Author: Sukru Senli Date: 2016-05-04 13:13:08 +0200 wificontrol: check arp list too Base directory -> / wificontrol.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) ------------------------------------------------------------------------------- --- questd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/questd/Makefile b/questd/Makefile index 7e432aff7..110956cad 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd PKG_VERSION:=3.1.4 -PKG_SOURCE_VERSION:=027cbe5e5860b921b8d9dd95548499d18533d976 +PKG_SOURCE_VERSION:=ff58bac2696667ecab36afa2d93e7595fe9a992e PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd From ec82e9de8f5fb9e6ff840cb0d81ad763fb703e12 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Wed, 4 May 2016 17:04:13 +0200 Subject: [PATCH 22/67] questd-3.1.5 --- questd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/questd/Makefile b/questd/Makefile index 110956cad..25837abe8 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd -PKG_VERSION:=3.1.4 +PKG_VERSION:=3.1.5 -PKG_SOURCE_VERSION:=ff58bac2696667ecab36afa2d93e7595fe9a992e +PKG_SOURCE_VERSION:=6a5ced85115fa7fb29a98684252a530bd1f1b34c PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd From e3e91475978dbfe504eddd40cdf2a3768e41e55c Mon Sep 17 00:00:00 2001 From: Alex Oprea Date: Wed, 4 May 2016 17:07:02 +0200 Subject: [PATCH 23/67] iup224: fix cicling reboot --- iup/files/sbin/iup224 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/iup/files/sbin/iup224 b/iup/files/sbin/iup224 index 40efb9037..dd128c1ab 100755 --- a/iup/files/sbin/iup224 +++ b/iup/files/sbin/iup224 @@ -50,22 +50,22 @@ else exit 1 fi -sofwareminuspath=${url##*/} +softwareminuspath=${url##*/} if [ $url ] && [ $active -eq 1 ]; then - echo "Software version to download $sofwareminuspath" + echo "Software version to download $softwareminuspath" local sysinfo=$(ubus call router quest "{ \"info\": \"system\" }") json_load "$sysinfo" json_get_var firmware firmware json_get_var filesystem filesystem if [ "$filesystem" == "JFFS2" ] ; then - firmware=$firmware.w + firmware1=$firmware.w firmware2=$firmware.w else - firmware=$firmware.y + firmware1=$firmware.y firmware2=$firmware.y2 fi - if [ "$sofwareminuspath" == "${sofwareminuspath/$firmware/}" -o "$sofwareminuspath" == "${sofwareminuspath/$firmware2/}" ] ; then + if [ "$softwareminuspath" == "${softwareminuspath/$firmware1/}" -o "$softwareminuspath" == "${softwareminuspath/$firmware2/}" ] ; then echo "Image found $url will start flashing" /sbin/sysupgrade -v $url & exit 1 From ab06c82297edb7b4807382290d26241c5f23f9d9 Mon Sep 17 00:00:00 2001 From: Kenneth Johansson Date: Fri, 1 Apr 2016 15:44:08 +0200 Subject: [PATCH 24/67] Update feed [ feed_inteno_packages ] package [ peripheral_manager ] ------------------------------------------------------------------------------- * 8be3060 Don't allow setting filter on model 302. * d341ac8 add debug program for eco ghost press. ------------------------------------------------------------------------------- commit 8be3060315f010fbf1bde723e0674e4a65fa9ccb Author: Kenneth Johansson Date: 2016-04-01 15:40:24 +0200 Don't allow setting filter on model 302. Base directory -> / src/catv.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) ------------------------------------------------------------------------------- commit d341ac83376fb3714a6b1401d4a3e7c199bc76f7 Author: Kenneth Johansson Date: 2016-03-15 15:53:30 +0100 add debug program for eco ghost press. Base directory -> / Makefile.am | 7 ++++++- src/eco_bug.c | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) ------------------------------------------------------------------------------- --- peripheral_manager/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/peripheral_manager/Makefile b/peripheral_manager/Makefile index 649071b5b..47db4b2a9 100644 --- a/peripheral_manager/Makefile +++ b/peripheral_manager/Makefile @@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager PKG_VERSION:=1.0.0 PKG_RELEASE:=1 -PKG_SOURCE_VERSION:=6a89f70edec94286a790cbb7c76debec6bb1c873 +PKG_SOURCE_VERSION:=8be3060315f010fbf1bde723e0674e4a65fa9ccb PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se/peripheral_manager From a81973c7ec345ec84f423ccd8e596c956821ce5a Mon Sep 17 00:00:00 2001 From: Kenneth Johansson Date: Fri, 15 Apr 2016 14:52:30 +0200 Subject: [PATCH 25/67] Update feed [ feed_inteno_packages ] package [ peripheral_manager ] ------------------------------------------------------------------------------- * bc5b822 add allflash state. ------------------------------------------------------------------------------- commit bc5b8227410dac75d2525ef1946b842766982830 Author: Kenneth Johansson Date: 2016-04-15 14:45:17 +0200 add allflash state. Base directory -> / src/led.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) ------------------------------------------------------------------------------- --- peripheral_manager/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/peripheral_manager/Makefile b/peripheral_manager/Makefile index 47db4b2a9..3c6aaff1a 100644 --- a/peripheral_manager/Makefile +++ b/peripheral_manager/Makefile @@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager PKG_VERSION:=1.0.0 PKG_RELEASE:=1 -PKG_SOURCE_VERSION:=8be3060315f010fbf1bde723e0674e4a65fa9ccb +PKG_SOURCE_VERSION:=bc5b8227410dac75d2525ef1946b842766982830 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se/peripheral_manager From e8fd9b654ac274caf3d3ff8298a6421ee4a39e6a Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Wed, 4 May 2016 13:22:44 +0200 Subject: [PATCH 26/67] Update feed [ feed_inteno_packages ] package [ peripheral_manager ] ------------------------------------------------------------------------------- * e130cb0 Add enable for leds. ------------------------------------------------------------------------------- commit e130cb0369b750d97cf2d4af081149cad7f6bb38 Author: Kenneth Johansson Date: 2016-04-27 12:54:13 +0200 Add enable for leds. when enable set to 0 the led function will internally be set to state OFF. it will still record any updates to state and when enable is set to 1 again will show whatever state has been set to during the time it was disabled. Base directory -> / src/led.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) ------------------------------------------------------------------------------- --- peripheral_manager/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/peripheral_manager/Makefile b/peripheral_manager/Makefile index 3c6aaff1a..880b65bdc 100644 --- a/peripheral_manager/Makefile +++ b/peripheral_manager/Makefile @@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager PKG_VERSION:=1.0.0 PKG_RELEASE:=1 -PKG_SOURCE_VERSION:=bc5b8227410dac75d2525ef1946b842766982830 +PKG_SOURCE_VERSION:=e130cb0369b750d97cf2d4af081149cad7f6bb38 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se/peripheral_manager From 07a4f41116d5691d5b67915a3d67c2ef345490e6 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Mon, 9 May 2016 10:34:32 +0200 Subject: [PATCH 27/67] peripheral_manager: wait fir led.status ubus object to be created --- peripheral_manager/files/etc/init.d/peripheral_manager | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/peripheral_manager/files/etc/init.d/peripheral_manager b/peripheral_manager/files/etc/init.d/peripheral_manager index 85cd95ed9..82f624f8c 100755 --- a/peripheral_manager/files/etc/init.d/peripheral_manager +++ b/peripheral_manager/files/etc/init.d/peripheral_manager @@ -15,7 +15,7 @@ start_service() { } service_running() { - ubus -t 2 wait_for leds + ubus -t 2 wait_for led.status ubus call led.status set '{"state":"ok"}' } From 4ac9dcbcf44dcebbfe7afdd179df770732cd6c04 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Mon, 9 May 2016 10:36:33 +0200 Subject: [PATCH 28/67] voice-client: call_filter0 is default call_filter --- voice-client/files/etc/init.d/voice_client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voice-client/files/etc/init.d/voice_client b/voice-client/files/etc/init.d/voice_client index 7860fc037..b62ce3364 100755 --- a/voice-client/files/etc/init.d/voice_client +++ b/voice-client/files/etc/init.d/voice_client @@ -1268,7 +1268,7 @@ get_call_filter() fi local call_filter enabled - config_get call_filter $provider call_filter + config_get call_filter $provider call_filter "call_filter0" if ! [ -z "$call_filter" -o "$call_filter" == "-" ] ; then macro="Macro($call_filter-$direction)" fi From 3c60ea1eaed885be31d7f6a54e06612670b59fe0 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Mon, 9 May 2016 10:39:29 +0200 Subject: [PATCH 29/67] voice-client: ringing schedule is off by default --- voice-client/files/etc/uci-defaults/99-voice_client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voice-client/files/etc/uci-defaults/99-voice_client b/voice-client/files/etc/uci-defaults/99-voice_client index 7913b9fa4..b550e517e 100755 --- a/voice-client/files/etc/uci-defaults/99-voice_client +++ b/voice-client/files/etc/uci-defaults/99-voice_client @@ -20,7 +20,7 @@ uci -q batch <<-EOT add voice_client ringing_status rename voice_client.@ringing_status[-1]=RINGING_STATUS set voice_client.RINGING_STATUS.status=0 - set voice_client.RINGING_STATUS.enabled=1 + set voice_client.RINGING_STATUS.enabled=0 set voice_client.RINGING_STATUS.shouldring=1 commit voice_client EOT From cd3e774fb1b06058d9ebc30c7d745b457ec63251 Mon Sep 17 00:00:00 2001 From: Alex Oprea Date: Mon, 9 May 2016 15:19:08 +0200 Subject: [PATCH 30/67] iup: delay iup224 untill dns is reacheable refs #9073 --- iup/files/sbin/iup224 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/iup/files/sbin/iup224 b/iup/files/sbin/iup224 index dd128c1ab..330427cc3 100755 --- a/iup/files/sbin/iup224 +++ b/iup/files/sbin/iup224 @@ -1,6 +1,7 @@ #!/bin/sh . /usr/share/libubox/jshn.sh +. /lib/network/config.sh if [ -z $1 ] ; then echo "No argument" @@ -67,6 +68,7 @@ if [ $url ] && [ $active -eq 1 ]; then fi if [ "$softwareminuspath" == "${softwareminuspath/$firmware1/}" -o "$softwareminuspath" == "${softwareminuspath/$firmware2/}" ] ; then echo "Image found $url will start flashing" + wait_for_dns $url /sbin/sysupgrade -v $url & exit 1 else From 0b353ab84ee7cd43329ca95c3c974d1995fa0035 Mon Sep 17 00:00:00 2001 From: Alex Oprea Date: Thu, 12 May 2016 18:19:33 +0200 Subject: [PATCH 31/67] iup: option 224 fix ciclying reboot refs #9077 --- iup/files/sbin/iup224 | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/iup/files/sbin/iup224 b/iup/files/sbin/iup224 index 330427cc3..e252976e7 100755 --- a/iup/files/sbin/iup224 +++ b/iup/files/sbin/iup224 @@ -58,15 +58,8 @@ if [ $url ] && [ $active -eq 1 ]; then local sysinfo=$(ubus call router quest "{ \"info\": \"system\" }") json_load "$sysinfo" json_get_var firmware firmware - json_get_var filesystem filesystem - if [ "$filesystem" == "JFFS2" ] ; then - firmware1=$firmware.w - firmware2=$firmware.w - else - firmware1=$firmware.y - firmware2=$firmware.y2 - fi - if [ "$softwareminuspath" == "${softwareminuspath/$firmware1/}" -o "$softwareminuspath" == "${softwareminuspath/$firmware2/}" ] ; then + local firmware_new=${softwareminuspath%.*} # remove extension (.w, .y or .y2) from filename + if [ "$firmware_new" != "$firmware" ] ; then echo "Image found $url will start flashing" wait_for_dns $url /sbin/sysupgrade -v $url & From b2a32dac168dbb1d76d8614f532f7de9561b10b6 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Thu, 12 May 2016 19:17:40 +0200 Subject: [PATCH 32/67] peripheral_manager: wait for ubus button object to be created before exiting init script --- peripheral_manager/files/etc/init.d/peripheral_manager | 1 + 1 file changed, 1 insertion(+) diff --git a/peripheral_manager/files/etc/init.d/peripheral_manager b/peripheral_manager/files/etc/init.d/peripheral_manager index 82f624f8c..ca4c22552 100755 --- a/peripheral_manager/files/etc/init.d/peripheral_manager +++ b/peripheral_manager/files/etc/init.d/peripheral_manager @@ -17,6 +17,7 @@ start_service() { service_running() { ubus -t 2 wait_for led.status ubus call led.status set '{"state":"ok"}' + ubus -t 2 wait_for button } stop() { From 7d47e904d169414245346ff951eb1632fd615221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=B6glund?= Date: Wed, 1 Jun 2016 14:37:24 +0200 Subject: [PATCH 33/67] New defconfig syntax in customer configs --- iop/scripts/genconfig.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iop/scripts/genconfig.sh b/iop/scripts/genconfig.sh index 1cde98ca5..c64f5ed37 100755 --- a/iop/scripts/genconfig.sh +++ b/iop/scripts/genconfig.sh @@ -175,7 +175,7 @@ function genconfig { fi if [ -e "$CUSTCONF/$BOARDTYPE/$CUSTOMER/$BOARDTYPE.diff" ]; then v "Apply $CUSTCONF/$BOARDTYPE/$CUSTOMER/$BOARDTYPE.diff" - generate_config $CUSTCONF/$BOARDTYPE/$CUSTOMER/$BOARDTYPE.diff .config + cat $CUSTCONF/$BOARDTYPE/$CUSTOMER/$BOARDTYPE.diff >> .config fi fi From 9c5b671627625ddfa9b95663c823591a0f5d4181 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Wed, 1 Jun 2016 17:02:07 +0200 Subject: [PATCH 34/67] questd-3.1.6 --- questd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/questd/Makefile b/questd/Makefile index 60f469fcd..90ca00a2e 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd -PKG_VERSION:=3.1.5 +PKG_VERSION:=3.1.6 -PKG_SOURCE_VERSION:=d9a0a35d7fd75aae01e915c43e40ea3e08c477bc +PKG_SOURCE_VERSION:=56cf08e9aef1dbadfba7f970fc153c5df3b42a7f PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd From fe97541f89935ba322e182c623cb8e4a84873f10 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Wed, 1 Jun 2016 17:29:51 +0200 Subject: [PATCH 35/67] updated questd --- questd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/questd/Makefile b/questd/Makefile index 90ca00a2e..15b2222dc 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd PKG_VERSION:=3.1.6 -PKG_SOURCE_VERSION:=56cf08e9aef1dbadfba7f970fc153c5df3b42a7f +PKG_SOURCE_VERSION:=bdb047286b4a141b448995974eea4541502c545f PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd From 961b2caaf9b9bd80ea8a7fad6f008103f12ea579 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Thu, 2 Jun 2016 16:04:25 +0200 Subject: [PATCH 36/67] 3.0-2016-06-02 --- icwmp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icwmp/Makefile b/icwmp/Makefile index 071745ac8..1ea838df2 100755 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icwmp -PKG_VERSION:=3.0-2016-05-31 +PKG_VERSION:=3.0-2016-06-02 PKG_FIXUP:=autoreconf PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=511abf67c23fc497c1cc53ad1c538d05742b6246 +PKG_SOURCE_VERSION:=3796902ebf44c3cd00b3829ef7aca911cdde2cc7 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) From aad4b455b21da12fb93654e7fff59e08556e168e Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Wed, 8 Jun 2016 15:12:39 +0200 Subject: [PATCH 37/67] layer2interface: set xtm qos weight to 1 --- layer2interface/broadcom/etc/init.d/layer2_interface_adsl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/layer2interface/broadcom/etc/init.d/layer2_interface_adsl b/layer2interface/broadcom/etc/init.d/layer2_interface_adsl index 0c779ce3e..435b89e38 100755 --- a/layer2interface/broadcom/etc/init.d/layer2_interface_adsl +++ b/layer2interface/broadcom/etc/init.d/layer2_interface_adsl @@ -99,9 +99,9 @@ atm_inf_conf() { checkxtmlist $atmtype $pcr $scr $mbs ret="$?" - xtmctl operate conn --add 1.$vpi.$vci aal5 $encaps 0 $ret $ret - xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 - xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # fixes pppoe disconnect issue + xtmctl operate conn --add 1.$vpi.$vci aal5 $encaps 0 1 $ret + xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 # low priority queue + xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # high priority queue xtmctl operate conn --createnetdev 1.$vpi.$vci ${ifname%%.*} xtmctl operate intf --state 1 enable From 463c4f0855e08d8c6817f8022f29995377bf7c5b Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Thu, 9 Jun 2016 16:02:35 +0200 Subject: [PATCH 38/67] iop: genconfig applies luci profile correctly --- iop/configs/luci.diff | 80 +++++++++++++++++++--------------------- iop/scripts/genconfig.sh | 2 +- 2 files changed, 39 insertions(+), 43 deletions(-) diff --git a/iop/configs/luci.diff b/iop/configs/luci.diff index b946bbe28..956c95883 100755 --- a/iop/configs/luci.diff +++ b/iop/configs/luci.diff @@ -1,43 +1,39 @@ -/CONFIG_DEFAULT_juci/d -/CONFIG_PACKAGE_juci/d - -/CONFIG_PACKAGE_luci/d -$a\CONFIG_PACKAGE_luci=y -$a\CONFIG_PACKAGE_luci-mod-admin-core=y -$a\CONFIG_PACKAGE_luci-mod-admin-full=y -$a\CONFIG_PACKAGE_luci-app-catv=y -$a\CONFIG_PACKAGE_luci-app-ddns=y -$a\CONFIG_PACKAGE_luci-app-dslstats=y -$a\CONFIG_PACKAGE_luci-app-firewall=y -$a\CONFIG_PACKAGE_luci-app-iup=y -$a\CONFIG_PACKAGE_luci-app-mcpd=y -$a\CONFIG_PACKAGE_luci-app-minidlna=y -$a\CONFIG_PACKAGE_luci-app-multiwan=y -$a\CONFIG_PACKAGE_luci-app-p910nd=y -$a\CONFIG_PACKAGE_luci-app-parental-control=y -$a\CONFIG_PACKAGE_luci-app-port-management=y -$a\CONFIG_PACKAGE_luci-app-power-mgmt=y -$a\CONFIG_PACKAGE_luci-app-samba=y -$a\CONFIG_PACKAGE_luci-app-sfp=y -$a\CONFIG_PACKAGE_luci-app-snmp=y -$a\CONFIG_PACKAGE_luci-app-speedtest=y -$a\CONFIG_PACKAGE_luci-app-upnp=y -$a\CONFIG_PACKAGE_luci-app-voice=y -$a\CONFIG_PACKAGE_luci-theme-base=y -$a\CONFIG_PACKAGE_luci-theme-bootstrap=y -$a\CONFIG_PACKAGE_luci-i18n-english=y -$a\CONFIG_PACKAGE_luci-proto-3g=y -$a\CONFIG_PACKAGE_luci-proto-4g=y -$a\CONFIG_PACKAGE_luci-proto-core=y -$a\CONFIG_PACKAGE_luci-proto-ipv6=y -$a\CONFIG_PACKAGE_luci-proto-ppp=y -$a\CONFIG_PACKAGE_luci-sgi-cgi=y -$a\CONFIG_PACKAGE_luci-lib-core=y -$a\CONFIG_PACKAGE_luci-lib-core_source=y -$a\CONFIG_PACKAGE_luci-lib-ipkg=y -$a\CONFIG_PACKAGE_luci-lib-json=y -$a\CONFIG_PACKAGE_luci-lib-nixio=y -$a\CONFIG_PACKAGE_luci-lib-nixio_notls=y -$a\CONFIG_PACKAGE_luci-lib-sys=y -$a\CONFIG_PACKAGE_luci-lib-web=y +CONFIG_PACKAGE_luci=y +CONFIG_PACKAGE_luci-mod-admin-core=y +CONFIG_PACKAGE_luci-mod-admin-full=y +CONFIG_PACKAGE_luci-app-catv=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 diff --git a/iop/scripts/genconfig.sh b/iop/scripts/genconfig.sh index c64f5ed37..b59f8172a 100755 --- a/iop/scripts/genconfig.sh +++ b/iop/scripts/genconfig.sh @@ -151,7 +151,7 @@ function genconfig { # Apply profile diff to master config if selected if [ -n "$PROFILE" ]; then if [ -e "$CONFIGPATH/$PROFILE.diff" ]; then - generate_config configs/$PROFILE.diff .config + cat $CONFIGPATH/$PROFILE.diff >> .config elif [ "$PROFILE" == "juci" ]; then v "Default profile (juci) is selected." else From f9e105133a2b08bb32cd5eb0db6ae48a00f63e49 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Thu, 9 Jun 2016 17:22:48 +0200 Subject: [PATCH 39/67] iop: remove uhttpd if profile is luci --- iop/scripts/genconfig.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/iop/scripts/genconfig.sh b/iop/scripts/genconfig.sh index b59f8172a..cc71b6b4c 100755 --- a/iop/scripts/genconfig.sh +++ b/iop/scripts/genconfig.sh @@ -211,6 +211,7 @@ function genconfig { 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 echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"') From 65be93fb61e3e027961d9e7a5b849bf7772d901a Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Thu, 9 Jun 2016 17:26:41 +0200 Subject: [PATCH 40/67] icwmp: depend on curl --- icwmp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icwmp/Makefile b/icwmp/Makefile index 1ea838df2..f31a10c18 100755 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -34,7 +34,7 @@ define Package/icwmp/Default SECTION:=utils CATEGORY:=Utilities TITLE:=CWMP client - DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libexpat + DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libexpat +curl endef define Package/icwmp/description From 8e63cdb53b83d869b30faf3fae67751485af27f9 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Thu, 9 Jun 2016 17:38:20 +0200 Subject: [PATCH 41/67] iop: do not select luci-app-catv by default in luci.diff profile --- iop/configs/luci.diff | 1 - 1 file changed, 1 deletion(-) diff --git a/iop/configs/luci.diff b/iop/configs/luci.diff index 956c95883..fc6212859 100755 --- a/iop/configs/luci.diff +++ b/iop/configs/luci.diff @@ -1,7 +1,6 @@ CONFIG_PACKAGE_luci=y CONFIG_PACKAGE_luci-mod-admin-core=y CONFIG_PACKAGE_luci-mod-admin-full=y -CONFIG_PACKAGE_luci-app-catv=y CONFIG_PACKAGE_luci-app-ddns=y CONFIG_PACKAGE_luci-app-dslstats=y CONFIG_PACKAGE_luci-app-firewall=y From 931ae16fec037104b1f81c388cc7e3e14a0aa84e Mon Sep 17 00:00:00 2001 From: Ronny Nilsson Date: Tue, 14 Jun 2016 10:31:28 +0200 Subject: [PATCH 42/67] New wrapper script for dectmngr2 which reloads kernel module when necessary --- dectmngr2/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/dectmngr2/Makefile b/dectmngr2/Makefile index 518dd23e7..8e1707de3 100644 --- a/dectmngr2/Makefile +++ b/dectmngr2/Makefile @@ -46,6 +46,7 @@ define Package/dectmngr2/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/target.bin $(1)/etc/dect/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/nvs_default $(1)/etc/dect/ $(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 endef From 194978c7d27d059966efd3e10696eeac515f009a Mon Sep 17 00:00:00 2001 From: Ronny Nilsson Date: Tue, 14 Jun 2016 15:17:30 +0200 Subject: [PATCH 43/67] Update feed [ feed_inteno_packages ] package [ asterisk18-mod ] Debug printouts ------------------------------------------------------------------------------- ------------------------------------------------------------------------------- --- asterisk-1.8.x-mod/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asterisk-1.8.x-mod/Makefile b/asterisk-1.8.x-mod/Makefile index f885e7960..e0d133794 100644 --- a/asterisk-1.8.x-mod/Makefile +++ b/asterisk-1.8.x-mod/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk18-mod PKG_VERSION:=1.8.10.1 -PKG_SOURCE_VERSION:=6c098c4b82bf3ce4cf3e25b398198914c16c05ad +PKG_SOURCE_VERSION:=1618b4881a44ea493c602da5c60723c45509719a PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/asterisk-1.8.x From 1d52207a7fe7031536fed149215c7db50a634bd3 Mon Sep 17 00:00:00 2001 From: Ronny Nilsson Date: Tue, 14 Jun 2016 15:38:59 +0200 Subject: [PATCH 44/67] Fix for dect unpair and re-pair with voice. refs #9463 --- dectmngr2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dectmngr2/Makefile b/dectmngr2/Makefile index 8e1707de3..247e54a59 100644 --- a/dectmngr2/Makefile +++ b/dectmngr2/Makefile @@ -11,7 +11,7 @@ PKG_RELEASE:=1 PKG_VERSION:=1.1.0 PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=724cc19727f85b18aeb920eff24a403a03628959 +PKG_SOURCE_VERSION:=46658e95b19c35ff6194a9566bb5439720ec251d PKG_NAME:=dectmngr2 From 4d7d03950a3d8a1c885508f2c6aa1a75cf622788 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 14 Jun 2016 19:09:44 +0200 Subject: [PATCH 45/67] update questd --- questd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/questd/Makefile b/questd/Makefile index 15b2222dc..a1a2c36d5 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd PKG_VERSION:=3.1.6 -PKG_SOURCE_VERSION:=bdb047286b4a141b448995974eea4541502c545f +PKG_SOURCE_VERSION:=ea462d795bf25a4837968fd77bfeda1b44c2f2c7 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd From 52c52247eb14fbb37bef76f4e9e3ed38b23ecd62 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Wed, 15 Jun 2016 17:55:58 +0200 Subject: [PATCH 46/67] asterisk updated --- asterisk-1.8.x-mod/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asterisk-1.8.x-mod/Makefile b/asterisk-1.8.x-mod/Makefile index e0d133794..a2a0b1085 100644 --- a/asterisk-1.8.x-mod/Makefile +++ b/asterisk-1.8.x-mod/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk18-mod PKG_VERSION:=1.8.10.1 -PKG_SOURCE_VERSION:=1618b4881a44ea493c602da5c60723c45509719a +PKG_SOURCE_VERSION:=015d279241d0ac5d8c1321aa6f78b9ae551575d1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/asterisk-1.8.x From 0836a0cc62ef354e6f6ed33df940431becedbd8f Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Thu, 16 Jun 2016 14:32:42 +0200 Subject: [PATCH 47/67] 3.0-2016-06-16 --- icwmp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icwmp/Makefile b/icwmp/Makefile index f31a10c18..e18f8b07e 100755 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icwmp -PKG_VERSION:=3.0-2016-06-02 +PKG_VERSION:=3.0-2016-06-16 PKG_FIXUP:=autoreconf PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=3796902ebf44c3cd00b3829ef7aca911cdde2cc7 +PKG_SOURCE_VERSION:=fa9b081fd983914faabd673967c3b30c39c56554 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) From 57a0b0bcca65a4a16c55c3be2cc920c224b126b6 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Thu, 16 Jun 2016 15:37:29 +0200 Subject: [PATCH 48/67] voice-client: turn of voice led and let asterisk handle it --- voice-client/files/etc/init.d/voice_client | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/voice-client/files/etc/init.d/voice_client b/voice-client/files/etc/init.d/voice_client index b62ce3364..b582152b5 100755 --- a/voice-client/files/etc/init.d/voice_client +++ b/voice-client/files/etc/init.d/voice_client @@ -2213,6 +2213,11 @@ start_service() { reload_service() { start + + # turn off voice led; asterisk will turn it on + # if there is a registered account + ubus call led.voice1 set '{"state":"off"}' + asterisk -rx "core reload" asterisk -rx "dialplan reload" asterisk -rx "brcm reload" From 3b322ba3cb4b501ea417567301dd1aa03511c2c6 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Sat, 18 Jun 2016 15:29:11 +0200 Subject: [PATCH 49/67] updated questd --- questd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/questd/Makefile b/questd/Makefile index a1a2c36d5..f4b5103f6 100644 --- a/questd/Makefile +++ b/questd/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=questd PKG_VERSION:=3.1.6 -PKG_SOURCE_VERSION:=ea462d795bf25a4837968fd77bfeda1b44c2f2c7 +PKG_SOURCE_VERSION:=2b2f6928fde8ce9f7ab41957418104487b5b8c33 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/questd From 5ff752214802e466f3afd3ad7bd2e3d2a5d3fdc1 Mon Sep 17 00:00:00 2001 From: Strhuan Blomquist Date: Tue, 21 Jun 2016 14:42:01 +0200 Subject: [PATCH 50/67] layer2interface: adding icmp to QoS to prevent red intrenet on high uplink load refs #9647 --- layer2interface/broadcom/etc/init.d/layer2_interface_adsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layer2interface/broadcom/etc/init.d/layer2_interface_adsl b/layer2interface/broadcom/etc/init.d/layer2_interface_adsl index 435b89e38..89e9ba82d 100755 --- a/layer2interface/broadcom/etc/init.d/layer2_interface_adsl +++ b/layer2interface/broadcom/etc/init.d/layer2_interface_adsl @@ -101,7 +101,8 @@ atm_inf_conf() { ret="$?" xtmctl operate conn --add 1.$vpi.$vci aal5 $encaps 0 1 $ret xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 # low priority queue - xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # high priority queue + xtmctl operate conn --addq 1.$vpi.$vci 1 wrr 1 # mid priority queue upstream ACK's and ping from LAN will use this queue + xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # high priority queue, internal traffic dhcp igmp dns and icmp xtmctl operate conn --createnetdev 1.$vpi.$vci ${ifname%%.*} xtmctl operate intf --state 1 enable From da1c09a3f5104756b22b6e00ae350d2fafc53f70 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Mon, 27 Jun 2016 16:02:57 +0200 Subject: [PATCH 51/67] icwmp-3.0-2016-06-27 --- icwmp/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/icwmp/Makefile b/icwmp/Makefile index e18f8b07e..055eac299 100755 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icwmp -PKG_VERSION:=3.0-2016-06-16 +PKG_VERSION:=3.0-2016-06-27 PKG_FIXUP:=autoreconf PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=fa9b081fd983914faabd673967c3b30c39c56554 +PKG_SOURCE_VERSION:=198dce8288dcb2ebbc45508224f7e7f4b763772e PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) @@ -34,7 +34,7 @@ define Package/icwmp/Default SECTION:=utils CATEGORY:=Utilities TITLE:=CWMP client - DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libexpat +curl + DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +libexpat +libstrophe +curl endef define Package/icwmp/description @@ -68,7 +68,7 @@ endif TARGET_CFLAGS += \ -D_GNU_SOURCE -D_AADJ - + ifneq ($(CWMP_REVISION)_,_) ifneq ($(CWMP_REVISION),exported) ifneq ($(CWMP_REVISION),Unversioned directory) From cf0ea79c937c01abd0a677ae242cb47a1f843314 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Wed, 29 Jun 2016 16:56:13 +0200 Subject: [PATCH 52/67] icwmp: do not depend on libopenssl and libstrophe --- icwmp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icwmp/Makefile b/icwmp/Makefile index 055eac299..d7c7d5653 100755 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -34,7 +34,7 @@ define Package/icwmp/Default SECTION:=utils CATEGORY:=Utilities TITLE:=CWMP client - DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +libexpat +libstrophe +curl + DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libexpat +curl endef define Package/icwmp/description From a215b5975d3fd80c9bcdfa3e565f05f28351fd15 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Fri, 1 Jul 2016 13:13:18 +0200 Subject: [PATCH 53/67] icwmp-3.0-2016-07-01 --- icwmp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icwmp/Makefile b/icwmp/Makefile index d7c7d5653..89bb8b4b1 100755 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icwmp -PKG_VERSION:=3.0-2016-06-27 +PKG_VERSION:=3.0-2016-07-01 PKG_FIXUP:=autoreconf PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=198dce8288dcb2ebbc45508224f7e7f4b763772e +PKG_SOURCE_VERSION:=85ecddf5a3993e60079c3a67bc74267480d0dc1a PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) From 004b2b47c2a4ce67e0996681f994b753541b8742 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Mon, 4 Jul 2016 20:19:42 +0200 Subject: [PATCH 54/67] icwmp-3.0-2016-07-04 --- icwmp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icwmp/Makefile b/icwmp/Makefile index 89bb8b4b1..60c6ea09e 100755 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icwmp -PKG_VERSION:=3.0-2016-07-01 +PKG_VERSION:=3.0-2016-07-04 PKG_FIXUP:=autoreconf PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=85ecddf5a3993e60079c3a67bc74267480d0dc1a +PKG_SOURCE_VERSION:=bbd3867e3158e9942a5b930747abf45a041a05ec PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) From ff0d48571e213e064230d68643496949e26976ba Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 5 Jul 2016 17:45:02 +0200 Subject: [PATCH 55/67] iop: select ntfs-3g --- iop/configs/config | 1 + 1 file changed, 1 insertion(+) diff --git a/iop/configs/config b/iop/configs/config index 8218159f9..c28181083 100644 --- a/iop/configs/config +++ b/iop/configs/config @@ -105,6 +105,7 @@ CONFIG_PACKAGE_mtd-utils-ubiupdatevol=y CONFIG_PACKAGE_multiwan=y CONFIG_PACKAGE_ndisc6=y CONFIG_PACKAGE_netcheck=y +CONFIG_PACKAGE_ntfs-3g=y CONFIG_PACKAGE_odhcp6c=y CONFIG_PACKAGE_odhcpd=y CONFIG_PACKAGE_openssl-util=y From a21c4aea1e54612438961403d60e474193904919 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Thu, 7 Jul 2016 10:57:04 +0200 Subject: [PATCH 56/67] icwmp-3.0-2016-07-07 --- icwmp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icwmp/Makefile b/icwmp/Makefile index 60c6ea09e..e073b2ceb 100755 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icwmp -PKG_VERSION:=3.0-2016-07-04 +PKG_VERSION:=3.0-2016-07-07 PKG_FIXUP:=autoreconf PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=bbd3867e3158e9942a5b930747abf45a041a05ec +PKG_SOURCE_VERSION:=6fac1df3418d727388162d5e006c7a756c9ff8d2 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) From 69633fce7c90acef2174baf30228b0eda4ba0b3e Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Fri, 26 Feb 2016 12:06:25 +0100 Subject: [PATCH 57/67] gigaset-elements package --- gigaset-elements/.gitignore | 3 ++ gigaset-elements/Makefile | 64 +++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 gigaset-elements/.gitignore create mode 100644 gigaset-elements/Makefile diff --git a/gigaset-elements/.gitignore b/gigaset-elements/.gitignore new file mode 100644 index 000000000..918354379 --- /dev/null +++ b/gigaset-elements/.gitignore @@ -0,0 +1,3 @@ + +git-src + diff --git a/gigaset-elements/Makefile b/gigaset-elements/Makefile new file mode 100644 index 000000000..2dbe9e47d --- /dev/null +++ b/gigaset-elements/Makefile @@ -0,0 +1,64 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=gigaset-elements + +PKG_VERSION:=2.1.1 +# PKG_RELEASE=$(PKG_SOURCE_VERSION) + +PKG_GIGASET_ELEMENTS_SRC_URL ?= git@iopsys.inteno.se:gigaset-elements.git +PKG_GIGASET_ELEMENTS_VERSION ?= v$(PKG_VERSION) + +PKG_SOURCE_URL:=$(PKG_GIGASET_ELEMENTS_SRC_URL) +PKG_SOURCE_PROTO:=git +PKG_SOURCE_VERSION:=$(PKG_GIGASET_ELEMENTS_VERSION) + + +PKG_MAINTAINER:=Magier Marcin, Figlarek Piotr + +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(INCLUDE_DIR)/package.mk + +###################################################### + +define Package/gigaset-elements + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=+libjson-c +libcurl + TITLE:=Gigaset elements +endef + +###################################################### + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) all +endef + + + +define Package/gigaset-elements/install + $(CP) -r $(PKG_BUILD_DIR)/sysroot/* $(1)/ +endef + + + +define Package/gigaset-elements/preinst +#!/bin/sh +mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/cert +mkdir -p $${IPKG_INSTROOT}/usr/gigaset/data/fw +endef + + +define Package/gigaset-elements/postrm +#!/bin/sh +rm -rf $${IPKG_INSTROOT}/usr/gigaset/data +rm -rf /usr/share/gigaset +endef + + +###################################################### + +$(eval $(call BuildPackage,gigaset-elements)) + From f7919b247106ad1d31079b9855546074d7687b9a Mon Sep 17 00:00:00 2001 From: Magier Marcin Date: Wed, 2 Mar 2016 12:14:47 +0100 Subject: [PATCH 58/67] bump gigaset-elements package to 2.1.2 --- gigaset-elements/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gigaset-elements/Makefile b/gigaset-elements/Makefile index 2dbe9e47d..3e71fb2b5 100644 --- a/gigaset-elements/Makefile +++ b/gigaset-elements/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gigaset-elements -PKG_VERSION:=2.1.1 +PKG_VERSION:=2.1.2 # PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_GIGASET_ELEMENTS_SRC_URL ?= git@iopsys.inteno.se:gigaset-elements.git From 2eed8f268451addd278ff86ff0f9c4bbd337fd3a Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Wed, 2 Mar 2016 14:21:21 +0100 Subject: [PATCH 59/67] natalie-dect-h v12.13 --- natalie-dect-h/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/natalie-dect-h/Makefile b/natalie-dect-h/Makefile index 127a9be3d..10c5a45fb 100644 --- a/natalie-dect-h/Makefile +++ b/natalie-dect-h/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=natalie-dect-h -PKG_VERSION:=11.19 +PKG_VERSION:=12.13 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_URL:=http://public.inteno.se:/natalie-dect-h PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=c2139d05e3d082f1dcf58ce3f19306cb76fd0873 +PKG_SOURCE_VERSION:=d425e2183044ea146e140834f1c0410ae184a168 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk From 5560428dc685bb7fdc91d1cfba65d66c3215a9d9 Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Wed, 2 Mar 2016 14:25:15 +0100 Subject: [PATCH 60/67] natalie-dect v12.13 --- natalie-dect/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/natalie-dect/Makefile b/natalie-dect/Makefile index f04ce4201..0bb048c8e 100644 --- a/natalie-dect/Makefile +++ b/natalie-dect/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=natalie-dect -PKG_VERSION:=11.19 +PKG_VERSION:=12.26 -PKG_SOURCE_VERSION:=2015e8106c7d541dd038381c2845bd8462d74a30 +PKG_SOURCE_VERSION:=35fed3a10124bd660b74704011256039ba9cf54d ifeq ($(CONFIG_NATALIE_OPEN),y) BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g) PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz @@ -18,7 +18,7 @@ PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/ PKG_NAME:=natalie-dect-open else PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_SOURCE_URL:=git@private.inteno.se:natalie-dect-11.19 +PKG_SOURCE_URL:=git@private.inteno.se:natalie-dect-12.26 PKG_SOURCE_PROTO:=git endif @@ -46,10 +46,6 @@ define Package/natalie-dect/description Kernel dect driver endef -define Package/natalie-dect/config - source "$(SOURCE)/Config.in" -endef - ifeq ($(CONFIG_NATALIE_OPEN),y) define Build/Compile endef From 66d3110ebeac1f56e7a01f58838a0304bd87335c Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Wed, 2 Mar 2016 14:35:55 +0100 Subject: [PATCH 61/67] dectmngr v1.0.23 --- dectmngr/Makefile | 4 ++-- dectmngr/files/etc/dect/nvs_default | Bin 4096 -> 4096 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dectmngr/Makefile b/dectmngr/Makefile index 8a202971a..84eb1764c 100644 --- a/dectmngr/Makefile +++ b/dectmngr/Makefile @@ -8,10 +8,10 @@ include $(TOPDIR)/rules.mk PKG_RELEASE:=1 -PKG_VERSION:=1.0.24 +PKG_VERSION:=1.0.23 PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=6ba403663bc9cfdb8f89fb34de367f0796d68552 +PKG_SOURCE_VERSION:=90aff0da98c626d58201c14c34b3b3a64878ceee PKG_NAME:=dectmngr diff --git a/dectmngr/files/etc/dect/nvs_default b/dectmngr/files/etc/dect/nvs_default index a85c173f020ba8f481c1a9a710e6bee4d5405ae3..4091f678f566e349762a5f410dec8c8069048c0e 100644 GIT binary patch delta 62 zcmZorXi%8osmSlZ5X{`brNH3I+@K}E;LO~RBEaCt+@REAARxfNpddYQqZl&-tI))a S!W*ZlvoPssY~Ih}$PECf*A5H- delta 59 zcmZorXi%8oDa)n6;KAIWCBWbYCY_lZTm%>#nH!W^3 Date: Fri, 11 Mar 2016 09:38:34 +0100 Subject: [PATCH 62/67] gigaset-elements: use correct git url --- gigaset-elements/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gigaset-elements/Makefile b/gigaset-elements/Makefile index 3e71fb2b5..b547d6b22 100644 --- a/gigaset-elements/Makefile +++ b/gigaset-elements/Makefile @@ -5,7 +5,7 @@ PKG_NAME:=gigaset-elements PKG_VERSION:=2.1.2 # PKG_RELEASE=$(PKG_SOURCE_VERSION) -PKG_GIGASET_ELEMENTS_SRC_URL ?= git@iopsys.inteno.se: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) From ecc459f34db20743b1d0bd096156aa5847bacb88 Mon Sep 17 00:00:00 2001 From: Magier Marcin Date: Thu, 24 Mar 2016 08:47:42 +0100 Subject: [PATCH 63/67] gigaset-elements 2.1.3 - do not use status LED --- gigaset-elements/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gigaset-elements/Makefile b/gigaset-elements/Makefile index b547d6b22..4821117d4 100644 --- a/gigaset-elements/Makefile +++ b/gigaset-elements/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gigaset-elements -PKG_VERSION:=2.1.2 +PKG_VERSION:=2.1.3 # PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_GIGASET_ELEMENTS_SRC_URL ?= git@public.inteno.se:gigaset-elements.git From b19040d68efee805beb298800d5332b751d3e8f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20H=C3=B6glund?= Date: Wed, 6 Apr 2016 12:22:41 +0200 Subject: [PATCH 64/67] Updated Natalie to version 12.26 Conflicts: natalie-dect-h/Makefile natalie-dect/Makefile Conflicts: natalie-dect/Makefile --- natalie-dect-h/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/natalie-dect-h/Makefile b/natalie-dect-h/Makefile index 10c5a45fb..463034217 100644 --- a/natalie-dect-h/Makefile +++ b/natalie-dect-h/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=natalie-dect-h -PKG_VERSION:=12.13 +PKG_VERSION:=12.26 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_URL:=http://public.inteno.se:/natalie-dect-h PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=d425e2183044ea146e140834f1c0410ae184a168 +PKG_SOURCE_VERSION:=9e2236989ff58d0db897f938b6b07b535144e0e2 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk From c29427fd51fc41a3dd6a02a58f4594fe7a7b4775 Mon Sep 17 00:00:00 2001 From: Magier Marcin Date: Tue, 19 Apr 2016 14:26:12 +0200 Subject: [PATCH 65/67] gigaset-elements 2.1.4 - 200 bytes packet for SUOTA --- gigaset-elements/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gigaset-elements/Makefile b/gigaset-elements/Makefile index 4821117d4..8359ed5db 100644 --- a/gigaset-elements/Makefile +++ b/gigaset-elements/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gigaset-elements -PKG_VERSION:=2.1.3 +PKG_VERSION:=2.1.4 # PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_GIGASET_ELEMENTS_SRC_URL ?= git@public.inteno.se:gigaset-elements.git From 938583d96006bd0d57d9ec4ff9466969ef75cc27 Mon Sep 17 00:00:00 2001 From: Magier Marcin Date: Thu, 1 Sep 2016 08:39:25 +0200 Subject: [PATCH 66/67] gigaset-elements 2.3.0 - fixed rule engine bug --- gigaset-elements/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gigaset-elements/Makefile b/gigaset-elements/Makefile index 8359ed5db..9b9a7471a 100644 --- a/gigaset-elements/Makefile +++ b/gigaset-elements/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gigaset-elements -PKG_VERSION:=2.1.4 +PKG_VERSION:=2.3.0 # PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_GIGASET_ELEMENTS_SRC_URL ?= git@public.inteno.se:gigaset-elements.git From 8779369d7bf2a5148d88569b38d5477eec89c388 Mon Sep 17 00:00:00 2001 From: Ronny Nilsson Date: Tue, 20 Sep 2016 15:55:44 +0200 Subject: [PATCH 67/67] dectproxy has been enabled in Dectmngr2 for third party applications. --- dectmngr2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dectmngr2/Makefile b/dectmngr2/Makefile index 247e54a59..a1b01b418 100644 --- a/dectmngr2/Makefile +++ b/dectmngr2/Makefile @@ -11,7 +11,7 @@ PKG_RELEASE:=1 PKG_VERSION:=1.1.0 PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=46658e95b19c35ff6194a9566bb5439720ec251d +PKG_SOURCE_VERSION:=ee63f0c087840adba9d944ae31d71a3ef9d64043 PKG_NAME:=dectmngr2