svn commit: r303334 - in head/misc: . dahdi-kmod26 dahdi-kmod26/files
Max Khon
fjoe at FreeBSD.org
Wed Aug 29 11:54:29 UTC 2012
Author: fjoe
Date: Wed Aug 29 11:54:28 2012
New Revision: 303334
URL: http://svn.freebsd.org/changeset/ports/303334
Log:
DAHDI 2.6.1 development version:
- Digium TE820: PCI-Express eight-port T1/E1/J1 is now supported
- new FreeBSD compat shims (similar to OFED in FreeBSD 9 and later)
- wcb1xxp support (temporarily) removed - it was not working in 2.4 port anyway
- dahdi_dynamic is likely to be broken
Added:
head/misc/dahdi-kmod26/
- copied from r301876, head/misc/dahdi-kmod/
head/misc/dahdi-kmod26/files/patch-drivers-staging-echo-echo.c (contents, props changed)
Deleted:
head/misc/dahdi-kmod26/files/patch-bchan
head/misc/dahdi-kmod26/files/patch-dahdi-iface
head/misc/dahdi-kmod26/files/patch-flush_workqueue
head/misc/dahdi-kmod26/files/patch-freebsd-freebsd-dahdi-Makefile
head/misc/dahdi-kmod26/files/patch-freebsd-include-dahdi-compat-bsd.h
head/misc/dahdi-kmod26/files/patch-freebsd-include-stdbool.h
head/misc/dahdi-kmod26/files/patch-ithread
head/misc/dahdi-kmod26/files/patch-oslec
head/misc/dahdi-kmod26/files/patch-zaphfc
Modified:
head/misc/Makefile
head/misc/dahdi-kmod26/Makefile
head/misc/dahdi-kmod26/distinfo
head/misc/dahdi-kmod26/pkg-plist
Modified: head/misc/Makefile
==============================================================================
--- head/misc/Makefile Wed Aug 29 11:47:29 2012 (r303333)
+++ head/misc/Makefile Wed Aug 29 11:54:28 2012 (r303334)
@@ -62,6 +62,7 @@
SUBDIR += cwish
SUBDIR += dahdi
SUBDIR += dahdi-kmod
+ SUBDIR += dahdi-kmod26
SUBDIR += ddate
SUBDIR += deco
SUBDIR += dejagnu
Modified: head/misc/dahdi-kmod26/Makefile
==============================================================================
--- head/misc/dahdi-kmod/Makefile Fri Aug 3 02:06:44 2012 (r301876)
+++ head/misc/dahdi-kmod26/Makefile Wed Aug 29 11:54:28 2012 (r303334)
@@ -5,14 +5,14 @@
# $FreeBSD$
#
-PORTNAME= dahdi-kmod
-PORTVERSION= ${DAHDI_VERSION:S/-//g}
-PORTREVISION= 6
+PORTNAME= dahdi-kmod26
+PORTVERSION= ${DAHDI_VERSION:S/-/./g}
CATEGORIES= misc kld
MASTER_SITES= ${MASTER_SITE_LOCAL}\
+ http://people.freebsd.org/~fjoe/dahdi/\
http://downloads.digium.com/pub/telephony/firmware/releases/:firmware
MASTER_SITE_SUBDIR= fjoe
-DISTNAME= dahdi-freebsd-complete-${DAHDI_VERSION}+${DAHDI_TOOLS_VERSION}
+DISTNAME= dahdi-freebsd-${DAHDI_VERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}\
oslec-linux-${OSLEC_VERSION}${EXTRACT_SUFX}\
zaphfc-${ZAPHFC_VERSION}${EXTRACT_SUFX}
@@ -22,31 +22,35 @@ COMMENT= Digium/Asterisk Hardware Device
RUN_DEPENDS= ${LOCALBASE}/sbin/dahdi_cfg:${PORTSDIR}/misc/dahdi
-DAHDI_VERSION= 2.4.0-rc5
+DAHDI_VERSION= 2.6.1-r10709
DAHDI_TOOLS_VERSION= 2.4.0-rc1
OSLEC_VERSION= 2.6.35.4
ZAPHFC_VERSION= r5
-FIRMWARES= OCT6114_064 OCT6114_128 TC400M HX8 ${_vpmadt032}
+FIRMWARES= OCT6114_064 OCT6114_128 OCT6114_256 TC400M HX8 ${_vpmadt032} VPMOCT032 WCT820
OCT6114_064_VERSION= 1.05.01
OCT6114_128_VERSION= 1.05.01
+OCT6114_256_VERSION= 1.05.01
TC400M_VERSION= MR6.12
HX8_VERSION= 2.06
VPMADT032_NAME= dahdi-fwload-vpmadt032
VPMADT032_DIR= dahdi_vpmadt032_loader
VPMADT032_VERSION= 1.25.0
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/freebsd
-EXTRA_PATCHES= ${WRKDIR}/zaphfc-${ZAPHFC_VERSION}
-PATCH_STRIP= -p1
+VPMOCT032_VERSION= 1.12.0
+WCT820_NAME= dahdi-fw-te820
+WCT820_VERSION= 1.76
+
+WRKSRC= ${WRKDIR}/${DISTNAME}
+#EXTRA_PATCHES= ${WRKDIR}/zaphfc-${ZAPHFC_VERSION}
+#PATCH_STRIP= -p1
MAKEFILE= BSDmakefile
NO_PACKAGE= Should be in sync with the kernel to work correctly
USE_RC_SUBR= dahdi
-MAKE_ARGS= ADDITIONAL_DRIVERS="wcb1xxp" NO_FETCH=yes
+MAKE_ARGS= NO_FETCH=yes WITHOUT_HEADERS=yes #ADDITIONAL_DRIVERS="wcb1xxp"
GROUPS= dahdi
ONLY_FOR_ARCHS= i386 amd64 sparc64
-CONFLICTS= zaptel-[0-9]*
+CONFLICTS= zaptel-[0-9]* dahdi-kmod-*
.include <bsd.port.pre.mk>
@@ -55,7 +59,7 @@ IGNORE= requires firmware(9) support fo
.endif
.if !exists(${SRC_BASE}/sys/Makefile)
-IGNORE= requires kernel source present in ${SRC_BASE}/sys
+IGNORE= requires kernel source present in ${SRC_BASE}/sys
.endif
.if ${ARCH} == "i386" || ${ARCH} == "amd64"
@@ -73,9 +77,9 @@ DISTFILES+= ${${_f}_DISTFILE}:firmware
.endfor
post-extract:
- @${LN} -s ../../../linux-${OSLEC_VERSION}/drivers/staging ${WRKSRC}/drivers
+ @${LN} -s ../../linux-${OSLEC_VERSION}/drivers/staging ${WRKSRC}/drivers
.for _f in ${FIRMWARES}
- ${CP} ${DISTDIR}/${${_f}_DISTFILE} ${WRKSRC}/freebsd/${${_f}_DIR}
+ ${CP} ${DISTDIR}/${${_f}_DISTFILE} ${WRKSRC}/bsd-kmod/${${_f}_DIR}
.endfor
pre-su-install:
Modified: head/misc/dahdi-kmod26/distinfo
==============================================================================
--- head/misc/dahdi-kmod/distinfo Fri Aug 3 02:06:44 2012 (r301876)
+++ head/misc/dahdi-kmod26/distinfo Wed Aug 29 11:54:28 2012 (r303334)
@@ -1,5 +1,5 @@
-SHA256 (dahdi-freebsd-complete-2.4.0-rc5+2.4.0-rc1.tar.gz) = f364a13d10aa67ac26eb68babfcd4aa2a789f6ce074a923e20192f12fa02e3d2
-SIZE (dahdi-freebsd-complete-2.4.0-rc5+2.4.0-rc1.tar.gz) = 2049189
+SHA256 (dahdi-freebsd-2.6.1-r10709.tar.gz) = b51018937a725fa1a9fa693c5f1b06b37d4f75490c5c3ee6d90c8bdb4ed33a43
+SIZE (dahdi-freebsd-2.6.1-r10709.tar.gz) = 1764207
SHA256 (oslec-linux-2.6.35.4.tar.gz) = 01cfaa1ca64056c822d1a3ebf4f7b3c81127cd7b308ad5b0738ff4eb2026e261
SIZE (oslec-linux-2.6.35.4.tar.gz) = 12057
SHA256 (zaphfc-r5.tar.gz) = 7e809b62dcc2bd3caf2e5a882390051b881eb08d37fea1733d7fb55e80bc6756
@@ -8,9 +8,15 @@ SHA256 (dahdi-fw-oct6114-064-1.05.01.tar
SIZE (dahdi-fw-oct6114-064-1.05.01.tar.gz) = 165869
SHA256 (dahdi-fw-oct6114-128-1.05.01.tar.gz) = e1146749d205c41603b9b76852c3f8104dac233d0025d700db24504d10c99775
SIZE (dahdi-fw-oct6114-128-1.05.01.tar.gz) = 165849
+SHA256 (dahdi-fw-oct6114-256-1.05.01.tar.gz) = 5fe5036a2766cf0e8a968b0c58b700507d86e1cde9296ca437170cc626a9c79c
+SIZE (dahdi-fw-oct6114-256-1.05.01.tar.gz) = 171685
SHA256 (dahdi-fw-tc400m-MR6.12.tar.gz) = 11dd8d009809e41fc9a3a36766f59ff73d29075eede5b8724331d9a6e5259774
SIZE (dahdi-fw-tc400m-MR6.12.tar.gz) = 1750035
SHA256 (dahdi-fw-hx8-2.06.tar.gz) = 449ab3fd03d55d808e999efb7677cd04de202b92c9fcb039539a7e48a39a80f5
SIZE (dahdi-fw-hx8-2.06.tar.gz) = 29252
SHA256 (dahdi-fwload-vpmadt032-1.25.0.tar.gz) = 3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1
SIZE (dahdi-fwload-vpmadt032-1.25.0.tar.gz) = 149360
+SHA256 (dahdi-fw-vpmoct032-1.12.0.tar.gz) = 6b199cf836f150f9cb35f763f0f502fb52cfa2724a449b500429c746973904ad
+SIZE (dahdi-fw-vpmoct032-1.12.0.tar.gz) = 443985
+SHA256 (dahdi-fw-te820-1.76.tar.gz) = 5b823e25828e2c1c6548886ad408b2e31dbc8cd17170c52592792d9c754a199c
+SIZE (dahdi-fw-te820-1.76.tar.gz) = 54303
Added: head/misc/dahdi-kmod26/files/patch-drivers-staging-echo-echo.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/misc/dahdi-kmod26/files/patch-drivers-staging-echo-echo.c Wed Aug 29 11:54:28 2012 (r303334)
@@ -0,0 +1,7 @@
+--- drivers/staging/echo/echo.c.orig 2012-08-29 15:54:31.000000000 +0700
++++ drivers/staging/echo/echo.c 2012-08-29 15:54:42.000000000 +0700
+@@ -659,4 +659,3 @@
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("David Rowe");
+ MODULE_DESCRIPTION("Open Source Line Echo Canceller");
+-MODULE_VERSION("0.3.0");
Modified: head/misc/dahdi-kmod26/pkg-plist
==============================================================================
--- head/misc/dahdi-kmod/pkg-plist Fri Aug 3 02:06:44 2012 (r301876)
+++ head/misc/dahdi-kmod26/pkg-plist Wed Aug 29 11:54:28 2012 (r303334)
@@ -1,7 +1,9 @@
lib/dahdi/dahdi-fw-hx8.bin.ko
lib/dahdi/dahdi-fw-oct6114-064.bin.ko
lib/dahdi/dahdi-fw-oct6114-128.bin.ko
+lib/dahdi/dahdi-fw-oct6114-256.bin.ko
lib/dahdi/dahdi-fw-tc400m.bin.ko
+lib/dahdi/dahdi-fw-te820.bin.ko
lib/dahdi/dahdi.ko
lib/dahdi/dahdi_dynamic.ko
lib/dahdi/dahdi_dynamic_eth.ko
@@ -16,9 +18,9 @@ lib/dahdi/dahdi_echocan_sec2.ko
lib/dahdi/dahdi_transcode.ko
lib/dahdi/dahdi_voicebus.ko
%%X86%%lib/dahdi/dahdi_vpmadt032_loader.ko
+lib/dahdi/dahdi-fw-vpmoct032.bin.ko
lib/dahdi/linker.hints
lib/dahdi/ng_dahdi_netdev.ko
-lib/dahdi/wcb1xxp.ko
lib/dahdi/wcb4xxp.ko
lib/dahdi/wcfxo.ko
lib/dahdi/wct4xxp.ko
More information about the svn-ports-head
mailing list