From 0650265216ada04466ce21b64f9dfcef336ccbe6 Mon Sep 17 00:00:00 2001 From: Ronny Nilsson Date: Tue, 15 Mar 2016 13:37:29 +0100 Subject: [PATCH 1/3] Beta branch for Dect support in DG400 --- asterisk-1.8.x-mod/Makefile | 2 +- dectmngr2/Makefile | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/asterisk-1.8.x-mod/Makefile b/asterisk-1.8.x-mod/Makefile index 98819aaab..e19d73023 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:=ffa46ba1d5abf22fa83d0bd06ea56fe8e638dd43 +PKG_SOURCE_VERSION:=5b4e3a26606bd26476b5c6f2c9aac3f0eb1dc608 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/asterisk-1.8.x diff --git a/dectmngr2/Makefile b/dectmngr2/Makefile index 1ce166e55..c52651f19 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:=a51f8ed1b9178262777f73f7c275d3962f829c8a +PKG_SOURCE_VERSION:=69ab89d15df72270f40a51bb5afbde82fa43701e PKG_NAME:=dectmngr2 @@ -41,11 +41,13 @@ endef define Package/dectmngr2/install - $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/etc/dect/ + $(INSTALL_DIR) $(1)/etc/init.d/ - cp $(PKG_BUILD_DIR)/src/dectmngr2 $(1)/usr/bin/ - cp $(PKG_BUILD_DIR)/files/target.bin $(1)/etc/dect/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dectmngr2 $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/target.bin $(1)/etc/dect/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dect $(1)/etc/init.d/ endef $(eval $(call BuildPackage,dectmngr2)) From 85fcb1f0337fd053d19703879680fd01bbe6dc0f Mon Sep 17 00:00:00 2001 From: Ronny Nilsson Date: Mon, 4 Apr 2016 14:26:00 +0200 Subject: [PATCH 2/3] - Install default NVS data - Upstream merge to master branch --- dectmngr2/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dectmngr2/Makefile b/dectmngr2/Makefile index c52651f19..539ad6d1d 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:=69ab89d15df72270f40a51bb5afbde82fa43701e +PKG_SOURCE_VERSION:=666c3e93ad56e20493bae8a439e9655ce947f2f7 PKG_NAME:=dectmngr2 @@ -47,6 +47,7 @@ define Package/dectmngr2/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dectmngr2 $(1)/usr/sbin/ $(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/ endef From d2511509eff9607c877b4de7efa838f0641fe838 Mon Sep 17 00:00:00 2001 From: Ronny Nilsson Date: Mon, 4 Apr 2016 14:35:47 +0200 Subject: [PATCH 3/3] Upstream merge of Asterisk branch dect-ubus --- 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 e19d73023..19867b48b 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:=5b4e3a26606bd26476b5c6f2c9aac3f0eb1dc608 +PKG_SOURCE_VERSION:=0ce0a8ec7748b241dae0b087fa0aba2d41282c87 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://public.inteno.se:/asterisk-1.8.x