Changeset 2114

Timestamp:

03/01/07 00:13:53 (2 years ago)

Author:

n0-1

Message:

* big asterisk configuration rework, XOR selection should now work
* fixed asterisk-12 for building with misdn support
* dropped a patch for a badly implemented driver
* ported mISDNuser which provides important libs for when using chan_misdn

with asterisk

Files:

• trunk/freewrt/mk/pkg-depend.mk (modified) (2 diffs)
• trunk/freewrt/package/Config.in (modified) (3 diffs)
• trunk/freewrt/package/Makefile (modified) (1 diff)
• trunk/freewrt/package/asterisk-12/Config.in (modified) (2 diffs)
• trunk/freewrt/package/asterisk-12/Makefile (modified) (2 diffs)
• trunk/freewrt/package/asterisk-12/patches/100-junghanns.patch (deleted)
• trunk/freewrt/package/asterisk-12/patches/patch-channels_Makefile (added)
• trunk/freewrt/package/asterisk-12/patches/patch-channels_misdn_Makefile (added)
• trunk/freewrt/package/asterisk-12/patches/patch-utils_Makefile (modified) (1 diff)
• trunk/freewrt/package/asterisk/Config.in (modified) (16 diffs)
• trunk/freewrt/package/asterisk/Makefile (modified) (1 diff)
• trunk/freewrt/package/misdnuser (added)
• trunk/freewrt/package/misdnuser/Config.in (added)
• trunk/freewrt/package/misdnuser/Makefile (added)
• trunk/freewrt/package/misdnuser/ipkg (added)
• trunk/freewrt/package/misdnuser/ipkg/mISDNuser.control (added)

trunk/freewrt/mk/pkg-depend.mk

@@ -161 +161 @@
-asterisk-compile: zaptel-compile
-endif
+ifneq ($(FWRT_PACKAGE_ASTERISK_MISDN),)
+asterisk-compile: misdnuser-compile
+endif
-
-asterisk-12-compile: ncurses-compile openssl-compile zlib-compile curl-compile popt-compile
@@ -181 +184 @@
-asterisk-12-compile: zaptel-12-compile
-endif
+ifneq ($(FWRT_PACKAGE_ASTERISK_12_MISDN),)
+asterisk-12-compile: misdnuser-compile
+endif
-
-freeradius-compile: libtool-compile openssl-compile

trunk/freewrt/package/Config.in

@@ -88 +88 @@
-source "package/arpd/Config.in"
-source "package/arpwatch/Config.in"
-source "package/asterisk/Config.in"
-source "package/asterisk-12/Config.in"
-source "package/atftp/Config.in"
-source "package/avahi/Config.in"
@@ -243 +241 @@
-endmenu
-
-#menu "Telephony"
-#source "package/misdnuser/Config.in"
-#endmenu
-
-menu "Libraries"
-source "package/apr/Config.in"
@@ -341 +335 @@
-endmenu
-
+menu "Telephony"
+
+config FWRT_PACKAGE_ASTERISK_META
+        prompt "asterisk.......................... Complete open source PBX"
+        tristate
+        select FWRT_PACKAGE_ASTERISK_12 if FWRT_PACKAGE_ASTERISK_VERSION_12
+        select FWRT_PACKAGE_ASTERISK_14 if FWRT_PACKAGE_ASTERISK_VERSION_14
+        select FWRT_PACKAGE_LIBCURL
+        select FWRT_PACKAGE_LIBNCURSES
+        select FWRT_PACKAGE_LIBPTHREAD
+        default n
+        help
+          Asterisk is a complete PBX in software. It provides all of the features
+          you would expect from a PBX and more. Asterisk does voice over IP in three
+          protocols, and can interoperate with almost all standards-based telephony
+          equipment using relatively inexpensive hardware.
+          
+          http://www.asterisk.org/
+
+choice
+prompt "Asterisk Version"
+boolean
+depends on FWRT_PACKAGE_ASTERISK_META
+
+config FWRT_PACKAGE_ASTERISK_VERSION_12
+        prompt "1.2"
+config FWRT_PACKAGE_ASTERISK_VERSION_14
+        prompt "1.4"
+
+endchoice
+source "package/asterisk-12/Config.in"
+source "package/asterisk/Config.in"
+
+source "package/misdnuser/Config.in"
+endmenu
+
-menu "Utilities"
-source "package/bc/Config.in"

trunk/freewrt/package/Makefile

@@ -167 +167 @@
-package-$(FWRT_COMPILE_MIREDO) += miredo
-package-$(FWRT_PACKAGE_MISDN) += misdn
+package-$(FWRT_PACKAGE_MISDNUSER) += misdnuser
-package-$(FWRT_PACKAGE_MKSH) += mksh
-package-$(FWRT_COMPILE_MONIT) += monit

trunk/freewrt/package/asterisk-12/Config.in

@@ -1 @@
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-config FWRT_PACKAGE_ASTERISK_12_CHAN_MGCP
@@ -109 +100 @@
-          This package allows creation of conference channels.
-
+config FWRT_PACKAGE_ASTERISK_12_MISDN
+        prompt   "asterisk-misdn.................... Support for mISDN"
+        tristate
+        default n
+        depends on FWRT_PACKAGE_ASTERISK_12
+        select FWRT_PACKAGE_MISDNUSER
+        depends on FWRT_LINUX_2_6_RB
-endmenu

trunk/freewrt/package/asterisk-12/Makefile

@@ -8 +8 @@
-
-PKG_NAME:=              asterisk
-4
+5
-PKG_RELEASE:=           1
-2ce03466b99e0b9471e6c791ed14a5f2
+9fa08e97e1398f82c60009e56d6c97da
-PKG_INIT:=              60
-PKG_SOURCE_URL:=        http://ftp.digium.com/pub/asterisk/old-releases/ \
@@ -77 +77 @@
-                rm -f *ilbc* *agi* *sqlite* *iax* *lpc10* \
-                        *voicemail* *dundi* *adsi* *skinny* \
-
+ *zap*
-        )
-        (cd ${IDIR_ASTERISK_12}/etc/asterisk ; \
-
+*zap* 
-        )
-        ${INSTALL_DATA} ./files/modules.conf ${IDIR_ASTERISK_12}/etc/asterisk/

trunk/freewrt/package/asterisk-12/patches/patch-utils_Makefile

@@ -3 +3 @@
-        never forget the LDFLAGS when linking
-
-4.orig/utils/Makefile        2005-11-29 19:24:39
-4/utils/Makefile     2007-01-31 02:48:25
-4,10 +64
-$^
+5.orig/utils/Makefile        2007-01-24 18:43:50
+5/utils/Makefile     2007-02-28 18:50:04
+5,10 +65
+check_expr.c ast_expr2.o ast_expr2f.o
- 
- smsq: smsq.o

trunk/freewrt/package/asterisk/Config.in

@@ -1 @@
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-config FWRT_PACKAGE_ASTERISK_CHAN_MGCP
@@ -18 +11 @@
-        tristate
-        default n
-
+_14
-        help
-          Media Gateway Control Protocol implementation for Asterisk
@@ -26 +19 @@
-        tristate
-        default n
-
+_14
-        help
-          Skinny Client Control Protocol implementation for Asterisk
@@ -34 +27 @@
-        tristate
-        default n
-
+_14
-        help
-          IAX2 allows trunking communication channels together.
@@ -45 +38 @@
-        tristate
-        default n
-
+_14
-        help
-          The Internet Low Bitrate Codec (ILBC) Translator for Asterisk
@@ -53 +46 @@
-        tristate
-        default n
-
+_14
-        help
-          The LPC10 (Linear Predictor Code) 2.4kbps Voice Coder for Asterisk
@@ -61 +54 @@
-#       tristate
-#       default n
-
+_14
-#       select FWRT_PACKAGE_LIBSPEEX
-#       help
@@ -70 +63 @@
-        tristate
-        default n
-
+_14
-        help
-          The GSM codec for Asterisk
@@ -78 +71 @@
-        tristate
-        default n
-
+_14
-        help
-          Distributed Universal Number Discovery (DUNDi) support for Asterisk
@@ -86 +79 @@
-        tristate
-        default n
-
+_14
-        help
-          Asterisk Gateway Interface module
@@ -94 +87 @@
-        tristate
-        default n
-
+_14
-        select FWRT_PACKAGE_LIBPQ
-        help
@@ -103 +96 @@
-        tristate
-        default n
-
+_14
-        select FWRT_PACKAGE_LIBSQLITE
-        help
@@ -112 +105 @@
-        tristate
-        default n
-
+_14
-        help
-          Sound files for Asterisk
@@ -120 +113 @@
-        tristate
-        default n
-
+_14
-        help
-          Voicemail related modules for Asterisk
@@ -128 +121 @@
-        tristate
-        default n
-
+_14
-        select FWRT_PACKAGE_ZAPTEL
-        depends on FWRT_LINUX_2_6_RB
@@ -134 +127 @@
-          This package allows creation of conference channels.
-
+config FWRT_PACKAGE_ASTERISK_MISDN
+        prompt   "asterisk-misdn.................... Support for mISDN"
+        tristate
+        default n
+        depends FWRT_PACKAGE_ASTERISK_14
+        select FWRT_PACKAGE_MISDNUSER
+        depends on FWRT_LINUX_2_6_RB
-endmenu

trunk/freewrt/package/asterisk/Makefile

@@ -17 +17 @@
-include $(TOPDIR)/mk/package.mk
-
-
+_14
-$(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_SQLITE,asterisk-sqlite,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))