Changeset 2562

Timestamp:

05/20/07 15:15:22 (2 years ago)

Author:

wbx

Message:

* update asterisk, zaptel and libpri to latest upstream version
* add junghanns latest asterisk patches and drivers for qozap and zaphfc

runtime tests on routerboard 2.6, compiles on brcm-2.4.
more testing as soon as my ISDN line is up and running, after LT2007...

Files:

• trunk/freewrt/mk/modules.mk (modified) (1 diff)
• trunk/freewrt/package/asterisk-12/Config.in (modified) (3 diffs)
• trunk/freewrt/package/asterisk-12/Makefile (modified) (4 diffs)
• trunk/freewrt/package/asterisk-12/patches/100-junghanns-0.3.0-PRE-1y-e.patch (added)
• trunk/freewrt/package/libpri/patches/100-junghanns-0.3.0-PRE-1y-e.patch (added)
• trunk/freewrt/package/libpri/patches/100-junghanns.patch (deleted)
• trunk/freewrt/package/zaptel-12/Config.in (modified) (1 diff)
• trunk/freewrt/package/zaptel-12/Config.in.kernel (modified) (3 diffs)
• trunk/freewrt/package/zaptel-12/Makefile (modified) (3 diffs)
• trunk/freewrt/package/zaptel-12/extra (added)
• trunk/freewrt/package/zaptel-12/extra/qozap.c (added)
• trunk/freewrt/package/zaptel-12/extra/qozap.h (added)
• trunk/freewrt/package/zaptel-12/extra/zaphfc.c (added)
• trunk/freewrt/package/zaptel-12/extra/zaphfc.h (added)
• trunk/freewrt/package/zaptel-12/files (added)
• trunk/freewrt/package/zaptel-12/files/qozap.modules (added)
• trunk/freewrt/package/zaptel-12/files/zaphfc.modules (added)
• trunk/freewrt/package/zaptel-12/files/zaptel.modules (added)
• trunk/freewrt/package/zaptel-12/files/ztdummy.modules (added)
• trunk/freewrt/package/zaptel-12/ipkg/kmod-qozap-12.control (added)
• trunk/freewrt/package/zaptel-12/ipkg/kmod-zaphfc-12.control (modified) (1 diff)
• trunk/freewrt/package/zaptel-12/patches/001-cross.patch (deleted)
• trunk/freewrt/package/zaptel-12/patches/002-strip_zaptel.conf.patch (deleted)
• trunk/freewrt/package/zaptel-12/patches/003-config.h-fixup.patch (deleted)
• trunk/freewrt/package/zaptel-12/patches/004-x86-xpp-disable.patch (deleted)
• trunk/freewrt/package/zaptel-12/patches/100-junghanns-bristuff-0.3.0-PRE-1y-e.patch (added)
• trunk/freewrt/package/zaptel-12/patches/100-junghanns.patch (deleted)
• trunk/freewrt/package/zaptel-12/patches/110-zaphfc.patch (deleted)
• trunk/freewrt/package/zaptel-12/patches/patch-Makefile (added)
• trunk/freewrt/package/zaptel-12/patches/patch-Makefile_kernel26 (added)
• trunk/freewrt/package/zaptel-12/patches/patch-zaptel_h (added)

trunk/freewrt/mk/modules.mk

@@ -998 +998 @@
-
-# Library modules
-
+RC_C
-        $(MODULES_DIR)/kernel/lib/crc-ccitt \
-,20))

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

@@ -85 +85 @@
-        tristate
-        default n
-depends
+select
-        select FWRT_PACKAGE_ASTERISK_12_ZAPTEL
-        help
@@ -94 +94 @@
-        tristate
-        default n
-
-
+
-        select FWRT_PACKAGE_ZAPTEL_12
+        select FWRT_PACKAGE_KMOD_ZAPTEL_12
-        help
-creation of conference channels
+using ISDN zaptel hardware
-
-config FWRT_PACKAGE_ASTERISK_12_CHAN_MISDN
@@ -104 +104 @@
-        tristate
-        default n
-
+
+
-        select FWRT_PACKAGE_MISDNUSER
-
+
+
+
-endmenu

trunk/freewrt/package/asterisk-12/Makefile

@@ -8 +8 @@
-
-PKG_NAME:=              asterisk
-7
-3
-1a41a1f4a535813b1272bae0545c7990
+8
+1
+84d16eb0a94a3da883cb9bd6cb8a3fca
-PKG_SOURCE_URL:=        http://ftp.digium.com/pub/asterisk/old-releases \
-                        ftp://ftp.digium.com/pub/asterisk/old-releases
@@ -25 +25 @@
-$(eval $(call PKG_template,ASTERISK_12_CHAN_SKINNY,asterisk-12-chan-skinny,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,ASTERISK_12_CHAN_IAX2,asterisk-12-chan-iax2,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+ifeq ($(FWRT_LINUX_2_6),y)
-$(eval $(call PKG_template,ASTERISK_12_CHAN_MISDN,asterisk-12-chan-misdn,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+endif
-$(eval $(call PKG_template,ASTERISK_12_CODEC_SPEEX,asterisk-12-codec-speex,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,ASTERISK_12_PBX_DUNDI,asterisk-12-pbx-dundi,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
@@ -37 +39 @@
-SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_SOUNDS}+=               asterisk-sounds-install
-SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_CHAN_MGCP}+=            asterisk-chan-mgcp-install
+ifeq ($(FWRT_LINUX_2_6),y)
-SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_CHAN_MISDN}+=           asterisk-chan-misdn-install
+endif
-SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_CHAN_SKINNY}+=          asterisk-chan-skinny-install
-SUB_INSTALLS-${FWRT_PACKAGE_ASTERISK_12_CHAN_IAX2}+=            asterisk-chan-iax2-install
@@ -79 +83 @@
-                rm -f *ilbc* *agi* *sqlite* *iax* *lpc10* \
-                        *voicemail* *dundi* *adsi* *skinny* \
-
+ *format_ogg_vorbis*
-        )
-        (cd ${IDIR_ASTERISK_12}/etc/asterisk ; \

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

@@ -2 +2 @@
-        prompt "zaptel-12......................... Zaptel library (Version 1.2)"
-        tristate
+        select FWRT_PACKAGE_LIBPRI
+        depends FWRT_PACKAGE_ASTERISK_VERSION_12
-        default n
-        depends on FWRT_LINUX_2_6_RB || FWRT_LINUX_2_6_X86
-        help
-          

trunk/freewrt/package/zaptel-12/Config.in.kernel

@@ -2 +2 @@
-        prompt "kmod-zaptel-12.................... Zaptel generic support (Version 1.2)"
-        tristate
+        select FWRT_KPACKAGE_KMOD_CRC_CCITT
-        default n
-        depends on FWRT_LINUX_2_6_RB || FWRT_LINUX_2_6_X86 || FWRT_LINUX_2_6_BRCM
-        help
-          
@@ -12 +12 @@
-        tristate
-        default n
-depends on
+select
-        help
-          
@@ -18 +18 @@
-
-config FWRT_PACKAGE_KMOD_ZAPHFC_12
-
+.
-        tristate
-        default n
-
-
+
-        help
+          Kernel driver for Zaphfc one-port ISDN cards.
+
+          http://www.junghanns.net
+
+config FWRT_PACKAGE_KMOD_QOZAP_12
+        prompt "kmod-qozap-12..................... Zaptel qozap driver (Version 1.2)"
+        tristate
+        default n
+        select FWRT_PACKAGE_KMOD_ZAPTEL_12
+        help
+          Kernel driver for qozap duo-, quad- or octo-port ISDN cards.
-          
-asterisk.org
+junghanns.net

trunk/freewrt/package/zaptel-12/Makefile

@@ -9 +9 @@
-
-PKG_NAME:=              zaptel
-
-
-
-
+
+
+
-PKG_SOURCE_URL:=        http://ftp.digium.com/pub/zaptel/releases
-
-include ${TOPDIR}/mk/package.mk
+include ${TOPDIR}/mk/kpkg.mk
-
-$(eval $(call PKG_template,ZAPTEL_12,zaptel-12,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
@@ -21 +21 @@
-$(eval $(call PKG_template,KMOD_ZTDUMMY_12,kmod-ztdummy-12,${KERNEL_VERSION}-${BOARD}-${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-$(eval $(call PKG_template,KMOD_ZAPHFC_12,kmod-zaphfc-12,${KERNEL_VERSION}-${BOARD}-${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
+$(eval $(call PKG_template,KMOD_QOZAP_12,kmod-qozap-12,${KERNEL_VERSION}-${BOARD}-${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
-
-BUILD_STYLE:=           auto
-TCFLAGS+=               -DZAPTEL_CONFIG=\"${WRKINST}/etc/zaptel.conf\"
-ifeq ($(KERNEL),2.4)
-
-
+
+
+
+
+
+
+
-                        V=1 \
-MODULES="zaptel"
-KSRC=${LINUX_DIR}
-
+DYNFS=yes
+MODULES="zaptel ztdummy zaphfc qozap"
+
-else
-
-
+
+
+
+
-                        V=1 \
-
-
-
+
+
+
+
+
-endif
-INSTALL_STYLE:=         auto
-XAKE_FLAGS+=            CC="${TARGET_CC}" \
-                        KSRC="${LINUX_DIR}" \
-FAKE_FLAGS+=            INSTALL_PREFIX="${WRKINST}"
-
-
-
-
-
-
+
+
+
+
-
-pre-build:
-@@ARCH@@
+##ARCH##
-
-post-install:
@@ -59 +64 @@
-        ${INSTALL_BIN} ${WRKINST}/sbin/ztcfg ${IDIR_ZAPTEL_12}/usr/sbin/
-        ${INSTALL_DATA} ${WRKINST}/etc/zaptel.conf ${IDIR_ZAPTEL_12}/etc/
+        ${INSTALL_DIR} ${IDIR_KMOD_ZAPTEL_12}/etc/modules.d
-        ${INSTALL_DIR} ${IDIR_KMOD_ZAPTEL_12}/lib/modules/${KERNEL_VERSION}
-        ${INSTALL_DATA} ${WRKBUILD}/zaptel.${KERNEL_MOD_SUFFIX} \
-                ${IDIR_KMOD_ZAPTEL_12}/lib/modules/${KERNEL_VERSION}/
+        ${INSTALL_DATA} ./files/zaptel.modules ${IDIR_KMOD_ZAPTEL_12}/etc/modules.d/50-zaptel
+        ${INSTALL_DIR} ${IDIR_KMOD_ZTDUMMY_12}/etc/modules.d
-        ${INSTALL_DIR} ${IDIR_KMOD_ZTDUMMY_12}/lib/modules/${KERNEL_VERSION}
-        ${INSTALL_DATA} ${WRKBUILD}/ztdummy.${KERNEL_MOD_SUFFIX} \
-                ${IDIR_KMOD_ZTDUMMY_12}/lib/modules/${KERNEL_VERSION}/
+        ${INSTALL_DATA} ./files/ztdummy.modules ${IDIR_KMOD_ZTDUMMY_12}/etc/modules.d/60-ztdummy
-        ${INSTALL_DIR} ${IDIR_KMOD_ZAPHFC_12}/lib/modules/${KERNEL_VERSION}
+        ${INSTALL_DIR} ${IDIR_KMOD_ZAPHFC_12}/etc/modules.d
-        ${INSTALL_DATA} ${WRKBUILD}/zaphfc.${KERNEL_MOD_SUFFIX} \
-
+
+
+
+
+
+
+
-
-include ${TOPDIR}/mk/pkg-bottom.mk

trunk/freewrt/package/zaptel-12/ipkg/kmod-zaphfc-12.control

@@ -3 +3 @@
-Section: sys
-Depends: libpri, zaptel-12, kmod-zaptel-12
-Zaptel 
+Junghanns Zap