From 5345917eaa2e5cfd47d6082b0c96848b8ec52c2c Mon Sep 17 00:00:00 2001 From: Nabeel Sowan Date: Mon, 16 Nov 2015 15:59:45 +0100 Subject: [PATCH 01/13] usbnet & co. loaded as modules, refs #7806 --- bcmkernel/416030.mk | 4 ++-- bcmkernel/416040.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bcmkernel/416030.mk b/bcmkernel/416030.mk index 5c9e0336c..b8157cdeb 100644 --- a/bcmkernel/416030.mk +++ b/bcmkernel/416030.mk @@ -13,10 +13,10 @@ PKG_NAME:=bcmkernel-3.4 PKG_VERSION:=$(BRCM_SDK_VERSION) PKG_RELEASE:=1 -PKG_SOURCE_URL:=git@iopsys.inteno.se:bcmkernel-4.16L.03 +PKG_SOURCE_URL:=git@iopsys.inteno.se:bcmkernel PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=205c1d7bdd24388e0bae8c2883ac83ca0b1e5458 +PKG_SOURCE_VERSION:=080f1533553e7341e48995e7f9024cbf79a24120 PKG_SOURCE:=$(PKG_NAME)-$(BRCM_SDK_VERSION)-$(PKG_SOURCE_VERSION).tar.gz endif diff --git a/bcmkernel/416040.mk b/bcmkernel/416040.mk index 9140a1c1e..28243809a 100644 --- a/bcmkernel/416040.mk +++ b/bcmkernel/416040.mk @@ -16,7 +16,7 @@ PKG_RELEASE:=1 PKG_SOURCE_URL:=git@iopsys.inteno.se:bcmkernel PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=963801c26cf4c86c53952a28e806cc233e5b62be +PKG_SOURCE_VERSION:=9e11b391a6f3c178a2bc51b0a8e7616d7dd7b49f PKG_SOURCE:=$(PKG_NAME)-$(BRCM_SDK_VERSION)-$(PKG_SOURCE_VERSION).tar.gz endif From 94b3e0b9752cb57fe02190fa7ca8df9b24462282 Mon Sep 17 00:00:00 2001 From: Mats Karrman Date: Tue, 17 Nov 2015 09:57:52 +0100 Subject: [PATCH 02/13] bcmkernel-4.16L.04: Update source version to tip of 4.16L.04 --- bcmkernel/416040.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bcmkernel/416040.mk b/bcmkernel/416040.mk index 28243809a..65003d4d0 100644 --- a/bcmkernel/416040.mk +++ b/bcmkernel/416040.mk @@ -16,7 +16,7 @@ PKG_RELEASE:=1 PKG_SOURCE_URL:=git@iopsys.inteno.se:bcmkernel PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=9e11b391a6f3c178a2bc51b0a8e7616d7dd7b49f +PKG_SOURCE_VERSION:=eaab244af3a9fc8879ea60eb569e88137d29f7ad PKG_SOURCE:=$(PKG_NAME)-$(BRCM_SDK_VERSION)-$(PKG_SOURCE_VERSION).tar.gz endif From 807f7c520fc29a67400385273a3422590b1cd4bd Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 17 Nov 2015 16:19:37 +0100 Subject: [PATCH 03/13] icwmp-3.0-2015-11-16: procdified icwmp init script --- icwmp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icwmp/Makefile b/icwmp/Makefile index c8c86d767..e1fb17c33 100644 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icwmp -PKG_VERSION:=3.0-2015-11-10 +PKG_VERSION:=3.0-2015-11-16 PKG_FIXUP:=autoreconf ifeq ($(CONFIG_BCM_OPEN),y) PKG_SOURCE_URL:=http://ihgsp.inteno.se/git/freecwmp.git @@ -16,7 +16,7 @@ else PKG_SOURCE_URL:=ssh://git@iopsys.inteno.se/freecwmp.git endif PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=019763820601eca898c08a05778168be882f76c3 +PKG_SOURCE_VERSION:=ff17478c46fd49f4354ba6b27cdd002f55346cc6 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) From a1b0964e0aa06b2a44d4a5470b7587d4a0ea220c Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Wed, 18 Nov 2015 11:13:03 +0100 Subject: [PATCH 04/13] icwmp: do not install watchicwmpd --- icwmp/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/icwmp/Makefile b/icwmp/Makefile index e1fb17c33..929d055fc 100644 --- a/icwmp/Makefile +++ b/icwmp/Makefile @@ -140,7 +140,6 @@ ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y) $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/icwmp.sh $(1)/usr/sbin/icwmp $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/iwepkeygen $(1)/usr/sbin/iwepkeygen - $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/watchicwmpd.sh $(1)/usr/sbin/watchicwmpd endif endef From 96c9277e1aae9e921015dee12128a99ec5d53a53 Mon Sep 17 00:00:00 2001 From: Ronny Nilsson Date: Wed, 18 Nov 2015 14:58:22 +0100 Subject: [PATCH 05/13] Fixed a bug with dect antenna diversity. Binary data got wrong. refs #5990 --- dectmngr/files/etc/init.d/dect | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dectmngr/files/etc/init.d/dect b/dectmngr/files/etc/init.d/dect index 11c22fd2b..000209295 100755 --- a/dectmngr/files/etc/init.d/dect +++ b/dectmngr/files/etc/init.d/dect @@ -19,9 +19,9 @@ start_service() { cat /proc/nvram/bcm_def_freq | tr -d ' ' | atohx > /tmp/bcm_def_freq DECTANTDIV=`db get hw.board.DectAntennaDiversity` case "$DECTANTDIV" in - 1|off) echo -e "\x01" > /tmp/dect_antenna_diversity ;; - 2) echo -e "\x02" > /tmp/dect_antenna_diversity ;; - *) echo -e "\x00" > /tmp/dect_antenna_diversity ;; + 1|off) echo -ne "\x01" > /tmp/dect_antenna_diversity ;; + 2) echo -ne "\x02" > /tmp/dect_antenna_diversity ;; + *) echo -ne "\x00" > /tmp/dect_antenna_diversity ;; esac if [ ! -f /etc/dect/nvs ]; then @@ -29,7 +29,7 @@ start_service() { dd of=/etc/dect/nvs if=/tmp/rfpi conv=notrunc bs=1 seek=0 dd of=/etc/dect/nvs if=/tmp/fixed_emc conv=notrunc bs=1 seek=10 dd of=/etc/dect/nvs if=/tmp/bcm_def_freq conv=notrunc bs=1 seek=6 - dd of=/etc/dect/nvs if=/tmp/dect_antenna_diversity conv=notrunc bs=1 seek=34 + dd of=/etc/dect/nvs if=/tmp/dect_antenna_diversity conv=notrunc bs=1 seek=32 fi # init dectproxy From 9599e9fad5be07d076ec98fa0222209f24f712ed Mon Sep 17 00:00:00 2001 From: Ronny Nilsson Date: Wed, 18 Nov 2015 14:59:57 +0100 Subject: [PATCH 06/13] Attempt to increase dect testing successrate. Refs #7574 --- dectmngr/files/etc/dect/dect_testmode.dat | Bin 0 -> 16 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 dectmngr/files/etc/dect/dect_testmode.dat diff --git a/dectmngr/files/etc/dect/dect_testmode.dat b/dectmngr/files/etc/dect/dect_testmode.dat new file mode 100644 index 0000000000000000000000000000000000000000..c82982aa63e8b957f7339855ae012b59e69d7abe GIT binary patch literal 16 UcmWe&;89>;Nc+IRzzBks01!z64*&oF literal 0 HcmV?d00001 From 7ed295b97781309318dfa91c8f5a62351ff5388f Mon Sep 17 00:00:00 2001 From: Ronny Nilsson Date: Wed, 18 Nov 2015 15:10:15 +0100 Subject: [PATCH 07/13] Attempt to increase dect testing successrate. Refs #7574 --- dectmngr/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dectmngr/Makefile b/dectmngr/Makefile index 755ef48b0..18eed1b55 100644 --- a/dectmngr/Makefile +++ b/dectmngr/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_RELEASE:=1 -PKG_VERSION:=1.0.23 +PKG_VERSION:=1.0.24 ifeq ($(CONFIG_BCM_OPEN),y) PKG_SOURCE_URL:=http://ihgsp.inteno.se/git/dectmngr.git else PKG_SOURCE_URL:=git@iopsys.inteno.se:dectmngr.git endif PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=5f6f0608b59484d76c6331279cc50104be5d8a95 +PKG_SOURCE_VERSION:=b271b3a63b4fb50eabe736ca2dd75ca8bf05f3e4 PKG_NAME:=dectmngr From 794223e29eaaa11c63d39461289dad0bc6320410 Mon Sep 17 00:00:00 2001 From: Ronny Nilsson Date: Wed, 18 Nov 2015 15:44:38 +0100 Subject: [PATCH 08/13] Fix typo, invalid hash for dectmngr --- dectmngr/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dectmngr/Makefile b/dectmngr/Makefile index 18eed1b55..97dd3575e 100644 --- a/dectmngr/Makefile +++ b/dectmngr/Makefile @@ -15,7 +15,7 @@ else PKG_SOURCE_URL:=git@iopsys.inteno.se:dectmngr.git endif PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=b271b3a63b4fb50eabe736ca2dd75ca8bf05f3e4 +PKG_SOURCE_VERSION:=19308024fd8ed8e1daa69224029a68f834318c99 PKG_NAME:=dectmngr From 8f48ff9e8311549195e7a7fe8038387b25d2cd0f Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Thu, 19 Nov 2015 15:56:55 +0100 Subject: [PATCH 09/13] voice_client: add ringing_status section if it is missing --- .../files/etc/uci-defaults/99-voice_client | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 voice-client/files/etc/uci-defaults/99-voice_client diff --git a/voice-client/files/etc/uci-defaults/99-voice_client b/voice-client/files/etc/uci-defaults/99-voice_client new file mode 100755 index 000000000..8b1f84410 --- /dev/null +++ b/voice-client/files/etc/uci-defaults/99-voice_client @@ -0,0 +1,15 @@ +#!/bin/sh + +uci -q get voice_client.RINGING_STATUS >/dev/null && exit 0 + +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.shouldring=1 + commit voice_client +EOT + +exit 0 + From 69a79e6b3e207a3a5856d71f100c63edb42e8370 Mon Sep 17 00:00:00 2001 From: Strhuan Blomquist Date: Fri, 20 Nov 2015 13:55:48 +0100 Subject: [PATCH 10/13] fixes for #7869 software upgrade was broken --- iup/files/sbin/iup | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/iup/files/sbin/iup b/iup/files/sbin/iup index 76bbf9dad..ab1ad0cc9 100755 --- a/iup/files/sbin/iup +++ b/iup/files/sbin/iup @@ -112,7 +112,12 @@ handle_provisioning() { config_get_bool defaultreset "$config" defaultreset config_get deckey "$config" deckey if [ "$enabled" -eq 1 ]; then - config_get url "$config" urliup + if [ "$config" == "iup" ]; then + v "using url from dhcp options" + config_get url "$config" urliup + else + config_get url "$config" url + fi url=${url//\$MAC/$MAC} v "Download from $url" From 58f10847141fdc695c3979f997f6f9169d3744b9 Mon Sep 17 00:00:00 2001 From: Ronny Nilsson Date: Fri, 20 Nov 2015 15:05:32 +0100 Subject: [PATCH 11/13] New upstream version for dect_testing --- dectmngr/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dectmngr/Makefile b/dectmngr/Makefile index 97dd3575e..60220b172 100644 --- a/dectmngr/Makefile +++ b/dectmngr/Makefile @@ -15,7 +15,7 @@ else PKG_SOURCE_URL:=git@iopsys.inteno.se:dectmngr.git endif PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=19308024fd8ed8e1daa69224029a68f834318c99 +PKG_SOURCE_VERSION:=6ba403663bc9cfdb8f89fb34de367f0796d68552 PKG_NAME:=dectmngr From 5e797bf457b1cde1214b6e9cc21ab62273fac851 Mon Sep 17 00:00:00 2001 From: Nabeel Sowan Date: Fri, 20 Nov 2015 14:41:44 +0100 Subject: [PATCH 12/13] bcmkernel bump: mtd map IOP2 partitions correctly, needed for copying old config --- bcmkernel/416040.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bcmkernel/416040.mk b/bcmkernel/416040.mk index 65003d4d0..e388c1a74 100644 --- a/bcmkernel/416040.mk +++ b/bcmkernel/416040.mk @@ -16,7 +16,7 @@ PKG_RELEASE:=1 PKG_SOURCE_URL:=git@iopsys.inteno.se:bcmkernel PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=eaab244af3a9fc8879ea60eb569e88137d29f7ad +PKG_SOURCE_VERSION:=8ad4bbc5479a2b0d0de9a6334f4f5c9ed4f7df53 PKG_SOURCE:=$(PKG_NAME)-$(BRCM_SDK_VERSION)-$(PKG_SOURCE_VERSION).tar.gz endif From 3400265f136cb78b38756cb1388a0a32891f55ce Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Fri, 20 Nov 2015 17:29:27 +0100 Subject: [PATCH 13/13] luci-intneo-1.1.21 --- webgui/luci/luci/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webgui/luci/luci/Makefile b/webgui/luci/luci/Makefile index 82a452e6c..dee377da8 100644 --- a/webgui/luci/luci/Makefile +++ b/webgui/luci/luci/Makefile @@ -2,8 +2,8 @@ include $(TOPDIR)/rules.mk PKG_BRANCH:=svn-0.11 PKG_NAME:=luci -PKG_VERSION:=inteno-1.1.20 -PKG_SOURCE_VERSION:=b0d5916e7ae00a87d94aab531449b46cb8233893 +PKG_VERSION:=inteno-1.1.21 +PKG_SOURCE_VERSION:=1bb632b4f87a0ce3b24ab177496e2fa4f4daf955 PKG_SOURCE_PROTO:=git ifeq ($(CONFIG_BCM_OPEN),y)