mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2026-01-28 01:47:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/from-iop-3.4' into v3.5

Browse source 
Conflicts:
	icwmp/Makefile
This commit is contained in:
Martin Schröder 2015-11-22 21:18:04 +01:00
commit e8bdb6bc24
9 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bcmkernel/416030.mk
View file

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

2
bcmkernel/416040.mk
View file

@ -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:=8ad4bbc5479a2b0d0de9a6334f4f5c9ed4f7df53
PKG_SOURCE:=$(PKG_NAME)-$(BRCM_SDK_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
endif

4
dectmngr/Makefile
View file

@ -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:=6ba403663bc9cfdb8f89fb34de367f0796d68552
PKG_NAME:=dectmngr

BIN
dectmngr/files/etc/dect/dect_testmode.dat Normal file
View file

Binary file not shown.

8
dectmngr/files/etc/init.d/dect
View file

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

5
icwmp/Makefile
View file

@ -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:=8d34c241548a21b6462df5d16906824685fe916c
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)
@ -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

7
iup/files/sbin/iup
View file

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

15
voice-client/files/etc/uci-defaults/99-voice_client Executable file
View file

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

4
webgui/luci/luci/Makefile
View file

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