Changeset 1945

Show
Ignore:
Timestamp:
02/12/07 13:35:26 (2 years ago)
Author:
n0-1
Message:

* seperate subpackage for asterisk-12 zaptel support
* some deps fixup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/mk/pkg-depend.mk

    r1935 r1945  
    169169asterisk-12-compile: sqlite2-compile 
    170170endif 
    171 ifneq ($(FWRT_PACKAGE_ASTERISK_12_MEETME),) 
     171ifneq ($(FWRT_PACKAGE_ASTERISK_12_ZAPTEL),) 
    172172asterisk-12-compile: zaptel-12-compile 
    173173endif 

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

    r1930 r1945  
    9595        default n 
    9696        depends FWRT_PACKAGE_ASTERISK_12 
    97         select FWRT_PACKAGE_ZAPTEL_12 
     97        select FWRT_PACKAGE_ASTERISK_12_ZAPTEL 
    9898        depends on FWRT_LINUX_2_6_RB 
    9999        help 
    100100          This package allows creation of conference channels. 
    101101 
     102config FWRT_PACKAGE_ASTERISK_12_ZAPTEL 
     103        prompt   "asterisk-zaptel................. Support For Zaptel" 
     104        tristate 
     105        default n 
     106        depends on FWRT_LINUX_2_6_RB 
     107        depends on FWRT_PACKAGE_ASTERISK_12 
     108        select FWRT_PACKAGE_ZAPTEL_12 
     109        help 
     110          This package allows creation of conference channels. 
     111 
    102112endmenu 

  • trunk/freewrt/package/asterisk-12/Makefile

    r1900 r1945  
    2929$(eval $(call PKG_template,ASTERISK_12_PBX_DUNDI,asterisk-12-pbx-dundi,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    3030$(eval $(call PKG_template,ASTERISK_12_RES_AGI,asterisk-12-res-agi,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    31  
    32 ifneq (${FWRT_PACKAGE_ASTERISK_12_SQLITE},) 
    33 EXTRA_CDR_MODULES += cdr_sqlite.so 
    34 endif 
    35 ifneq (${FWRT_PACKAGE_ASTERISK_12_CODEC_SPEEX},) 
    36 TCFLAGS += -I${STAGING_DIR}/usr/include/speex 
    37 EXTRA_CODEC_MODULES += codec_speex.so 
    38 endif 
     31$(eval $(call PKG_template,ASTERISK_12_ZAPTEL,asterisk-12-zaptel,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    3932 
    4033SUB_INSTALLS-y:= 
    …… 
    5043SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_RES_AGI}+=              asterisk-res-agi-install 
    5144SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_MEETME}+=               asterisk-meetme-install 
     45SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_ZAPTEL}+=               asterisk-zaptel-install 
    5246 
    5347BUILD_STYLE:=           auto 
    …… 
    5751MAKE_ENV+=              CROSS_ARCH="${KERNEL_ARCH}" 
    5852MAKE_ENV+=              LIBS="${TLDFLAGS} -ldl -lpthread -lresolv" NOCRYPTO=yes 
    59 # DEBUG is originally set to -g3 
     53MAKE_FLAGS+=            ASTVARLIBDIR="/usr/lib/asterisk" 
     54ifneq (${FWRT_DO_DEBUGGING},) 
     55MAKE_FLAGS+=            DEBUG= -g3 
     56else 
    6057MAKE_FLAGS+=            DEBUG= 
    61 MAKE_FLAGS+=            ASTVARLIBDIR="/usr/lib/asterisk" 
    62 #MAKE_FLAGS+=           WITHOUT_ZAPTEL=1 # this can be used to force disabling of zaptel 
     58endif 
     59ifeq (${FWRT_PACKAGE_ASTERISK_12_ZAPTEL},) 
     60MAKE_FLAGS+=            WITHOUT_ZAPTEL=1 
     61endif 
    6362INSTALL_STYLE:=         auto 
    6463INSTALL_TARGET:=        install samples 
    6564TCFLAGS+=               ${TCPPFLAGS} 
     65ifneq (${FWRT_PACKAGE_ASTERISK_12_CODEC_SPEEX},) 
     66TCFLAGS += -I${STAGING_DIR}/usr/include/speex 
     67endif 
    6668 
    6769post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} 
    …… 
    9799                ${IDIR_ASTERISK_12_MEETME}/etc/asterisk/meetme.conf 
    98100 
     101asterisk-zaptel-install: 
     102        install -d -m0755 ${IDIR_ASTERISK_12_ZAPTEL}/usr/lib/asterisk/modules/ 
     103        install -d -m0755 ${IDIR_ASTERISK_12_ZAPTEL}/etc/asterisk/ 
     104        install -m0755 ${WRKBUILD}/apps/app_zap{ateller,barge,ras,scan}.so \ 
     105                ${IDIR_ASTERISK_12_ZAPTEL}/usr/lib/asterisk/modules/ 
     106        install -m0755 ${WRKBUILD}/channels/chan_zap.so \ 
     107                ${IDIR_ASTERISK_12_ZAPTEL}/usr/lib/asterisk/modules/ 
     108        install -m0755 ${WRKBUILD}/configs/zapata.conf.sample \ 
     109                ${IDIR_ASTERISK_12_ZAPTEL}/etc/asterisk/zapata.conf 
     110 
    99111asterisk-chan-iax2-install: 
    100112        install -d -m0755 ${IDIR_ASTERISK_12_CHAN_IAX2}/usr/lib/asterisk/modules 
    …… 
    110122 
    111123asterisk-voicemail-install: 
    112         install -d -m0755 ${IDIR_ASTERISK_12_VOICEMAIL}/etc/asterisk 
    113         install -m0644 ${WRKBUILD}/configs/voicemail.conf.sample ${IDIR_ASTERISK_12_VOICEMAIL}/etc/asterisk/voicemail.conf 
    114         install -d -m0755 ${IDIR_ASTERISK_12_VOICEMAIL}/usr/lib/asterisk/modules 
     124        ${INSTALL_DIR} ${IDIR_ASTERISK_12_VOICEMAIL}/etc/asterisk 
     125        ${INSTALL_DIR} ${IDIR_ASTERISK_12_VOICEMAIL}/usr/lib/asterisk/modules 
     126        ${INSTALL_DATA} ${WRKBUILD}/configs/voicemail.conf.sample \ 
     127                ${IDIR_ASTERISK_12_VOICEMAIL}/etc/asterisk/voicemail.conf 
    115128        install -m0755 ${WRKBUILD}/apps/*voicemail.so ${IDIR_ASTERISK_12_VOICEMAIL}/usr/lib/asterisk/modules/ 
    116129        install -m0755 ${WRKBUILD}/res/res_adsi.so ${IDIR_ASTERISK_12_VOICEMAIL}/usr/lib/asterisk/modules/ 

  • trunk/freewrt/package/asterisk-12/ipkg/asterisk-12-meetme.control

    r1815 r1945  
    33Section: net 
    44Description: MeetMe support files for asterisk-12 
    5 Depends: asterisk-12 
     5Depends: asterisk-12, zaptel-12 

  • trunk/freewrt/package/zaptel-12/Makefile

    r1883 r1945  
    4141                        -Wall -I. -Wstrict-prototypes -fomit-frame-pointer \ 
    4242                        -I${LINUX_DIR}/drivers/net/wan -I${LINUX_DIR}/include/net \ 
    43                         -DSTANDALONE_ZAPATA -DZAPTEL_CONFIG=${WRKINST}/etc/zaptel.conf 
     43                        -DSTANDALONE_ZAPATA -DZAPTEL_CONFIG=/etc/zaptel.conf 
    4444 
    4545pre-build: 
    …… 
    4747 
    4848post-install: 
    49         ${INSTALL_DIR} ${IDIR_ZAPTEL_12}/usr/lib 
     49        ${INSTALL_DIR} ${IDIR_ZAPTEL_12}/usr/{lib,sbin} 
     50        ${INSTALL_DIR} ${IDIR_ZAPTEL_12}/etc 
    5051        ${CP} ${WRKINST}/usr/lib/libtonezone.so.* ${IDIR_ZAPTEL_12}/usr/lib 
     52        ${INSTALL_BIN} ${WRKINST}/sbin/ztcfg ${IDIR_ZAPTEL_12}/usr/sbin/ 
     53        ${INSTALL_DATA} ${WRKINST}/etc/zaptel.conf ${IDIR_ZAPTEL_12}/etc/ 
    5154        ${INSTALL_DIR} ${IDIR_KMOD_ZAPTEL_12}/lib/modules/${KERNEL_VERSION} 
    5255        ${INSTALL_DATA} ${WRKBUILD}/zaptel.${KERNEL_MOD_SUFFIX} \