asterisk-1.8.x-mod: ASTERISK_LOADABLE_MODULES: New config option

voice-client: No longer depends on asterisk18-mod (avoids circular dependancy)

.gitignore

@@ -0,0 +1 @@
+*~

asterisk-1.8.x-mod/Config.in

@@ -0,0 +1,27 @@
+choice
+	prompt "Asterisk Version"
+	depends on PACKAGE_asterisk18-mod
+	default ASTERISK_VERSION_1_8_10_1_IOPSYS
+	help
+		Select the version of Asterisk you wish to use.
+
+	config ASTERISK_VERSION_1_8_10_1_IOPSYS
+		bool "Asterisk 1.8.10.1 (IOPSYS)"
+	config ASTERISK_VERSION_1_8_10_1
+		bool "Asterisk 1.8.10.1"
+endchoice
+
+if PACKAGE_asterisk18-mod
+	config ASTERISK_EMBED
+		bool
+		prompt "Embed modules"
+		default n
+	config ASTERISK_LOADABLE_MODULES
+		bool
+		prompt "Loadable modules"
+		default y
+	config ASTERISK_CHAN_BRCM
+		bool
+		prompt "Support the BRCM channel type"
+		default y
+endif

asterisk-1.8.x-mod/Config.version

@@ -0,0 +1,6 @@
+config ASTERISK_VERSION
+	string
+	depends on PACKAGE_asterisk18-mod
+	default "1.8.10.1+iopsys" if ASTERISK_VERSION_1_8_10_1_IOPSYS
+	default "1.8.10.1" if ASTERISK_VERSION_1_8_10_1
+	default "1.8.10.1+iopsys"

asterisk-1.8.x-mod/Makefile

@@ -10,14 +10,21 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=asterisk18-mod
 PKG_VERSION:=1.8.10.1
 
+ifeq ($(CONFIG_ASTERISK_VERSION),"1.8.10.1+iopsys")
 PKG_SOURCE_VERSION:=ffa46ba1d5abf22fa83d0bd06ea56fe8e638dd43
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/asterisk-1.8.x
-
+else ifeq ($(CONFIG_ASTERISK_VERSION),"1.8.10.1")
+PKG_SOURCE_VERSION:=52f7762a8ceaace5c4a3b27eae86cd0d56609f73
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://public.inteno.se:/asterisk-1.8.x
+endif
+ifdef PKG_SOURCE_VERSION
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)-$(PKG_RELEASE).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+endif
 
 include $(INCLUDE_DIR)/ltqtapi.mk
 include $(INCLUDE_DIR)/package.mk
@@ -41,7 +48,16 @@ define Package/asterisk18-mod
 $(call Package/asterisk18-mod/Default)
   TITLE:=Complete open source PBX, v1.8x
   MENU:=1
-  DEPENDS:= +natalie-dect-h +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen +libopenssl +libncurses +libpopt +libpthread +uci +ubus +zlib @!TARGET_avr32
+  #DEPENDS:= +natalie-dect-h +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen +libopenssl +libncurses +libpopt +libpthread +uci +ubus +zlib @!TARGET_avr32
+  DEPENDS:= +libopenssl +libncurses +libpopt +libpthread +uci +ubus +zlib @!TARGET_avr32
+ifeq ($(CONFIG_PACKAGE_voice-client),y)
+  DEPENDS+= +voice-client
+endif
+endef
+
+define Package/asterisk18-mod/config
+	source "$(SOURCE)/Config.version"
+	source "$(SOURCE)/Config.in"
 endef
 
 define Package/asterisk18-mod/description
@@ -248,7 +264,7 @@ endef
 define Package/asterisk18-mod-chan-brcm
 $(call Package/asterisk18-mod/Default)
   TITLE:=Broadcom channel support
-  DEPENDS:= asterisk18-mod
+  DEPENDS:= asterisk18-mod #+asterisk18-mod-chan-local
 endef
 
 define Package/asterisk18-mod-chan-brcm/description
@@ -256,6 +272,17 @@ $(call Package/asterisk18-mod/Default/description)
  This package provides the channel chan_brcm support to Asterisk.
 endef
 
+define Package/asterisk18-mod-chan-sip
+$(call Package/asterisk18-mod/Default)
+  TITLE:=SIP channel support
+  DEPENDS:= asterisk18-mod #+asterisk18-mod-chan-local
+endef
+
+define Package/asterisk18-mod-chan-sip/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides the channel chan_sip support to Asterisk.
+endef
+
 define Package/asterisk18-mod-curl
 $(call Package/asterisk18-mod/Default)
   TITLE:=CURL support
@@ -357,6 +384,43 @@ else
 	--without-srtp
 endif
 
+# @todo@ Is below really the proper way to do this?
+CONFIG_PACKAGE_asterisk18-mod-app-cdr = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+CONFIG_PACKAGE_asterisk18-mod-app-dial = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-app-echo = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-app-forkcdr = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+CONFIG_PACKAGE_asterisk18-mod-app-playback = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-app-macro = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-app-voicemail = $(CONFIG_PACKAGE_asterisk18-mod-voicemail)
+CONFIG_PACKAGE_asterisk18-mod-codec-gsm = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-codec-ulaw = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-format-gsm = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-format-pcm = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-format-wav = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-format-wav-gsm = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-func-cdr = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+CONFIG_PACKAGE_asterisk18-mod-func-strings = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-func-timeout = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-func-callerid = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-func-logic = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-pbx-config = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-res-rtp-asterisk = $(CONFIG_PACKAGE_asterisk18-mod)
+CONFIG_PACKAGE_asterisk18-mod-res-rtp-multicast = $(CONFIG_PACKAGE_asterisk18-mod)
+#CONFIG_PACKAGE_asterisk18-mod-cdr-adaptive-odbc = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+CONFIG_PACKAGE_asterisk18-mod-cdr-csv = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+CONFIG_PACKAGE_asterisk18-mod-cdr-custom = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+CONFIG_PACKAGE_asterisk18-mod-cdr-manager = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+#CONFIG_PACKAGE_asterisk18-mod-cdr-odbc = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+#CONFIG_PACKAGE_asterisk18-mod-cdr-pgsql = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+#CONFIG_PACKAGE_asterisk18-mod-cdr-radius = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+CONFIG_PACKAGE_asterisk18-mod-cdr-sqlite3-custom = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+#CONFIG_PACKAGE_asterisk18-mod-cdr-sqlite = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+CONFIG_PACKAGE_asterisk18-mod-cdr-syslog = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+#CONFIG_PACKAGE_asterisk18-mod-cdr-tds = $(CONFIG_PACKAGE_asterisk18-mod-cdr)
+CONFIG_PACKAGE_asterisk18-mod-res-adsi = $(CONFIG_PACKAGE_asterisk18-mod-voicemail)
+CONFIG_PACKAGE_asterisk18-mod-res-smdi = $(CONFIG_PACKAGE_asterisk18-mod-voicemail)
+CONFIG_PACKAGE_asterisk18-mod-res-stun-monitor = $(CONFIG_PACKAGE_asterisk18-mod-res-stun)
+
 ifeq ($(CONFIG_TARGET_IBOARDID),"D301")
   EXTRA_CFLAGS += -DNTR_SUPPORT
 endif
@@ -395,7 +459,211 @@ CONFIGURE_ARGS+= \
 EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
 EXTRA_LDFLAGS+= $(TARGET_LDFLAGS)
 
+ifeq ($(CONFIG_DEBUG),y)
+	CONFIGURE_ARGS+= \
+		--enable-dev-mode
+	#MENUSELECT_ARGS+= \
+	#	--enable BETTER_BACKTRACES
+	MENUSELECT_ARGS+= \
+		--enable DEBUG_THREADS
+	MENUSELECT_ARGS+= \
+		--enable DONT_OPTIMIZE
+	#MENUSELECT_ARGS+= \
+	#	--enable MALLOC_DEBUG
+	MENUSELECT_ARGS+= \
+		--enable LOW_MEMORY
+	#MENUSELECT_ARGS+= \
+	#	--enable STATIC_BUILD
 
+	DEBUG:=
+	OPTIMIZE:=
+
+	#CONFIGURE_ARGS+= \
+	#	--enable-coverage
+else
+	MENUSELECT_ARGS+= \
+		--enable LOW_MEMORY
+	DEBUG:=
+	OPTIMIZE:=
+endif
+
+ifneq ($(CONFIG_ASTERISK_LOADABLE_MODULES),y)
+	MENUSELECT_ARGS+= \
+		--disable LOADABLE_MODULES
+endif
+
+define Build/asterisk18-mod/Template/Menuselect/Category
+ifeq ($(CONFIG_ASTERISK_EMBED),y)
+	MENUSELECT_CATEGORIES+= \
+		$(1)
+	MENUSELECT_ARGS+= \
+		--disable-category MENUSELECT_$(1)
+endif
+endef
+
+define Build/asterisk18-mod/Template/Menuselect/Module
+ifeq ($$(CONFIG_PACKAGE_asterisk18-mod-$(subst _,-,$(2))),y)
+ifeq ($$(CONFIG_ASTERISK_EMBED),y)
+	MENUSELECT_MODULES+= \
+		$(2)
+	MENUSELECT_$(1)+= \
+		$(2)
+	MENUSELECT_ARGS+= \
+		--enable $(shell echo $(2) | tr a-z A-Z)
+endif
+endif
+endef
+
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Category,ADDONS))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Category,APPS))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Category,BRIDGES))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Category,CDR))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Category,CEL))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Category,CHANNELS))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Category,CODECS))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Category,FORMATS))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Category,FUNCS))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Category,PBX))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Category,RES))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Category,TESTS))
+
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_alarmreciever))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_authenticate))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_cdr))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_chanisavail))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_chanspy))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_dial))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_directed_pickup))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_disa))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_echo))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_forkcdr))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_exec))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_macro))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_meetme))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_minivm))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_mixmonitor))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_originate))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_playback))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_playtones))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_queue))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_read))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_readexten))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_record))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_sayunixtime))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_senddtmf))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_setcallerid))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_sms))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_softhangup))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_stack))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_system))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_talkdetect))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_transfer))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_verbose))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_waituntil))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,APPS,app_while))
+
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CDR,cdr_adaptive_odbc))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CDR,cdr_csv))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CDR,cdr_custom))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CDR,cdr_manager))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CDR,cdr_odbc))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CDR,cdr_pgsql))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CDR,cdr_radius))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CDR,cdr_sqlite3_custom))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CDR,cdr_sqlite))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CDR,cdr_syslog))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CDR,cdr_tds))
+
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CHANNELS,chan_brcm))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CHANNELS,chan_gtalk))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CHANNELS,chan_iax2))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CHANNELS,chan_local))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CHANNELS,chan_mgcp))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CHANNELS,chan_mobile))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CHANNELS,chan_skinny))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CHANNELS,chan_sip))
+
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CODECS,codec_a_mu))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CODECS,codec_alaw))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CODECS,codec_g722))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CODECS,codec_g726))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CODECS,codec_gsm))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CODECS,codec_ilbc))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,CODECS,codec_ulaw))
+
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FORMATS,format_g726))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FORMATS,format_g729))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FORMATS,format_gsm))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FORMATS,format_pcm))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FORMATS,format_sln))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FORMATS,format_sln16))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FORMATS,format_wav))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FORMATS,format_wav_gsm))
+
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_blacklist))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_callerid))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_cdr))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_channel))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_cut))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_db))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_devstate))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_extstate))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_global))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_logic))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_shell))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_strings))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_timeout))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_uri))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,FUNCS,func_vmcount))
+
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,PBX,pbx_ael))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,PBX,pbx_config))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,PBX,pbx_spool))
+
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,RES,res_ael_share))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,RES,res_agi))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,RES,res_clioriginate))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,RES,res_crypto))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,RES,res_fax))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,RES,res_fax_spandsp))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,RES,res_musiconhold))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,RES,res_rtp_asterisk))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,RES,res_rtp_multicast))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,RES,res_stun_monitor))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,RES,res_timing_pthread))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,RES,res_timing_timerfd))
+$(eval $(call Build/asterisk18-mod/Template/Menuselect/Module,RES,res_voice))
+
+ifeq ($(CONFIG_ASTERISK_EMBED),y)
+	MENUSELECT_ARGS+= \
+		--enable EMBED_ADDONS
+	MENUSELECT_ARGS+= \
+		--enable EMBED_APPS
+	MENUSELECT_ARGS+= \
+		--enable EMBED_BRIDGES
+	MENUSELECT_ARGS+= \
+		--enable EMBED_CDR
+	MENUSELECT_ARGS+= \
+		--enable EMBED_CHANNELS
+	MENUSELECT_ARGS+= \
+		--enable EMBED_CODECS
+	MENUSELECT_ARGS+= \
+		--enable EMBED_FORMATS
+	MENUSELECT_ARGS+= \
+		--enable EMBED_FUNCS
+	MENUSELECT_ARGS+= \
+		--enable EMBED_PBX
+	MENUSELECT_ARGS+= \
+		--enable EMBED_RES
+	MENUSELECT_ARGS+= \
+		--enable EMBED_TEST
+endif
+
+# @todo@ Remove later
+ifeq ($(CONFIG_ASTERISK_EMBED),y)
+	MENUSELECT_ARGS+= \
+		--disable RES_ADSI
+endif
 
 define Build/Prepare
 	$(call Build/Prepare/Default)
@@ -405,8 +673,29 @@ endif
 endef
 
 define Build/Configure
-	-rm $(PKG_BUILD_DIR)/menuselect.makeopts
+	-rm -f $(PKG_BUILD_DIR)/menuselect.makeopts
 	$(call Build/Configure/Default,,$(SITE_VARS))
+	$(MAKE) -C "$(PKG_BUILD_DIR)" menuselect.makeopts
+	if test -n "$(MENUSELECT_ARGS)" ; then \
+		(cd $(PKG_BUILD_DIR) && ./menuselect/menuselect $(MENUSELECT_ARGS)) ; \
+	fi
+	for category in $(MENUSELECT_CATEGORIES) ; do \
+		modules=`grep MENUSELECT_DEPSFAILED=MENUSELECT_$$$${category}= $(PKG_BUILD_DIR)/menuselect.makeopts | cut -d= -f3` ; \
+		for module in $$$${modules} ; do \
+			for _module in $(MENUSELECT_MODULES) ; do \
+				if test "$$$${module}" = "$$$${_module}" ; then \
+					dependancies=`grep MENUSELECT_DEPENDS_$$$${module} $(PKG_BUILD_DIR)/menuselect.makedeps | cut -d= -f2` ; \
+					echo "menuselect: MENUSELECT_$$$${category}: $$$${module}: *** selection failed; dependancies: $$$${dependancies}" ; \
+					for dependancy in $$$${dependancies} ; do \
+						if ! grep $$$${dependancy}=1 $(PKG_BUILD_DIR)/build_tools/menuselect-deps >/dev/null ; then \
+							echo "menuselect: MENUSELECT_$$$${category}: $$$${module}: $$$${dependancy}: *** dependancy failed" ; \
+						fi ; \
+					done ; \
+					exit 1 ; \
+				fi ; \
+			done ; \
+		done ; \
+	done
 endef
 
 define Build/Compile
@@ -414,7 +703,7 @@ define Build/Compile
 		include/asterisk/version.h \
 		include/asterisk/buildopts.h defaults.h \
 		makeopts.embed_rules
-	ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY" \
+	ASTCFLAGS="$(EXTRA_CFLAGS)" \
 	ASTLDFLAGS="$(EXTRA_LDFLAGS)" \
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
 		ASTVARLIBDIR="/usr/lib/asterisk" \
@@ -422,9 +711,10 @@ define Build/Compile
 		ASTKEYDIR="/usr/lib/asterisk" \
 		ASTDBDIR="/usr/lib/asterisk" \
 		NOISY_BUILD="1" \
-		DEBUG="" \
-		OPTIMIZE="" \
+		DEBUG="$(DEBUG)" \
+		OPTIMIZE="$(OPTIMIZE)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
+		LD="$(TARGET_CROSS)ld" \
 		all install samples
 endef
 
@@ -434,12 +724,11 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/asterisk-1.8/include/
 endef
 
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
 define Package/asterisk18-mod/conffiles
 /etc/asterisk/asterisk.conf
 /etc/asterisk/modules.conf
 /etc/asterisk/extensions.conf
-/etc/asterisk/sip.conf
-/etc/asterisk/sip_notify.conf
 /etc/asterisk/features.conf
 /etc/asterisk/indications.conf
 /etc/asterisk/logger.conf
@@ -448,23 +737,33 @@ define Package/asterisk18-mod/conffiles
 /etc/default/asterisk
 /etc/init.d/asterisk
 endef
+else
+define Package/asterisk18-mod/conffiles
+/etc/default/asterisk
+/etc/init.d/asterisk
+endef
+endif
 
 define Package/asterisk18-mod/install
 	$(INSTALL_DIR) $(1)/etc/asterisk/ssl
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
 	for f in asterisk extensions features \
 		indications logger manager modules \
-		sip sip_notify rtp; do \
+		rtp; do \
 		$(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$$$$f.conf $(1)/etc/asterisk/ ; \
 	done
+endif
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	for f in app_dial app_echo app_playback app_macro \
-		chan_sip res_rtp_asterisk res_rtp_multicast \
+		res_rtp_asterisk res_rtp_multicast \
 		codec_ulaw codec_gsm \
 		format_gsm format_pcm format_wav format_wav_gsm \
 		pbx_config \
 		func_strings func_timeout func_callerid func_logic; do \
 		$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$$$$f.so $(1)/usr/lib/asterisk/modules/ ; \
 	done
+endif
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/default
@@ -488,10 +787,12 @@ endef
 define Package/asterisk18-mod-voicemail/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/voicemail.conf $(1)/etc/asterisk/
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*voicemail.so $(1)/usr/lib/asterisk/modules/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_adsi.so $(1)/usr/lib/asterisk/modules/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_smdi.so $(1)/usr/lib/asterisk/modules/
+endif
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/vm-*.gsm $(1)/usr/lib/asterisk/sounds/
 endef
@@ -503,8 +804,10 @@ endef
 define Package/asterisk18-mod-app-meetme/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/meetme.conf $(1)/etc/asterisk/
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_meetme.so $(1)/usr/lib/asterisk/modules/
+endif
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/conf-*.gsm $(1)/usr/lib/asterisk/sounds/
 endef
@@ -514,6 +817,7 @@ define Package/asterisk18-mod-chan-iax2/conffiles
 /etc/asterisk/iaxprov.conf
 endef
 
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
 define Package/asterisk18-mod-cdr/conffiles
 /etc/asterisk/cdr.conf
 /etc/asterisk/cdr_custom.conf
@@ -522,6 +826,7 @@ define Package/asterisk18-mod-cdr/conffiles
 /etc/asterisk/cdr_pgsql.conf
 /etc/asterisk/cdr_tds.conf
 endef
+endif
 
 define Package/asterisk18-mod-res-musiconhold/conffiles
 /etc/asterisk/musiconhold.conf
@@ -531,28 +836,36 @@ define Package/asterisk18-mod-chan-iax2/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/iax.conf $(1)/etc/asterisk/
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/iaxprov.conf $(1)/etc/asterisk/
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_iax2.so $(1)/usr/lib/asterisk/modules/
+endif
 endef
 
 define Package/asterisk18-mod-cdr/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/cdr*.conf $(1)/etc/asterisk/
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*cdr*.so $(1)/usr/lib/asterisk/modules/
+endif
 endef
 
 define Package/asterisk18-mod-res-musiconhold/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/musiconhold.conf $(1)/etc/asterisk/
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_musiconhold.so $(1)/usr/lib/asterisk/modules/
+endif
 endef
 
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 define Package/asterisk18-mod-res-voice/install
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_voice.so $(1)/usr/lib/asterisk/modules/
 endef
+endif
 
 define Package/asterisk18-mod-chan-gtalk/conffiles
 /etc/asterisk/gtalk.conf
@@ -563,9 +876,11 @@ define Package/asterisk18-mod-chan-gtalk/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/gtalk.conf $(1)/etc/asterisk/
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/jabber.conf $(1)/etc/asterisk/
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_gtalk.so $(1)/usr/lib/asterisk/modules/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_jabber.so $(1)/usr/lib/asterisk/modules/
+endif
 endef
 
 define Package/asterisk18-mod-chan-mobile/conffiles
@@ -575,14 +890,18 @@ endef
 define Package/asterisk18-mod-chan-mobile/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/chan_mobile.conf $(1)/etc/asterisk/
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_mobile.so $(1)/usr/lib/asterisk/modules/
+endif
 endef
 
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 define Package/asterisk18-mod-res-timing-timerfd/install
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_timing_timerfd.so $(1)/usr/lib/asterisk/modules/
 endef
+endif
 
 define Package/asterisk18-mod-res-timing-pthread/install
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
@@ -596,14 +915,18 @@ endef
 define Package/asterisk18-mod-res-fax/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/res_fax.conf $(1)/etc/asterisk/
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_fax.so $(1)/usr/lib/asterisk/modules/
+endif
 endef
 
 define Package/asterisk18-mod-res-fax-spandsp/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_fax_spandsp.so $(1)/usr/lib/asterisk/modules/
+endif
 endef
 
 define Package/asterisk18-mod-chan-mgcp/conffiles
@@ -628,32 +951,63 @@ define Package/asterisk18-mod-chan-skinny/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_skinny.so $(1)/usr/lib/asterisk/modules/
 endef
 
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
 define Package/asterisk18-mod-chan-brcm/conffiles
 /etc/asterisk/brcm.conf
 endef
+endif
 
 define Package/asterisk18-mod-chan-brcm/install
 	$(INSTALL_DIR) $(1)/etc/asterisk
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/brcm.conf $(1)/etc/asterisk/
+endif
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_brcm.so $(1)/usr/lib/asterisk/modules/
+endif
 endef
 
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
+define Package/asterisk18-mod-chan-sip/conffiles
+/etc/asterisk/sip.conf
+/etc/asterisk/sip_notify.conf
+endef
+endif
+
+define Package/asterisk18-mod-chan-sip/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/sip.conf $(1)/etc/asterisk/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/sip_notify.conf $(1)/etc/asterisk/
+endif
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sip.so $(1)/usr/lib/asterisk/modules/
+endif
+endef
+
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 define Package/asterisk18-mod-curl/install
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/func_curl.so $(1)/usr/lib/asterisk/modules/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_curl.so $(1)/usr/lib/asterisk/modules/
 endef
+endif
 
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 define Package/asterisk18-mod-app-transfer/install
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_transfer.so $(1)/usr/lib/asterisk/modules/
 endef
+endif
 
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 define Package/asterisk18-mod-app-softhangup/install
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_softhangup.so $(1)/usr/lib/asterisk/modules/
 endef
+endif
 
 define Package/asterisk18-mod-mysql/conffiles
 /etc/asterisk/app_mysql.conf
@@ -666,10 +1020,12 @@ define Package/asterisk18-mod-mysql/install
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/app_mysql.conf $(1)/etc/asterisk/
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/res_config_mysql.conf $(1)/etc/asterisk/
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/cdr_mysql.conf $(1)/etc/asterisk/
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_mysql.so $(1)/usr/lib/asterisk/modules/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/cdr_mysql.so $(1)/usr/lib/asterisk/modules/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_config_mysql.so $(1)/usr/lib/asterisk/modules/
+endif
 endef
 
 define Package/asterisk18-mod-chan-lantiq/conffiles
@@ -680,23 +1036,31 @@ define Package/asterisk18-mod-chan-lantiq/install
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_DIR) $(1)/etc/asterisk
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/lantiq.conf $(1)/etc/asterisk/
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_lantiq.so $(1)/usr/lib/asterisk/modules/
+endif
 endef
 
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 define Package/asterisk18-mod-res-srtp/install
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_srtp.so $(1)/usr/lib/asterisk/modules/
 endef
+endif
 
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 define Package/asterisk18-mod-res-stun/install
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_stun_monitor.so $(1)/usr/lib/asterisk/modules/
 endef
+endif
 
+ifneq ($(CONFIG_ASTERISK_EMBED),y)
 define Package/asterisk18-mod-app-queue/install
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_queue.so $(1)/usr/lib/asterisk/modules/
 endef
+endif
 
 define Buildasterisk18-modModuleTemplate
 
@@ -711,10 +1075,12 @@ define Buildasterisk18-modModuleTemplate
     This package provides support $(3) in Asterisk.
   endef
 
+  ifneq ($(CONFIG_ASTERISK_EMBED),y)
   define Package/asterisk18-mod-$(subst _,-,$(1))/install
 	$(INSTALL_DIR) $$(1)/usr/lib/asterisk/modules
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$(1).so $$(1)/usr/lib/asterisk/modules/
   endef
+  endif
 
   $$(eval $$(call BuildPackage,asterisk18-mod-$(subst _,-,$(1))))
 endef
@@ -738,6 +1104,7 @@ $(eval $(call BuildPackage,asterisk18-mod-res-timing-pthread))
 $(eval $(call BuildPackage,asterisk18-mod-chan-mgcp))
 $(eval $(call BuildPackage,asterisk18-mod-chan-skinny))
 $(eval $(call BuildPackage,asterisk18-mod-chan-brcm))
+$(eval $(call BuildPackage,asterisk18-mod-chan-sip))
 $(eval $(call BuildPackage,asterisk18-mod-curl))
 $(eval $(call BuildPackage,asterisk18-mod-mysql))
 $(eval $(call BuildPackage,asterisk18-mod-chan-lantiq))
@@ -797,3 +1164,7 @@ $(eval $(call Buildasterisk18-modModuleTemplate,res_clioriginate,Calls via CLI,O
 $(eval $(call Buildasterisk18-modModuleTemplate,app_mixmonitor,Record a call and mix the audio,record a call and mix the audio during the recording))
 $(eval $(call Buildasterisk18-modModuleTemplate,app_playtones,Playtones application,play a tone list))
 $(eval $(call Buildasterisk18-modModuleTemplate,app_record,Record sound file,to record a sound file))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_cdr,?,?))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_forkcdr,?,?))
+$(eval $(call Buildasterisk18-modModuleTemplate,func_cdr,?,?))
+$(eval $(call Buildasterisk18-modModuleTemplate,chan_local,?,?))

asterisk-1.8.x-mod/files/asterisk.init

@@ -36,7 +36,7 @@ start_service() {
 
 	procd_open_instance
 	procd_set_param command "$PROG" -f
-	procd_set_param respawn
+#	procd_set_param respawn
 	procd_close_instance
 #	service_start /usr/sbin/asterisk
 }

voice-client/Makefile

@@ -16,13 +16,55 @@ define Package/voice-client
   SECTION:=net
   CATEGORY:=Network
   TITLE:=voice-client
-  DEPENDS:=+asterisk18-mod
 endef
 
 define Package/voice-client/description
 	voice-client
 endef
 
+define Package/voice-client/conffiles
+/etc/asterisk_templates/asterisk.conf.TEMPLATE
+/etc/asterisk_templates/brcm.conf.TEMPLATE
+/etc/asterisk_templates/brcm_line.TEMPLATE
+/etc/asterisk_templates/cdr.conf.TEMPLATE
+/etc/asterisk_templates/codecs.conf.TEMPLATE
+/etc/asterisk_templates/dnsmgr.conf.TEMPLATE
+/etc/asterisk_templates/extensions.conf.TEMPLATE
+/etc/asterisk_templates/extensions_dialtone.TEMPLATE
+/etc/asterisk_templates/extensions_direct.TEMPLATE
+/etc/asterisk_templates/extensions_extra.conf.TEMPLATE
+/etc/asterisk_templates/extensions_incoming_line.TEMPLATE
+/etc/asterisk_templates/extensions_incoming.TEMPLATE
+/etc/asterisk_templates/extensions_local_line.TEMPLATE
+/etc/asterisk_templates/extensions_local.TEMPLATE
+/etc/asterisk_templates/extensions_macro.conf.TEMPLATE
+/etc/asterisk_templates/extensions_provider.TEMPLATE
+/etc/asterisk_templates/features.conf.TEMPLATE
+/etc/asterisk_templates/indications.conf.TEMPLATE
+/etc/asterisk_templates/logger.conf.TEMPLATE
+/etc/asterisk_templates/manager.conf.TEMPLATE
+/etc/asterisk_templates/meetme.conf.TEMPLATE
+/etc/asterisk_templates/modules.conf.TEMPLATE
+/etc/asterisk_templates/musiconhold.conf.TEMPLATE
+/etc/asterisk_templates/queues.conf.TEMPLATE
+/etc/asterisk_templates/queue.TEMPLATE
+/etc/asterisk_templates/res_stun_monitor.conf.TEMPLATE
+/etc/asterisk_templates/rtp.conf.TEMPLATE
+/etc/asterisk_templates/sip.conf.TEMPLATE
+/etc/asterisk_templates/sip_provider.TEMPLATE
+/etc/asterisk_templates/sip_provider_voicesec.TEMPLATE
+/etc/asterisk_templates/sip_registration.TEMPLATE
+/etc/asterisk_templates/sip_registration_voicesec.TEMPLATE
+/etc/asterisk_templates/sip_user.TEMPLATE
+/etc/asterisk_templates/voicemail.conf.TEMPLATE
+/etc/asterisk_templates/voicemail_mailbox.TEMPLATE
+/etc/init.d/voice_client
+/etc/config/voice_client
+/etc/config/voice_codecs
+/etc/uci-defaults/99-voice_client
+/etc/idc_cc.cfg
+endef
+
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 	$(CP) ./files/* $(PKG_BUILD_DIR)/

voice-client/files/etc/asterisk_templates/brcm.conf.TEMPLATE

@@ -90,7 +90,10 @@ hfmaxdelay=500
 ; The '.' character is used as wildcard
 featureaccesscodes = |FAC|
 
-;
+
+; Remote flash [no, yes]
+remoteflash=no
+
 ; Unused/undocumented settings, do not uncomment/change these
 ;
 ;language=

voice-client/files/etc/asterisk_templates/extensions_macro.conf.TEMPLATE

@@ -170,3 +170,17 @@ exten => s,n,	Wait(5)
 exten => s,n,   Congestion(10)
 exten => s,n,	Hangup()
 
+[macro-feature-brcm-flash]
+;
+; BRCMFlash
+; ${ARG1} - DTMF
+;
+exten => s,1,	BRCMFlash(${DYNAMIC_PEERNAME},${ARG1})
+;exten => s,n,	MacroExit
+
+[macro-feature-test]
+;
+; Test
+;
+;exten => s,1,	Set(CHANNEL(remotehold)=no)
+exten => s,1,	DumpChan()

voice-client/files/etc/asterisk_templates/extensions_provider.TEMPLATE

@@ -27,6 +27,7 @@ exten => _[*#0-9].,n,   |CALL_FILTER|
 exten => _[*#0-9].,n,	Set(DB(LASTCALL/|PROVIDER|)=${DIAL_EXTEN})
 exten => _[*#0-9].,n,	Set(CALLERID(name)=|DISPLAYNAME|)
 exten => _[*#0-9].,n,	Set(__TRANSFER_CONTEXT=|PROVIDER|-transfer)
+exten => _[*#0-9].,n,	Set(__DYNAMIC_FEATURES=|DYNAMIC_FEATURES|)
 exten => _[*#0-9].,n,	Dial(SIP/${DIAL_EXTEN}@|PROVIDER|,,gT)
 exten => _[*#0-9].,n,	Macro(endcall,SIP,|PROVIDER|,${DIAL_EXTEN},${CHANNEL(name)},|MAX_RETRIES|,|RETRYTIME|,|WAITTIME|,|CBBS_KEY|,|CONGESTIONTONE|)
 exten => _[*#0-9].,n,	Goto(hangup,h,2)

voice-client/files/etc/asterisk_templates/features.conf.TEMPLATE

@@ -1,7 +1,16 @@
 [general]
 pickupexten = ;Disabled
+featuredigittimeout = 10000 ;ms
 
 [featuremap]
 blindxfer => |BLINDXFER| ;Blind transfer (default is #)
 disconnect => ;Disabled
 
+[applicationmap]
+brcm_flash => F*,self/both,Macro(brcm-feature-flash)
+brcm_flash0 => F0,self/both,Macro(brcm-feature-flash,0)
+brcm_flash1 => F1,self/both,Macro(brcm-feature-flash,1)
+brcm_flash2 => F2,self/both,Macro(brcm-feature-flash,2)
+brcm_flash3 => F3,self/both,Macro(brcm-feature-flash,3)
+brcm_flash4 => F4,self/both,Macro(brcm-feature-flash,4)
+test => F8,self/both,Macro(feature-test)

voice-client/files/etc/init.d/voice_client

@@ -33,6 +33,9 @@ MD5SUMSFILE=/tmp/$MODULENAME-sums.$$
 # Whitespace separated list of BRCM feature access codes
 BRCM_FAC=
 
+# @todo@ Make configurable
+DYNAMIC_FEATURES="brcm_flash#brcm_flash0#brcm_flash1#brcm_flash2#brcm_flash3#brcm_flash4#test"
+
 #TODO: go through templates, check usage
 
 TMPL_EXTENSIONS=$TEMPLATEDIR/extensions.conf.TEMPLATE
@@ -110,7 +113,7 @@ compare_configs_and_copy_changed()
 {
 	# First, compute md5sums of the config files in $WORKDIR.
 	cd $WORKDIR/
-	md5sum * > $MD5SUMSFILE
+	find . -type f -name \* | sed 's%^\./%%' | xargs md5sum > $MD5SUMSFILE
 
 	# Now, check the files in $ASTERISKDIR against the md5sums.
 	cd $ASTERISKDIR/
@@ -1520,6 +1523,7 @@ configure_extensions_provider()
 	sed -i "s/|RETRYTIME|/$cbbs_retrytime/"		$WORKDIR/extensions_provider.tmp
 	sed -i "s/|WAITTIME|/$cbbs_waittime/"		$WORKDIR/extensions_provider.tmp
 	sed -i "s/|CONGESTIONTONE|/$congestiontone/"	$WORKDIR/extensions_provider.tmp
+	sed -i "s/|DYNAMIC_FEATURES|/$DYNAMIC_FEATURES/"	$WORKDIR/extensions_provider.tmp
 
 	# Configure call forwarding if enabled
 	if [ -n "$callforward_enabled" -a "$callforward_enabled" = "1" ] ; then
@@ -1577,6 +1581,7 @@ configure_extensions_provider()
 
 	local call_ivr call_queue extension
 	echo "exten => $user,n,Set(__TRANSFER_CONTEXT=\${CHANNEL(peername)}-transfer)" >>	$tmp
+	echo "exten => $user,n,Set(__DYNAMIC_FEATURES=$DYNAMIC_FEATURES)" >>   $tmp
 
         # replace prefix '+' with '00'
 	echo "exten => $user,n,GotoIf($[\"\${CALLERID(NUM):0:1}\" = \"+\"]?rewrite:norewrite)" >>	$tmp
@@ -1588,7 +1593,7 @@ configure_extensions_provider()
 	config_get call_queue $1 call_queue
 	config_get call_ivr $1 call_ivr
 	if [ -n "$incoming_lines" ]; then
-		echo "exten => $user,n,Dial($incoming_lines,$(get_voicemail_timeout),tF(hangup,h,2))" >>		$tmp
+		echo "exten => $user,n,Dial($incoming_lines,$(get_voicemail_timeout),hktF(hangup,h,2))" >>		$tmp
 		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"ANSWER\"]?endcall)" >>		$tmp
 		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"BUSY\"]?noanswer)" >>		$tmp
 		echo "exten => $user,n,GotoIf($[\"\${DIALSTATUS}\"=\"NOANSWER\"]?noanswer:endcall)" >>	$tmp