Changeset 1605

Timestamp:

01/16/07 16:30:37 (2 years ago)

Author:

n0-1

Message:

some cleanup, asterisk-mini is needles as modularization
increases, mysql-support is gone.

Files:

• trunk/freewrt/package/asterisk/Config.in (modified) (5 diffs)
• trunk/freewrt/package/asterisk/Makefile (modified) (10 diffs)
• trunk/freewrt/package/asterisk/ipkg/asterisk-meetme.conffiles (added)
• trunk/freewrt/package/asterisk/ipkg/asterisk-meetme.control (added)
• trunk/freewrt/package/asterisk/ipkg/asterisk-mini.conffiles (deleted)
• trunk/freewrt/package/asterisk/ipkg/asterisk-mini.control (deleted)
• trunk/freewrt/package/asterisk/ipkg/asterisk-mysql.conffiles (deleted)
• trunk/freewrt/package/asterisk/ipkg/asterisk-mysql.control (deleted)
• trunk/freewrt/package/asterisk/patches/200-custom_cflags.patch (modified) (2 diffs)

trunk/freewrt/package/asterisk/Config.in

@@ -13 +13 @@
-          
-          http://www.asterisk.org/
-
-config FWRT_PACKAGE_ASTERISK_CHAN_BLUETOOTH
-        prompt   "asterisk-chan-bluetooth......... Bluetooth HandsFreeProfile support for Asterisk"
-        tristate
-        default n
-        depends FWRT_PACKAGE_ASTERISK
-        select FWRT_PACKAGE_BLUEZ_LIBS
-        help
-          The Bluetooth HandsFreeProfile support for Asterisk
-
-config FWRT_PACKAGE_ASTERISK_CHAN_MGCP
@@ -39 +30 @@
-          Skinny Client Control Protocol implementation for Asterisk
-
+config FWRT_PACKAGE_ASTERISK_CHAN_IAX2
+        prompt   "asterisk-chan-iax2.............. Support for the Inter Asterisk Protocol"
+        tristate
+        default n
+        depends FWRT_PACKAGE_ASTERISK
+        help
+          IAX2 allows trunking communication channels together.
+
+          Contains:
+          * chan_iax2.so
+
-config FWRT_PACKAGE_ASTERISK_CODEC_ILBC
-        prompt   "asterisk-codec-ilbc............. Internet Low Bitrate Codec (ILBC) Translator"
@@ -55 +57 @@
-          The LPC10 (Linear Predictor Code) 2.4kbps Voice Coder for Asterisk
-
-
-
-
-
-
-
-
-
+#
+#
+#
+#
+#
+#
+#
+#
-
-config FWRT_PACKAGE_ASTERISK_CODEC_GSM
@@ -87 +89 @@
-        help
-          Asterisk Gateway Interface module
-
-config FWRT_PACKAGE_ASTERISK_MYSQL
-        prompt   "asterisk-mysql.................. MySQL modules"
-        tristate
-        default n
-        depends FWRT_PACKAGE_ASTERISK
-        select FWRT_PACKAGE_LIBMYSQLCLIENT
-        help
-          MySQL modules for Asterisk
-
-config FWRT_PACKAGE_ASTERISK_PGSQL
@@ -130 +123 @@
-        help
-          Voicemail related modules for Asterisk
+
+config FWRT_PACKAGE_ASTERISK_MEETME
+        prompt   "asterisk-meetme................. Support For MeetMe (Conferences)"
+        tristate
+        default n
+        depends FWRT_PACKAGE_ASTERISK
+        select FWRT_PACKAGE_ZAPTEL
+        help
+          This package allows creation of conference channels.
+
-endmenu

trunk/freewrt/package/asterisk/Makefile

@@ -20 +20 @@
-$(eval $(call PKG_template,ASTERISK,asterisk,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_MINI,asterisk-mini,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-
-
+
+
-$(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-#$(eval $(call PKG_template,ASTERISK_CHAN_BLUETOOTH,asterisk-chan-bluetooth,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_CHAN_MGCP,asterisk-chan-mgcp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_CHAN_SKINNY,asterisk-chan-skinny,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,ASTERISK_CHAN_IAX2,asterisk-chan-iax2,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_CODEC_ILBC,asterisk-codec-ilbc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_CODEC_LPC10,asterisk-codec-lpc10,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
@@ -34 +33 @@
-$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                        --with-ncurses=${STAGING_DIR}/usr \
-                        --with-ssl=${STAGING_DIR}/usr
@@ -69 +45 @@
-CONFIGURE_ARGS+=        --without-gsm
-endif
-
-
-
+
+
+
+
-ifneq (${FWRT_PACKAGE_ASTERISK_FORMAT_VORBIS},)
-CONFIGURE_ARGS+=        --with-ogg=${STAGING_DIR}/usr \
@@ -89 +66 @@
-CONFIGURE_ARGS+=        --with-curl=${STAGING_DIR}/usr
-endif
-ZAPTEL
+ASTERISK_MEETME
-CONFIGURE_ARGS+=        --with-zaptel=${STAGING_DIR}/usr
-else
-CONFIGURE_ARGS+=        --without-zaptel
-endif
+ifneq (${FWRT_PACKAGE_ASTERISK_PGSQL},)
+CONFIGURE_ARGS+=        --with-postgres=${STAGING_DIR}/usr
+else
+CONFIGURE_ARGS+=        --without-postgres
+endif
+ifneq (${FWRT_PACKAGE_LIBPOPT},)
+CONFIGURE_ARGS+=        --with-popt=${STAGING_DIR}/usr
+else
+CONFIGURE_ARGS+=        --without-popt
+endif
+
+EXTRA_CPPFLAGS:=        $(strip ${TARGET_CPPFLAGS}) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+EXTRA_CFLAGS:=          $(strip ${TARGET_CFLAGS}) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+EXTRA_LDFLAGS:=         $(strip ${TARGET_LDFLAGS}) -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-
-$(WRKBUILD)/.configured:
@@ -120 +111 @@
-                  --disable-nls \
-                  --without-curses \
-                  --without-kde \
-                  --without-qt \
-                  --without-gnutls \
-                  --without-asound \
@@ -135 +124 @@
-                  --without-osptk \
-                  --without-oss \
-                  --without-popt \
-                  --without-postgres \
-                  --without-pri \
-                  --without-pwlib \
@@ -155 +142 @@
-        );
-        $(MAKE) -C "$(WRKBUILD)" \
--I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-(strip $(TARGET_CFLAGS)) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
--L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
+${EXTRA_CPPFLAGS}
+{EXTRA_CFLAGS}
+${EXTRA_LDFLAGS}
-                DESTDIR="$(WRKINST)" \
+                OPTIMIZE="-Os" \
-                NOISY_BUILD=1 \
-                all install samples
+        (cd ${WRKBUILD}/sounds ; \
+                tar xzf asterisk-core-sounds-en-gsm-1.4.4.tar.gz ; \
+                tar xzf asterisk-moh-freeplay-wav.tar.gz ; \
+                rm asterisk-core-sounds-en-gsm-1.4.4.tar.gz ; \
+                rm asterisk-moh-freeplay-wav.tar.gz ; \
+        );
-        touch $@
-
-#$(WRKBUILD)/.built:
-#       $(MAKE) -C "$(WRKBUILD)" \
-#               CROSS_ARCH="Linux" \
-#               CROSS_COMPILE="$(TARGET_CROSS)" \
-#               CROSS_COMPILE_BIN="/void/" \
-#               CROSS_COMPILE_TARGET="/void/" \
-#               $(TARGET_CONFIGURE_OPTS) \
-#               HOST_CC="$(HOSTCC)" \
-#               OPTIMIZE="$(TARGET_CFLAGS)" \
-#               PROC="$(ARCH)" \
-#               DEBUG="" \
-#               OPTIONS="-DLOW_MEMORY -Dlinux" \
-#               NOCRYPTO="yes" \
-#               EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
-#               EXTRA_LDFLAGS="$(EXTRA_LDFLAGS)" \
-#               EXTRA_APP_MODULES="$(EXTRA_APP_MODULES)" \
-#               EXTRA_CDR_MODULES="$(EXTRA_CDR_MODULES)" \
-#               EXTRA_CHAN_MODULES="$(EXTRA_CHAN_MODULES)" \
-#               EXTRA_CODEC_MODULES="$(EXTRA_CODEC_MODULES)" \
-#               EXTRA_RES_MODULES="$(EXTRA_RES_MODULES)" \
-#               DESTDIR="$(WRKINST)" \
-#               ASTVARLIBDIR="/usr/lib/asterisk" \
-#               $(EXTRA_DEFINES) \
-#               all install samples
-#       rm -f $(WRKINST)/etc/asterisk/*.old
-#       touch $@
-
-$(IPKG_ASTERISK):
@@ -226 +193 @@
-                rm -f dundi.conf ; \
-        )
-install -m0644
+${INSTALL_DATA}
-        $(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(WRKINST)/etc/asterisk/musiconhold.conf
-install -d -m0755
-install -m0755
+${INSTALL_DIR}
+${INSTALL_BIN}
-        $(RSTRIP) $(IDIR_ASTERISK)
-        $(IPKG_BUILD) $(IDIR_ASTERISK) $(PACKAGE_DIR)
-
-$(IPKG_ASTERISK_MINI):
-        install -d -m0755 $(IDIR_ASTERISK_MINI)/etc/asterisk
-        for f in asterisk enum extconfig extensions features iax iaxprov logger manager modules musiconhold rtp sip; do \
-          $(CP) $(WRKINST)/etc/asterisk/$$f.conf $(IDIR_ASTERISK_MINI)/etc/asterisk/ ; \
-        done
-        install -m0644 ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/
-        $(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(WRKINST)/etc/asterisk/musiconhold.conf
-        install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk
-#       $(CP) $(WRKINST)/usr/lib/asterisk/firmware $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/
-        install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/keys
-        install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/modules
-        for f in chan_iax2 chan_local chan_sip codec_gsm codec_ulaw format_gsm format_pcm format_wav \
-          format_wav_gsm pbx_config res_features res_musiconhold; do \
-          $(CP) $(WRKINST)/usr/lib/asterisk/modules/$$f.so $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/modules/ ; \
-        done
-        install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/mohmp3
-        install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/sounds
-        install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/sbin
-        $(CP) $(WRKINST)/usr/sbin/asterisk $(IDIR_ASTERISK_MINI)/usr/sbin/
-        $(CP) $(WRKINST)/usr/sbin/safe_asterisk $(IDIR_ASTERISK_MINI)/usr/sbin/
-        install -d -m0755 $(IDIR_ASTERISK_MINI)/etc/init.d
-        install -m0755  ./files/asterisk.init $(IDIR_ASTERISK_MINI)/etc/init.d/S$(PKG_INIT)asterisk
-        $(RSTRIP) $(IDIR_ASTERISK_MINI)
-        $(IPKG_BUILD) $(IDIR_ASTERISK_MINI) $(PACKAGE_DIR)
-
-$(IPKG_ASTERISK_MYSQL):
-        install -d -m0755 $(IDIR_ASTERISK_MYSQL)/etc/asterisk
-#       install -m0600 $(WRKBUILD)/configs/cdr_mysql.conf.sample $(IDIR_ASTERISK_MYSQL)/etc/asterisk/cdr_mysql.conf
-        install -d -m0755 $(IDIR_ASTERISK_MYSQL)/usr/lib/asterisk/modules
-#       install -m0755 $(WRKBUILD)/apps/app_sql_mysql.so $(IDIR_ASTERISK_MYSQL)/usr/lib/asterisk/modules/
-#       install -m0755 $(WRKBUILD)/cdr/cdr_mysql.so $(IDIR_ASTERISK_MYSQL)/usr/lib/asterisk/modules/
-        $(RSTRIP) $(IDIR_ASTERISK_MYSQL)
-        $(IPKG_BUILD) $(IDIR_ASTERISK_MYSQL) $(PACKAGE_DIR)
-
-$(IPKG_ASTERISK_PGSQL):
-
-
-
-
-
+
+
+
+
-        $(RSTRIP) $(IDIR_ASTERISK_PGSQL)
-        $(IPKG_BUILD) $(IDIR_ASTERISK_PGSQL) $(PACKAGE_DIR)
-
-$(IPKG_ASTERISK_SQLITE):
-install -d -m0755
-install -m0755
+${INSTALL_DIR}
+${INSTALL_BIN}
-        $(RSTRIP) $(IDIR_ASTERISK_SQLITE)
-        $(IPKG_BUILD) $(IDIR_ASTERISK_SQLITE) $(PACKAGE_DIR)
-
-$(IPKG_ASTERISK_SOUNDS):
-install -d -m0755
+${INSTALL_DIR}
-        $(CP) $(WRKBUILD)/sounds/* $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/
-        rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/*.mp3
@@ -290 +222 @@
-
-$(IPKG_ASTERISK_VOICEMAIL):
-install -d -m0755
-install -m0644 $(WRKBUILD)/configs/voicemail.conf.sample $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
-install -d -m0755 $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules
-install -m0755
-install -m0755
-#
-#
+${INSTALL_DIR}
+${INSTALL_DIR} $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules
+${INSTALL_DATA} $(WRKBUILD)/configs/voicemail.conf.sample $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
+${CP}
+${INSTALL_BIN}
+
+
-        $(RSTRIP) $(IDIR_ASTERISK_VOICEMAIL)
-        $(IPKG_BUILD) $(IDIR_ASTERISK_VOICEMAIL) $(PACKAGE_DIR)
-
-$(IPKG_ASTERISK_CHAN_BLUETOOTH):
-        install -d -m0755 $(IDIR_ASTERISK_CHAN_BLUETOOTH)/etc/asterisk
-        install -m0644 $(WRKBUILD)/configs/bluetooth.conf $(IDIR_ASTERISK_CHAN_BLUETOOTH)/etc/asterisk/bluetooth.conf
-        install -d -m0755 $(IDIR_ASTERISK_CHAN_BLUETOOTH)/usr/lib/asterisk/modules
-        install -m0755 $(WRKBUILD)/channels/chan_bluetooth.so $(IDIR_ASTERISK_CHAN_BLUETOOTH)/usr/lib/asterisk/modules/
-        $(RSTRIP) $(IDIR_ASTERISK_CHAN_BLUETOOTH)
-        $(IPKG_BUILD) $(IDIR_ASTERISK_CHAN_BLUETOOTH) $(PACKAGE_DIR)
-
-$(IPKG_ASTERISK_CHAN_MGCP):
-install -d -m0755
-install -m0644
-install -d -m0755
-install -m0755
+${INSTALL_DIR}
+${INSTALL_DATA}
+${INSTALL_DIR}
+${INSTALL_BIN}
-        $(RSTRIP) $(IDIR_ASTERISK_CHAN_MGCP)
-        $(IPKG_BUILD) $(IDIR_ASTERISK_CHAN_MGCP) $(PACKAGE_DIR)
-
-$(IPKG_ASTERISK_CHAN_SKINNY):
-install -d -m0755
-install -m0644
-install -d -m0755
-install -m0755
+${INSTALL_DIR}
+${INSTALL_DATA}
+${INSTALL_DIR}
+${INSTALL_BIN}
-        $(RSTRIP) $(IDIR_ASTERISK_CHAN_SKINNY)
-        $(IPKG_BUILD) $(IDIR_ASTERISK_CHAN_SKINNY) $(PACKAGE_DIR)
-
+$(IPKG_ASTERISK_CHAN_IAX2):
+        ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk
+        ${INSTALL_DATA} $(WRKBUILD)/configs/iax.conf.sample $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk/iax.conf
+        ${INSTALL_DATA} $(WRKBUILD)/configs/iaxprov.conf.sample $(IDIR_ASTERISK_CHAN_SKINNY)/etc/asterisk/iaxprov.conf
+        ${INSTALL_DIR} $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules
+        ${INSTALL_BIN} $(WRKBUILD)/channels/chan_iax2.so $(IDIR_ASTERISK_CHAN_SKINNY)/usr/lib/asterisk/modules/
+        $(RSTRIP) $(IDIR_ASTERISK_CHAN_SKINNY)
+        $(IPKG_BUILD) $(IDIR_ASTERISK_CHAN_SKINNY) $(PACKAGE_DIR)
+
-$(IPKG_ASTERISK_CODEC_ILBC):
-install -d -m0755
-install -m0755
-install -m0755
+${INSTALL_DIR}
+${INSTALL_BIN}
+${INSTALL_BIN}
-        $(RSTRIP) $(IDIR_ASTERISK_CODEC_ILBC)
-        $(IPKG_BUILD) $(IDIR_ASTERISK_CODEC_ILBC) $(PACKAGE_DIR)
-
-$(IPKG_ASTERISK_CODEC_LPC10):
-install -d -m0755
-install -m0755
+${INSTALL_DIR}
+${INSTALL_BIN}
-        $(RSTRIP) $(IDIR_ASTERISK_CODEC_LPC10)
-        $(IPKG_BUILD) $(IDIR_ASTERISK_CODEC_LPC10) $(PACKAGE_DIR)
-
-
-       install -d -m0755
-
-
-
+#
+#      ${INSTALL_DIR}
+#
+#
+#
-
-$(IPKG_ASTERISK_CODEC_GSM):
@@ -350 +283 @@
-
-$(IPKG_ASTERISK_PBX_DUNDI):
-install -d -m0755
-install -m0644
-install -d -m0755
-install -m0755
+${INSTALL_DIR}
+${INSTALL_DATA}
+${INSTALL_DIR}
+${INSTALL_BIN}
-        $(RSTRIP) $(IDIR_ASTERISK_PBX_DUNDI)
-        $(IPKG_BUILD) $(IDIR_ASTERISK_PBX_DUNDI) $(PACKAGE_DIR)
-
-$(IPKG_ASTERISK_RES_AGI):
-install -d -m0755
-install -d -m0755
-install -m0755
+${INSTALL_DIR}
+${INSTALL_DIR}
+${INSTALL_BIN}
-        $(RSTRIP) $(IDIR_ASTERISK_RES_AGI)
-        $(IPKG_BUILD) $(IDIR_ASTERISK_RES_AGI) $(PACKAGE_DIR)
-
+$(IPKG_ASTERISK_MEETME):
+        ${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/etc/asterisk/
+        ${INSTALL_DIR} ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
+        ${INSTALL_DATA} ${WRKBUILD}/configs/meetme.conf.sample ${IDIR_ASTERISK_MEETME}/etc/asterisk/meetme.conf
+        ${INSTALL_BIN} ${WRKBUILD}/apps/app_meetme.so ${IDIR_ASTERISK_MEETME}/usr/lib/asterisk/modules
+        $(RSTRIP) $(IDIR_ASTERISK_MEETME)
+        $(IPKG_BUILD) $(IDIR_ASTERISK_MEETME) $(PACKAGE_DIR)
+

trunk/freewrt/package/asterisk/patches/200-custom_cflags.patch

@@ -4 +4 @@
-
---- asterisk-1.4.0.orig/Makefile        2006-12-22 23:33:46.000000000 +0100
-04 20:20:13
+15 12:34:22
-@@ -180,6 +180,10 @@ ifeq ($(OSARCH),linux-gnu)
-   endif
@@ -10 +10 @@
- 
-+# fix for cross compiling
--I${STAGING_DIR}/usr/include
--L${STAGING_DIR}/usr/lib
+${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}
+${EXTRA_LDFLAGS}
-+
- ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)