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

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

Revision: 5262
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5262&view=rev
Author:   abelbeck
Date:     2011-11-19 00:50:21 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
asterisk, add a selector for Asterisk 10

Modified Paths:
--------------
    branches/1.0/astlinux.config
    branches/1.0/astlinux18.config
    branches/1.0/package/asterisk/Config.in
    branches/1.0/package/asterisk/asterisk.mk

Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config	2011-11-18 17:18:07 UTC (rev 5261)
+++ branches/1.0/astlinux.config	2011-11-19 00:50:21 UTC (rev 5262)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5256-dirty Configuration
-# Mon Nov 14 15:56:55 2011
+# Buildroot 2011.08-svn5261-dirty Configuration
+# Fri Nov 18 18:36:58 2011
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -159,6 +159,7 @@
 BR2_PACKAGE_ASTERISK_v1_4=y
 # BR2_PACKAGE_ASTERISK_v1_6 is not set
 # BR2_PACKAGE_ASTERISK_v1_8 is not set
+# BR2_PACKAGE_ASTERISK_v10_0 is not set
 # BR2_PACKAGE_ASTERISK_MENUSELECT is not set
 BR2_PACKAGE_ASTERISK-AGI-AUDIOTX=y
 BR2_PACKAGE_ASTERISK_APP_NOTIFY=y

Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config	2011-11-18 17:18:07 UTC (rev 5261)
+++ branches/1.0/astlinux18.config	2011-11-19 00:50:21 UTC (rev 5262)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5256-dirty Configuration
-# Mon Nov 14 15:56:57 2011
+# Buildroot 2011.08-svn5261-dirty Configuration
+# Fri Nov 18 18:37:39 2011
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -159,6 +159,7 @@
 # BR2_PACKAGE_ASTERISK_v1_4 is not set
 # BR2_PACKAGE_ASTERISK_v1_6 is not set
 BR2_PACKAGE_ASTERISK_v1_8=y
+# BR2_PACKAGE_ASTERISK_v10_0 is not set
 # BR2_PACKAGE_ASTERISK_MENUSELECT is not set
 BR2_PACKAGE_ASTERISK_APP_NOTIFY=y
 BR2_PACKAGE_ASTERISK_GUI=y

Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in	2011-11-18 17:18:07 UTC (rev 5261)
+++ branches/1.0/package/asterisk/Config.in	2011-11-19 00:50:21 UTC (rev 5262)
@@ -30,6 +30,11 @@
 		bool "Asterisk v1.8.x"
 		help
 			Asterisk Long Term Stable Release.
+
+	config BR2_PACKAGE_ASTERISK_v10_0
+		bool "Asterisk v10.0.x"
+		help
+			Asterisk Standard Release.
 endchoice
 
 config BR2_PACKAGE_ASTERISK_CHANMISDN

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2011-11-18 17:18:07 UTC (rev 5261)
+++ branches/1.0/package/asterisk/asterisk.mk	2011-11-19 00:50:21 UTC (rev 5262)
@@ -9,7 +9,11 @@
  ifeq ($(BR2_PACKAGE_ASTERISK_v1_6),y)
 ASTERISK_VERSION := 1.6.2.20
  else
+  ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
 ASTERISK_VERSION := 1.8.7.1
+  else
+ASTERISK_VERSION := 10.0.0-rc2
+  endif
  endif
 endif
 ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
@@ -66,11 +70,13 @@
 endif
 
 ifeq ($(strip $(BR2_PACKAGE_LIBSRTP)),y)
- ifeq ($(strip $(BR2_PACKAGE_ASTERISK_v1_8)),y)
+ ifneq ($(ASTERISK_VERSION_TUPLE),1.4)
+ ifneq ($(ASTERISK_VERSION_TUPLE),1.6)
 ASTERISK_EXTRAS+=libsrtp
 ASTERISK_CONFIGURE_ARGS+= \
 			--with-srtp="$(STAGING_DIR)/usr" 
  endif
+ endif
 endif
 
 ifeq ($(strip $(BR2_PACKAGE_UW-IMAP)),y)
@@ -246,9 +252,11 @@
 	$(INSTALL) -D -m 0755 package/asterisk/safe_asterisk $(TARGET_DIR)/usr/sbin/safe_asterisk
 	$(INSTALL) -D -m 0755 package/asterisk/asterisk-sip-monitor $(TARGET_DIR)/usr/sbin/asterisk-sip-monitor
 	$(INSTALL) -D -m 0755 package/asterisk/asterisk-sip-monitor-ctrl $(TARGET_DIR)/usr/sbin/asterisk-sip-monitor-ctrl
-ifeq ($(ASTERISK_VERSION_TUPLE),1.8)
+ifneq ($(ASTERISK_VERSION_TUPLE),1.4)
+ifneq ($(ASTERISK_VERSION_TUPLE),1.6)
 	$(INSTALL) -D -m 0755 $(ASTERISK_DIR)/contrib/scripts/ast_tls_cert $(TARGET_DIR)/usr/sbin/ast_tls_cert
 endif
+endif
 	mkdir -p $(TARGET_DIR)/stat/var/lib/asterisk
 	mv $(TARGET_DIR)/var/lib/asterisk/* $(TARGET_DIR)/stat/var/lib/asterisk/
 	rmdir $(TARGET_DIR)/var/lib/asterisk

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