[Astlinux-commits] SF.net SVN: astlinux:[5565] branches/1.0

[<abe...@us...>]

Revision: 5565
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5565&view=rev
Author:   abelbeck
Date:     2012-06-07 21:35:16 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
asterisk, prepare for Asterisk 10/11 support, changes include:
Change astdb symlink from /tmp to /var/db
Add astdb.sqlite3 file support on /mnt/kd/ for Asterisk 10/11
Added a new project/astlinux/asterisk.makeopts-10 for Asterisk 10/11
Enable app_meetme, app_page and chan_jingle Asterisk 10/11

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk.init
    branches/1.0/package/asterisk/asterisk.mk
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/functions
    branches/1.0/project/astlinux/target_skeleton/usr/sbin/restore-basic-conf

Added Paths:
-----------
    branches/1.0/project/astlinux/asterisk.makeopts-10

Modified: branches/1.0/package/asterisk/asterisk.init
===================================================================
--- branches/1.0/package/asterisk/asterisk.init	2012-06-06 19:35:41 UTC (rev 5564)
+++ branches/1.0/package/asterisk/asterisk.init	2012-06-07 21:35:16 UTC (rev 5565)
@@ -54,8 +54,12 @@
     cp -a /stat/etc/asterisk/* /tmp/etc/asterisk/
   fi
 
-  if [ -f /mnt/kd/astdb ]; then
-    ln -sf /mnt/kd/astdb /tmp/astdb
+  if [ -f /mnt/kd/astdb -o -f /mnt/kd/astdb.sqlite3 ]; then
+    ln -sf /mnt/kd/astdb /var/db/astdb
+
+    if [ -L /stat/var/lib/asterisk/astdb.sqlite3 ]; then
+      ln -sf /mnt/kd/astdb.sqlite3 /var/db/astdb.sqlite3
+    fi
   fi
 
   make_symlink_or_dir "/mnt/kd/cdr-csv" "/var/log/asterisk/cdr-csv"

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2012-06-06 19:35:41 UTC (rev 5564)
+++ branches/1.0/package/asterisk/asterisk.mk	2012-06-07 21:35:16 UTC (rev 5565)
@@ -32,9 +32,16 @@
 space:=$(empty) $(empty)
 ndots = $(subst $(space),$(dot),$(wordlist $(1),$(2),$(subst $(dot),$(space),$3)))
 ##
+ASTERISK_VERSION_SINGLE := $(call ndots,1,1,$(ASTERISK_VERSION))
 ASTERISK_VERSION_TUPLE := $(call ndots,1,2,$(ASTERISK_VERSION))
 ASTERISK_VERSION_TRIPLE := $(call ndots,1,3,$(ASTERISK_VERSION))
 
+ifeq ($(ASTERISK_VERSION_SINGLE),1)
+ASTERISK_GLOBAL_MAKEOPTS := $(BASE_DIR)/../project/astlinux/asterisk.makeopts
+else
+ASTERISK_GLOBAL_MAKEOPTS := $(BASE_DIR)/../project/astlinux/asterisk.makeopts-10
+endif
+
 ASTERISK_CONFIGURE_ENV += \
 			USE_GETIFADDRS=yes
 
@@ -154,8 +161,13 @@
 	touch $@
 
 $(ASTERISK_DIR)/.patched: $(ASTERISK_DIR)/.source
+ifeq ($(ASTERISK_VERSION_SINGLE),1)
 	toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk-$(ASTERISK_VERSION_TUPLE)-\*.patch
 	toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk-$(ASTERISK_VERSION_TRIPLE)-\*.patch
+else
+	toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk-$(ASTERISK_VERSION_SINGLE)-\*.patch
+	toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk-$(ASTERISK_VERSION_TUPLE)-\*.patch
+endif
 
 ifeq ($(strip $(BR2_PACKAGE_SPANDSP)),y)
  ifeq ($(strip $(BR2_PACKAGE_SPANDSP_APP_FAX)),y)
@@ -202,13 +214,13 @@
 ifeq ($(strip $(BR2_PACKAGE_ASTERISK_MENUSELECT)),y)
 	PATH=$(STAGING_DIR)/bin:$$PATH \
 	$(MAKE) -C $(ASTERISK_DIR) \
-		GLOBAL_MAKEOPTS=$(BASE_DIR)/../project/astlinux/asterisk.makeopts \
+		GLOBAL_MAKEOPTS=$(ASTERISK_GLOBAL_MAKEOPTS) \
 		USER_MAKEOPTS= \
 		menuselect
 else
 	PATH=$(STAGING_DIR)/bin:$$PATH \
 	$(MAKE) -C $(ASTERISK_DIR) \
-		GLOBAL_MAKEOPTS=$(BASE_DIR)/../project/astlinux/asterisk.makeopts \
+		GLOBAL_MAKEOPTS=$(ASTERISK_GLOBAL_MAKEOPTS) \
 		USER_MAKEOPTS= \
 		menuselect.makeopts
  ifeq ($(strip $(BR2_PACKAGE_MYSQL_CLIENT)),y)
@@ -221,14 +233,18 @@
 		menuselect/menuselect --enable IMAP_STORAGE menuselect.makeopts; \
 	)
  endif
+ ifneq ($(ASTERISK_VERSION_SINGLE),1)
+	(cd $(ASTERISK_DIR); \
+		menuselect/menuselect --enable app_meetme --enable app_page --enable chan_jingle menuselect.makeopts; \
+	)
+ endif
 endif
 	touch $@
 
 $(ASTERISK_DIR)/$(ASTERISK_BINARY): $(ASTERISK_DIR)/.configured
-	#cp $(STAGING_DIR)/include/dlfcn.h $(STAGING_DIR)/usr/include/dlfcn.h # Can I do this?
 	PATH=$(STAGING_DIR)/bin:$$PATH \
 	$(MAKE) -C $(ASTERISK_DIR) \
-		GLOBAL_MAKEOPTS=$(BASE_DIR)/../project/astlinux/asterisk.makeopts \
+		GLOBAL_MAKEOPTS=$(ASTERISK_GLOBAL_MAKEOPTS) \
 		USER_MAKEOPTS= \
 		ASTVARRUNDIR=/var/run/asterisk
 
@@ -236,7 +252,7 @@
 	# mkdir -p $(TARGET_DIR)/$(ASTERISK_MODULE_DIR)
 	PATH=$(STAGING_DIR)/bin:$$PATH \
 	$(MAKE1) -C $(ASTERISK_DIR) \
-		GLOBAL_MAKEOPTS=$(BASE_DIR)/../project/astlinux/asterisk.makeopts \
+		GLOBAL_MAKEOPTS=$(ASTERISK_GLOBAL_MAKEOPTS) \
 		USER_MAKEOPTS=menuselect.makeopts \
 		ASTVARRUNDIR=/var/run/asterisk \
 		SOUNDS_CACHE_DIR=$(DL_DIR) \
@@ -260,7 +276,11 @@
 	mv $(TARGET_DIR)/var/lib/asterisk/* $(TARGET_DIR)/stat/var/lib/asterisk/
 	rmdir $(TARGET_DIR)/var/lib/asterisk
 	rm -f $(TARGET_DIR)/stat/var/lib/asterisk/astdb
-	ln -sf /tmp/astdb $(TARGET_DIR)/stat/var/lib/asterisk/astdb
+	ln -sf /var/db/astdb $(TARGET_DIR)/stat/var/lib/asterisk/astdb
+ifneq ($(ASTERISK_VERSION_SINGLE),1)
+	rm -f $(TARGET_DIR)/stat/var/lib/asterisk/astdb.sqlite3
+	ln -sf /var/db/astdb.sqlite3 $(TARGET_DIR)/stat/var/lib/asterisk/astdb.sqlite3
+endif
 	mkdir -p $(TARGET_DIR)/stat/var/spool
 	mv $(TARGET_DIR)/var/spool/asterisk $(TARGET_DIR)/stat/var/spool/
 	touch -c $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY)

Added: branches/1.0/project/astlinux/asterisk.makeopts-10
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts-10	                        (rev 0)
+++ branches/1.0/project/astlinux/asterisk.makeopts-10	2012-06-07 21:35:16 UTC (rev 5565)
@@ -0,0 +1,85 @@
+MENUSELECT_ADDONS=chan_mobile chan_ooh323 format_mp3 res_config_mysql app_mysql app_saycountpl cdr_mysql 
+MENUSELECT_APPS=app_page app_skel app_fax app_ivrdemo app_jack app_osplookup app_saycounted app_dahdibarge app_meetme app_readfile app_setcallerid 
+MENUSELECT_BRIDGES=
+MENUSELECT_CDR=cdr_adaptive_odbc cdr_odbc cdr_pgsql cdr_radius cdr_tds cdr_sqlite 
+MENUSELECT_CEL=cel_odbc cel_pgsql cel_radius cel_tds 
+MENUSELECT_CHANNELS=chan_alsa chan_console chan_jingle chan_misdn chan_nbs chan_vpb chan_h323 
+MENUSELECT_CODECS=codec_speex 
+MENUSELECT_FORMATS=format_ogg_vorbis 
+MENUSELECT_FUNCS=func_odbc func_speex 
+MENUSELECT_PBX=pbx_lua 
+MENUSELECT_RES=res_calendar_caldav res_calendar_ews res_calendar_exchange res_calendar_icalendar res_config_odbc res_http_post res_odbc res_ais res_config_ldap res_config_pgsql res_config_sqlite res_pktccops res_snmp res_timing_kqueue 
+MENUSELECT_TESTS=test_acl test_amihooks test_aoc test_app test_ast_format_str_reduce test_astobj2 test_config test_db test_devicestate test_dlinklists test_event test_expr test_format_api test_func_file test_gosub test_heap test_linkedlists test_locale test_logger test_netsock2 test_pbx test_poll test_sched test_security_events test_skel test_stringfields test_strings test_substitution test_time test_utils 
+MENUSELECT_CFLAGS=LOADABLE_MODULES 
+MENUSELECT_OPTS_app_voicemail=FILE_STORAGE 
+MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb 
+MENUSELECT_AGIS=
+MENUSELECT_EMBED=
+MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM 
+MENUSELECT_MOH=-MOH-OPSOUND-WAV 
+MENUSELECT_EXTRA_SOUNDS=
+MENUSELECT_BUILD_DEPS=chan_local app_voicemail res_monitor res_agi res_adsi res_smdi res_crypto res_jabber res_ael_share res_fax G711_NEW_ALGORITHM 
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack
+MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_adaptive_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_radius
+MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_radius
+MENUSELECT_DEPSFAILED=MENUSELECT_CEL=cel_tds
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_alsa
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_console
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn
+MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
+MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex
+MENUSELECT_DEPSFAILED=MENUSELECT_FORMATS=format_ogg_vorbis
+MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_speex
+MENUSELECT_DEPSFAILED=MENUSELECT_PBX=pbx_lua
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_caldav
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_ews
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_exchange
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_calendar_icalendar
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_http_post
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_ais
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_ldap
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_sqlite
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp
+MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_kqueue
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_acl
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_amihooks
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_aoc
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_app
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ast_format_str_reduce
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_config
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_db
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_devicestate
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dlinklists
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_event
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_expr
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_format_api
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_func_file
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_gosub
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_heap
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_linkedlists
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_locale
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_logger
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_netsock2
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_pbx
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_poll
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_sched
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_security_events
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_skel
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_stringfields
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_strings
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_substitution
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_time
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_utils
+MENUSELECT_DEPSFAILED=MENUSELECT_CFLAGS=BUILD_NATIVE

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/functions
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/functions	2012-06-06 19:35:41 UTC (rev 5564)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/functions	2012-06-07 21:35:16 UTC (rev 5565)
@@ -45,12 +45,16 @@
   
   cp -a /var/spool/cron/crontabs ${1}/
 
-  if [ -f /tmp/astdb ]; then
-    cp -a /tmp/astdb ${1}/
+  if [ -f /var/db/astdb ]; then
+    cp -a /var/db/astdb ${1}/
   else
     touch ${1}/astdb
   fi
 
+  if [ -f /var/db/astdb.sqlite3 ]; then
+    cp -a /var/db/astdb.sqlite3 ${1}/
+  fi
+
   if [ -d /stat/etc/arno-iptables-firewall ]; then
     cp -a /stat/etc/arno-iptables-firewall ${1}/
   fi

Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/restore-basic-conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/restore-basic-conf	2012-06-06 19:35:41 UTC (rev 5564)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/restore-basic-conf	2012-06-07 21:35:16 UTC (rev 5565)
@@ -75,7 +75,7 @@
 
 # Restore basic configuration files
 #
-if ! restore_files astdb astdb.sqlite3 astdb.sqlite3-journal webgui-prefs.txt blocked-hosts dnsmasq.static \
+if ! restore_files astdb astdb.sqlite3 webgui-prefs.txt blocked-hosts dnsmasq.static \
                    ast-crash rc.local rc.local.stop rc.elocal rc.ledcontrol hosts ethers; then
   exit 2
 fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.