public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/voip:master commit in: net-misc/dahdi/, net-misc/dahdi/files/
@ 2012-11-11 21:03 Sebastian Pipping
  0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2012-11-11 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     e5da7dbd6fbee2921f87cc4074b02af1d06ffe5d
Author:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 10:07:55 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 10:07:55 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/voip.git;a=commit;h=e5da7dbd

net-misc/dahdi-2.2.0.1 version bump

svn path=/trunk/; revision=875

---
 net-misc/dahdi/Manifest                            |    3 +
 net-misc/dahdi/dahdi-2.2.0.1.ebuild                |   58 ++++++++++++++++++++
 net-misc/dahdi/files/dahdi-2.2.0.1-no-depmod.patch |   12 ++++
 3 files changed, 73 insertions(+), 0 deletions(-)

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 736c417..f9cd447 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -1,9 +1,12 @@
 AUX dahdi-2.1.0.4-install.patch 393 RMD160 06ee39ed93a574edf59cd4dfe55c3694edc8360b SHA1 8b216987ef8c5f6da3e7c41f6f83b4ad68ff4f05 SHA256 a32c6931ee61078030912cb5dd98f22c408071eafdcd97b903220ce7ec696810
+AUX dahdi-2.2.0.1-no-depmod.patch 507 RMD160 5941623c084a213b88c26c1d74e6c4cebc6e93e1 SHA1 900a0c03173f0693aa80d885e2e3e8fe7c289a1f SHA256 b1ec75feafce557bb10dccbbb0d407e920394a8653672a9cc38f6f50d30eaa20
 DIST dahdi-fw-oct6114-064-1.05.01.tar.gz 165869 RMD160 bef97e3741c4d5b21d1e728a08984dc1f0431eb0 SHA1 2fb8e5f4f7aedb285ffa21632efd45af877eacd4 SHA256 56bac1f2024c76ecf9b6f40992eeea29a1fbee676bb2a37a058179bacfbb1c91
 DIST dahdi-fw-oct6114-128-1.05.01.tar.gz 165849 RMD160 3c31b6d4ab7d3455eda75e42f5447880ea491b71 SHA1 bcf07434f4589d07d9b5f67f7b3a8fb115aa9229 SHA256 e1146749d205c41603b9b76852c3f8104dac233d0025d700db24504d10c99775
 DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 RMD160 8181ffd4bc861122c338e1eb2748e797210f3150 SHA1 9206abda4c9cf192e8cae7e707f2e4e65beb8f87 SHA256 11dd8d009809e41fc9a3a36766f59ff73d29075eede5b8724331d9a6e5259774
 DIST dahdi-fw-vpmadt032-1.07.tar.gz 41376 RMD160 33dfc6da198065a33de516bdd2e4185bb7355e75 SHA1 fd470e7aec0db62e3750aa4819ff03b70c6e9977 SHA256 f566cc82203bc3a49f4850ac08dec613d1a2eeda437482e1d0c2da1e9e8bb68e
 DIST dahdi-linux-2.1.0.4.tar.gz 1251822 RMD160 746a6b266e51003726046582bdbfcca2f6d11194 SHA1 e5fa4220b995b2841f1658e29fe710a649b1bd9c SHA256 42fde494ed205026037f6164f9112a7a7cac55adc8f8a535e3867ca83ae8c239
+DIST dahdi-linux-2.2.0.1.tar.gz 1386444 RMD160 cc5d9664666b1a639bc5df362ec25ce9a785569c SHA1 f361ab666edecbeef440e5d113e86197014ace94 SHA256 954d3287cda8e2fb11d3a964c8cf0556b3449f956f39ee07752e819fc14f89b1
 EBUILD dahdi-2.1.0.4.ebuild 3575 RMD160 ed2a199b68182d56b2b3a1baa1cc21750aed929b SHA1 1b8fa535d62f618c3aa2f6d9a6f8e6fa33280cb7 SHA256 68c456b6235210bd00f7d712973557cc8a171c2ef05b9982406755959c684405
+EBUILD dahdi-2.2.0.1.ebuild 1906 RMD160 9e5b3830fb650b4634c808acf27c02c0274d37c3 SHA1 b5bf03f090cbbdf0e7f290a933ca90502769f144 SHA256 2ad152c96b85445ea52976c58ae16bdd90ebee499d8fc18370103c2d8479b9af
 MISC ChangeLog 1133 RMD160 0d0fbfc4e5d180072873135a8189f552f5c11bdc SHA1 593e48fc2af0a844bc7f8805ff6f8ec95d0139f5 SHA256 b446454deac72204543306e94242aa235a0c05ac4681cf6bfcde44cbe7fabef2
 MISC metadata.xml 139 RMD160 c84b2b78f85074cc5c7d26cb757d91c8384fa16a SHA1 00e3ae2ead875413d94aeafa5279646740c2c21d SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed

diff --git a/net-misc/dahdi/dahdi-2.2.0.1.ebuild b/net-misc/dahdi/dahdi-2.2.0.1.ebuild
new file mode 100644
index 0000000..344d18e
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.2.0.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.1.0.4.ebuild,v 1.1 2009/03/10 16:32:11 chainsaw Exp $
+
+inherit linux-mod eutils flag-o-matic
+
+MY_P="${P/dahdi/dahdi-linux}"
+MY_S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)."
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmadt032-1.07.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix udev rules to work with both asterisk and callweaver
+	sed -i 's/GROUP="asterisk"/GROUP="dialout"/' "${MY_S}"/build_tools/genudevrules
+
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
+
+	epatch "${FILESDIR}"/${P}-no-depmod.patch
+
+}
+
+src_compile() {
+	cd "${MY_P}"
+	unset ARCH
+	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" modules || die "failed to build module"
+}
+
+src_install() {
+	cd "${MY_P}"
+
+	# setup directory structure so udev rules get installed
+	mkdir -p "${D}"/etc/udev/rules.d
+
+	einfo "Installing kernel module"
+	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" install || die "failed to install module"
+	rm -rf "$D"/lib/modules/*/modules.*
+}

diff --git a/net-misc/dahdi/files/dahdi-2.2.0.1-no-depmod.patch b/net-misc/dahdi/files/dahdi-2.2.0.1-no-depmod.patch
new file mode 100644
index 0000000..928beee
--- /dev/null
+++ b/net-misc/dahdi/files/dahdi-2.2.0.1-no-depmod.patch
@@ -0,0 +1,12 @@
+diff -uNr dahdi-linux-2.2.0.1.ORIG/Makefile dahdi-linux-2.1.0.4/Makefile
+--- dahdi-linux-2.2.0.1.ORIG/Makefile	2009-03-10 15:53:36.000000000 +0000
++++ dahdi-linux-2.2.0.1/Makefile	2009-03-10 15:53:59.000000000 +0000
+@@ -191,7 +191,7 @@
+ 	build_tools/uninstall-modules dahdi $(KVERS)
+ endif
+ 	$(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
+-	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
++#	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
+ 
+ uninstall-modules:
+ ifdef DESTDIR


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] proj/voip:master commit in: net-misc/dahdi/, net-misc/dahdi/files/
@ 2012-11-11 21:03 Sebastian Pipping
  0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2012-11-11 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     9aebe0b3dc03916e530db705e949828c46435e21
Author:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 18:23:37 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 18:23:37 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/voip.git;a=commit;h=9aebe0b3

net-misc/dahdi: in portage

svn path=/trunk/; revision=882

---
 net-misc/dahdi/ChangeLog                           |   31 -----
 net-misc/dahdi/Manifest                            |   16 ---
 net-misc/dahdi/dahdi-2.1.0.4.ebuild                |  118 --------------------
 net-misc/dahdi/dahdi-2.2.0.1.ebuild                |   58 ----------
 net-misc/dahdi/dahdi-2.2.0.2.ebuild                |   61 ----------
 net-misc/dahdi/files/dahdi-2.1.0.4-install.patch   |   11 --
 net-misc/dahdi/files/dahdi-2.2.0.1-no-depmod.patch |   12 --
 net-misc/dahdi/files/dahdi-2.2.0.2-no-depmod.patch |   12 --
 .../dahdi-2.2.0.2-wctc4xxp-net-device-ops.patch    |   42 -------
 net-misc/dahdi/metadata.xml                        |    4 -
 10 files changed, 0 insertions(+), 365 deletions(-)

diff --git a/net-misc/dahdi/ChangeLog b/net-misc/dahdi/ChangeLog
deleted file mode 100644
index 370d20a..0000000
--- a/net-misc/dahdi/ChangeLog
+++ /dev/null
@@ -1,31 +0,0 @@
-# ChangeLog for net-misc/dahdi
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  03 Mar 2009; Sven Schwyn (svoop) <gentoo@bitcetera.com>
-  -files/dahdi-2.1.0.3-install.patch, ++, ++, -dahdi-2.1.0.ebuild,
-  -dahdi-2.1.0.3.ebuild:
-  Version bump
-
-  19 Dec 2008; Rambaldi <rambaldi@xs4all.nl>
-  -files/dahdi-2.1.0-install.patch, ++, ++, -dahdi-2.1.0-r1.ebuild:
-  net-misc/dahdi: version bump
-
-  13 Dec 2008; Svoop <gentoo@bitcetera.com>
-  +dahdi-2.1.0-r1.ebuild: add support for HPEC echo cancellation and
-  change udev rules to set dahdi devices group to dialout
-
-  10 Dec 2008; Rambaldi <rambaldi@xs4all.nl>
-  -files/dahdi-2.0.0-install.patch, ++, ++, -dahdi-2.0.0.ebuild:
-  net-misc/dahdi: version bump
-
-  08 Nov 2008; Rambaldi <rambaldi@xs4all.nl> dahdi-2.0.0.ebuild:
-  install dahdi udev rules
-
-  08 Nov 2008; Rambaldi <rambaldi@xs4all.nl> dahdi-2.0.0.ebuild:
-  added ~x86 keywords, thanks Jaco Kroon
-
-  05 Oct 2008; Rambaldi <rambaldi@xs4all.nl>
-  +files/dahdi-2.0.0-install.patch, +metadata.xml, +dahdi-2.0.0.ebuild:
-  net-misc/dahdi-2.0.0: inital ebuild version, most likely very broken ...
-

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
deleted file mode 100644
index 2933185..0000000
--- a/net-misc/dahdi/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX dahdi-2.1.0.4-install.patch 393 RMD160 06ee39ed93a574edf59cd4dfe55c3694edc8360b SHA1 8b216987ef8c5f6da3e7c41f6f83b4ad68ff4f05 SHA256 a32c6931ee61078030912cb5dd98f22c408071eafdcd97b903220ce7ec696810
-AUX dahdi-2.2.0.1-no-depmod.patch 507 RMD160 5941623c084a213b88c26c1d74e6c4cebc6e93e1 SHA1 900a0c03173f0693aa80d885e2e3e8fe7c289a1f SHA256 b1ec75feafce557bb10dccbbb0d407e920394a8653672a9cc38f6f50d30eaa20
-AUX dahdi-2.2.0.2-no-depmod.patch 507 RMD160 8df4fe534c4d0e45bd238660242597707050d1ed SHA1 dc367b222e67de506d52eabb3f8c01dbe4898370 SHA256 2527375ff4691d484c6eb5638686ca87b6fe831b4c919d74f1ea8f95873429b3
-AUX dahdi-2.2.0.2-wctc4xxp-net-device-ops.patch 1318 RMD160 7346306d427bfb47823d831328c3731fe374055c SHA1 4664d990a1b96ccbb7e6bd09db1f59da60cc72e9 SHA256 075efd926545085c00730761f70c3edbd1f45c5cc860721f472a56e2faa79060
-DIST dahdi-fw-oct6114-064-1.05.01.tar.gz 165869 RMD160 bef97e3741c4d5b21d1e728a08984dc1f0431eb0 SHA1 2fb8e5f4f7aedb285ffa21632efd45af877eacd4 SHA256 56bac1f2024c76ecf9b6f40992eeea29a1fbee676bb2a37a058179bacfbb1c91
-DIST dahdi-fw-oct6114-128-1.05.01.tar.gz 165849 RMD160 3c31b6d4ab7d3455eda75e42f5447880ea491b71 SHA1 bcf07434f4589d07d9b5f67f7b3a8fb115aa9229 SHA256 e1146749d205c41603b9b76852c3f8104dac233d0025d700db24504d10c99775
-DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 RMD160 8181ffd4bc861122c338e1eb2748e797210f3150 SHA1 9206abda4c9cf192e8cae7e707f2e4e65beb8f87 SHA256 11dd8d009809e41fc9a3a36766f59ff73d29075eede5b8724331d9a6e5259774
-DIST dahdi-fw-vpmadt032-1.07.tar.gz 41376 RMD160 33dfc6da198065a33de516bdd2e4185bb7355e75 SHA1 fd470e7aec0db62e3750aa4819ff03b70c6e9977 SHA256 f566cc82203bc3a49f4850ac08dec613d1a2eeda437482e1d0c2da1e9e8bb68e
-DIST dahdi-linux-2.1.0.4.tar.gz 1251822 RMD160 746a6b266e51003726046582bdbfcca2f6d11194 SHA1 e5fa4220b995b2841f1658e29fe710a649b1bd9c SHA256 42fde494ed205026037f6164f9112a7a7cac55adc8f8a535e3867ca83ae8c239
-DIST dahdi-linux-2.2.0.1.tar.gz 1386444 RMD160 cc5d9664666b1a639bc5df362ec25ce9a785569c SHA1 f361ab666edecbeef440e5d113e86197014ace94 SHA256 954d3287cda8e2fb11d3a964c8cf0556b3449f956f39ee07752e819fc14f89b1
-DIST dahdi-linux-2.2.0.2.tar.gz 1387811 RMD160 2fec5a75bb9be328d5de4a9282355490c787d266 SHA1 58a5244ee589d50cd3add601f6867cc82ee2e7cd SHA256 55da659f6acd5f706c0eaf74be8ed3d7fa3a5b1337954b5b663633e1300e4593
-EBUILD dahdi-2.1.0.4.ebuild 3575 RMD160 ed2a199b68182d56b2b3a1baa1cc21750aed929b SHA1 1b8fa535d62f618c3aa2f6d9a6f8e6fa33280cb7 SHA256 68c456b6235210bd00f7d712973557cc8a171c2ef05b9982406755959c684405
-EBUILD dahdi-2.2.0.1.ebuild 1906 RMD160 9e5b3830fb650b4634c808acf27c02c0274d37c3 SHA1 b5bf03f090cbbdf0e7f290a933ca90502769f144 SHA256 2ad152c96b85445ea52976c58ae16bdd90ebee499d8fc18370103c2d8479b9af
-EBUILD dahdi-2.2.0.2.ebuild 2013 RMD160 f367bd95ee0c8a3918daac06f8a64b1246afef0e SHA1 31ef72e66b5e1f33d1d35294657bf9749ee5064b SHA256 e6cd1f164285b5d1678a57afdb91537d4b3bd7c8700f394fd3ea32ffd50b573d
-MISC ChangeLog 1133 RMD160 0d0fbfc4e5d180072873135a8189f552f5c11bdc SHA1 593e48fc2af0a844bc7f8805ff6f8ec95d0139f5 SHA256 b446454deac72204543306e94242aa235a0c05ac4681cf6bfcde44cbe7fabef2
-MISC metadata.xml 139 RMD160 c84b2b78f85074cc5c7d26cb757d91c8384fa16a SHA1 00e3ae2ead875413d94aeafa5279646740c2c21d SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed

diff --git a/net-misc/dahdi/dahdi-2.1.0.4.ebuild b/net-misc/dahdi/dahdi-2.1.0.4.ebuild
deleted file mode 100644
index 7931dc6..0000000
--- a/net-misc/dahdi/dahdi-2.1.0.4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit linux-mod eutils flag-o-matic
-
-HPEC_VERSION="9.00.007"
-
-MY_P="${P/dahdi/dahdi-linux}"
-MY_S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)."
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmadt032-1.07.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="echpec"
-
-DEPEND=""
-RDEPEND=""
-
-QA_EXECSTACK="opt/bin/dahdihpec_register opt/bin/dahdihpec_enable"
-
-hpec_detect() {
-	if [ "$(tc-arch)" == "x86" ]; then
-		HPEC_ARCH="32"
-		HPEC_CPU="i386"
-		return
-	fi	
-	if [ "$(tc-arch)" == "amd64" ]; then
-		HPEC_ARCH="64"
-		HPEC_CPU="opteron"
-		if grep -q "GenuineIntel" /proc/cpuinfo; then HPEC_CPU="nocona"; fi
-		return
-	fi
-	die "HPEC is not available for your architecture, please remove the 'echpec' USE flag and retry."
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# fix udev rules to work with both asterisk and callweaver
-	sed -i 's/GROUP="asterisk"/GROUP="dialout"/' "${MY_S}"/build_tools/genudevrules
-
-	# copy the firmware files to the correct location
-	for file in ${A} ; do
-		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
-	done
-	cp *bin "${MY_P}"/drivers/dahdi/firmware/
-
-	cd "${MY_P}"
-	epatch "${FILESDIR}"/${P}-install.patch
-
-	# prepare hpec
-	if use echpec; then
-		elog "Support for commercial HPEC echo canceller."
-		hpec_detect
-		cd "${MY_S}"/drivers/dahdi/hpec
-		wget -O hpec.tgz \
-			"http://downloads.digium.com/pub/telephony/hpec/${HPEC_ARCH}-bit/hpec-${HPEC_VERSION}-${HPEC_CPU}.tar.gz" \
-			|| die "HPEC download failed"
-		tar xzf hpec.tgz
-	fi
-}
-
-src_compile() {
-	cd "${MY_P}"
-	unset ARCH
-	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" modules || die "failed to build module"
-
-	# download hpec utils
-	if use echpec; then
-		cd "${S}"
-		wget -O dahdihpec_register "http://downloads.digium.com/pub/register/x86-${HPEC_ARCH}/register"
-		wget -O dahdihpec_enable "http://downloads.digium.com/pub/telephony/hpec/${HPEC_ARCH}-bit/dahdihpec_enable"
-	fi
-}
-
-src_install() {
-	cd "${MY_P}"
-
-	# setup directory structure so udev rules get installed
-	mkdir -p "${D}"/etc/udev/rules.d
-
-	einfo "Installing kernel module"
-	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" install || die "failed to install module"
-	rm -rf "$D"/lib/modules/*/modules.*
-
-	# install hpec utils
-	if use echpec; then
-		cd "${S}"
-		diropts -o root -g root -m 0744
-		dodir /opt/bin
-		insinto /opt/bin
-		insopts -o root -g root -m 0700	
-		doins dahdihpec_register || die "installing dahdihpec_register failed"
-		doins dahdihpec_enable || die "installing dahdihpec_enable failed"
-	fi
-}
-
-src_postinst() {
-	# instructions for hpec
-	if use echpec; then
-		elog "HPEC is a commercial echo canceller. If you have purchased telephony"
-		elog "hardware from Digium, you might be eligible for a free HPEC license:"
-		elog "http://www.digium.com/en/products/software/hpec.php"
-		elog ""
-		elog "HPEC has to be registered once with 'dahdihpec_register' and then enabled"
-		elog "with 'dahdihpec_enable' every time the DAHDI drivers are loaded. The DAHDI"
-		elog "init script does so implicitly."
-	fi
-}

diff --git a/net-misc/dahdi/dahdi-2.2.0.1.ebuild b/net-misc/dahdi/dahdi-2.2.0.1.ebuild
deleted file mode 100644
index 344d18e..0000000
--- a/net-misc/dahdi/dahdi-2.2.0.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.1.0.4.ebuild,v 1.1 2009/03/10 16:32:11 chainsaw Exp $
-
-inherit linux-mod eutils flag-o-matic
-
-MY_P="${P/dahdi/dahdi-linux}"
-MY_S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)."
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmadt032-1.07.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	# Fix udev rules to work with both asterisk and callweaver
-	sed -i 's/GROUP="asterisk"/GROUP="dialout"/' "${MY_S}"/build_tools/genudevrules
-
-	# Copy the firmware tarballs over, the makefile will try and download them otherwise
-	for file in ${A} ; do
-		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
-	done
-	# But without the .bin's it'll still fall over and die, so copy those too.
-	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
-
-	epatch "${FILESDIR}"/${P}-no-depmod.patch
-
-}
-
-src_compile() {
-	cd "${MY_P}"
-	unset ARCH
-	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" modules || die "failed to build module"
-}
-
-src_install() {
-	cd "${MY_P}"
-
-	# setup directory structure so udev rules get installed
-	mkdir -p "${D}"/etc/udev/rules.d
-
-	einfo "Installing kernel module"
-	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" install || die "failed to install module"
-	rm -rf "$D"/lib/modules/*/modules.*
-}

diff --git a/net-misc/dahdi/dahdi-2.2.0.2.ebuild b/net-misc/dahdi/dahdi-2.2.0.2.ebuild
deleted file mode 100644
index f3a67ed..0000000
--- a/net-misc/dahdi/dahdi-2.2.0.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.1.0.4.ebuild,v 1.1 2009/03/10 16:32:11 chainsaw Exp $
-
-inherit linux-mod eutils flag-o-matic
-
-MY_P="${P/dahdi/dahdi-linux}"
-MY_S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)."
-HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
-http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmadt032-1.07.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	# Fix udev rules to work with both asterisk and callweaver
-	sed -i 's/GROUP="asterisk"/GROUP="dialout"/' "${MY_S}"/build_tools/genudevrules
-
-	# Copy the firmware tarballs over, the makefile will try and download them otherwise
-	for file in ${A} ; do
-		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
-	done
-	# But without the .bin's it'll still fall over and die, so copy those too.
-	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
-
-	epatch "${FILESDIR}"/${P}-no-depmod.patch
-
-	# https://issues.asterisk.org/view.php?id=15747
-	epatch "${FILESDIR}"/${P}-wctc4xxp-net-device-ops.patch
-
-}
-
-src_compile() {
-	cd "${MY_P}"
-	unset ARCH
-	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" modules || die "failed to build module"
-}
-
-src_install() {
-	cd "${MY_P}"
-
-	# setup directory structure so udev rules get installed
-	mkdir -p "${D}"/etc/udev/rules.d
-
-	einfo "Installing kernel module"
-	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" install || die "failed to install module"
-	rm -rf "$D"/lib/modules/*/modules.*
-}

diff --git a/net-misc/dahdi/files/dahdi-2.1.0.4-install.patch b/net-misc/dahdi/files/dahdi-2.1.0.4-install.patch
deleted file mode 100644
index e788766..0000000
--- a/net-misc/dahdi/files/dahdi-2.1.0.4-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.org	2008-10-05 17:43:24.000000000 +0200
-+++ Makefile	2008-10-05 17:43:37.000000000 +0200
-@@ -191,7 +191,7 @@
- 	build_tools/uninstall-modules dahdi $(KVERS)
- endif
- 	$(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-+#	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 
- uninstall-modules:
- ifdef DESTDIR

diff --git a/net-misc/dahdi/files/dahdi-2.2.0.1-no-depmod.patch b/net-misc/dahdi/files/dahdi-2.2.0.1-no-depmod.patch
deleted file mode 100644
index 928beee..0000000
--- a/net-misc/dahdi/files/dahdi-2.2.0.1-no-depmod.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr dahdi-linux-2.2.0.1.ORIG/Makefile dahdi-linux-2.1.0.4/Makefile
---- dahdi-linux-2.2.0.1.ORIG/Makefile	2009-03-10 15:53:36.000000000 +0000
-+++ dahdi-linux-2.2.0.1/Makefile	2009-03-10 15:53:59.000000000 +0000
-@@ -191,7 +191,7 @@
- 	build_tools/uninstall-modules dahdi $(KVERS)
- endif
- 	$(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-+#	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 
- uninstall-modules:
- ifdef DESTDIR

diff --git a/net-misc/dahdi/files/dahdi-2.2.0.2-no-depmod.patch b/net-misc/dahdi/files/dahdi-2.2.0.2-no-depmod.patch
deleted file mode 100644
index b87b28c..0000000
--- a/net-misc/dahdi/files/dahdi-2.2.0.2-no-depmod.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr dahdi-linux-2.2.0.2.ORIG/Makefile dahdi-linux-2.2.0.2/Makefile
---- dahdi-linux-2.2.0.2.ORIG/Makefile	2009-03-10 15:53:36.000000000 +0000
-+++ dahdi-linux-2.2.0.2/Makefile	2009-03-10 15:53:59.000000000 +0000
-@@ -191,7 +191,7 @@
- 	build_tools/uninstall-modules dahdi $(KVERS)
- endif
- 	$(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
--	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
-+#	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
- 
- uninstall-modules:
- ifdef DESTDIR

diff --git a/net-misc/dahdi/files/dahdi-2.2.0.2-wctc4xxp-net-device-ops.patch b/net-misc/dahdi/files/dahdi-2.2.0.2-wctc4xxp-net-device-ops.patch
deleted file mode 100644
index a8f0a1e..0000000
--- a/net-misc/dahdi/files/dahdi-2.2.0.2-wctc4xxp-net-device-ops.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- dahdi-linux-2.2.0.2/drivers/dahdi/wctc4xxp/base.c	2009/08/04 16:30:11	6936
-+++ dahdi-linux-2.2.0.2/drivers/dahdi/wctc4xxp/base.c	2009/08/04 16:38:56	6937
-@@ -742,6 +742,17 @@
- 	return 0;
- }
- 
-+#ifdef HAVE_NET_DEVICE_OPS
-+static const struct net_device_ops wctc4xxp_netdev_ops = {
-+	.ndo_set_multicast_list = &wctc4xxp_net_set_multi,
-+	.ndo_open = &wctc4xxp_net_up,
-+	.ndo_stop = &wctc4xxp_net_down,
-+	.ndo_start_xmit = &wctc4xxp_net_hard_start_xmit,
-+	.ndo_get_stats = &wctc4xxp_net_get_stats,
-+	.ndo_do_ioctl = &wctc4xxp_net_ioctl,
-+};
-+#endif
-+
- /**
-  * wctc4xxp_net_register - Register a new network interface.
-  * @wc: transcoder card to register the interface for.
-@@ -773,14 +784,21 @@
- 	netdev->priv = wc;
- #	endif
- 	memcpy(netdev->dev_addr, our_mac, sizeof(our_mac));
-+
-+#	ifdef HAVE_NET_DEVICE_OPS
-+	netdev->netdev_ops = &wctc4xxp_netdev_ops;
-+#	else
- 	netdev->set_multicast_list = &wctc4xxp_net_set_multi;
- 	netdev->open = &wctc4xxp_net_up;
- 	netdev->stop = &wctc4xxp_net_down;
- 	netdev->hard_start_xmit = &wctc4xxp_net_hard_start_xmit;
- 	netdev->get_stats = &wctc4xxp_net_get_stats;
- 	netdev->do_ioctl = &wctc4xxp_net_ioctl;
-+#	endif
-+
- 	netdev->promiscuity = 0;
- 	netdev->flags |= IFF_NOARP;
-+
- #	if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
- 	netdev->poll = &wctc4xxp_poll;
- 	netdev->weight = 64;

diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml
deleted file mode 100644
index 097975e..0000000
--- a/net-misc/dahdi/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] proj/voip:master commit in: net-misc/dahdi/, net-misc/dahdi/files/
@ 2012-11-11 21:03 Sebastian Pipping
  0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2012-11-11 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     62022ad2caa287de1aa34ce0d6aacac942f5e43a
Author:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 16:05:12 2009 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 16:05:12 2009 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/voip.git;a=commit;h=62022ad2

net-misc/dahdi-2.2.0.2 version bump, fix building with kernel 2.6.31

svn path=/trunk/; revision=881

---
 net-misc/dahdi/Manifest                            |    4 +
 net-misc/dahdi/dahdi-2.2.0.2.ebuild                |   61 ++++++++++++++++++++
 net-misc/dahdi/files/dahdi-2.2.0.2-no-depmod.patch |   12 ++++
 .../dahdi-2.2.0.2-wctc4xxp-net-device-ops.patch    |   42 +++++++++++++
 4 files changed, 119 insertions(+), 0 deletions(-)

diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index f9cd447..2933185 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -1,12 +1,16 @@
 AUX dahdi-2.1.0.4-install.patch 393 RMD160 06ee39ed93a574edf59cd4dfe55c3694edc8360b SHA1 8b216987ef8c5f6da3e7c41f6f83b4ad68ff4f05 SHA256 a32c6931ee61078030912cb5dd98f22c408071eafdcd97b903220ce7ec696810
 AUX dahdi-2.2.0.1-no-depmod.patch 507 RMD160 5941623c084a213b88c26c1d74e6c4cebc6e93e1 SHA1 900a0c03173f0693aa80d885e2e3e8fe7c289a1f SHA256 b1ec75feafce557bb10dccbbb0d407e920394a8653672a9cc38f6f50d30eaa20
+AUX dahdi-2.2.0.2-no-depmod.patch 507 RMD160 8df4fe534c4d0e45bd238660242597707050d1ed SHA1 dc367b222e67de506d52eabb3f8c01dbe4898370 SHA256 2527375ff4691d484c6eb5638686ca87b6fe831b4c919d74f1ea8f95873429b3
+AUX dahdi-2.2.0.2-wctc4xxp-net-device-ops.patch 1318 RMD160 7346306d427bfb47823d831328c3731fe374055c SHA1 4664d990a1b96ccbb7e6bd09db1f59da60cc72e9 SHA256 075efd926545085c00730761f70c3edbd1f45c5cc860721f472a56e2faa79060
 DIST dahdi-fw-oct6114-064-1.05.01.tar.gz 165869 RMD160 bef97e3741c4d5b21d1e728a08984dc1f0431eb0 SHA1 2fb8e5f4f7aedb285ffa21632efd45af877eacd4 SHA256 56bac1f2024c76ecf9b6f40992eeea29a1fbee676bb2a37a058179bacfbb1c91
 DIST dahdi-fw-oct6114-128-1.05.01.tar.gz 165849 RMD160 3c31b6d4ab7d3455eda75e42f5447880ea491b71 SHA1 bcf07434f4589d07d9b5f67f7b3a8fb115aa9229 SHA256 e1146749d205c41603b9b76852c3f8104dac233d0025d700db24504d10c99775
 DIST dahdi-fw-tc400m-MR6.12.tar.gz 1750035 RMD160 8181ffd4bc861122c338e1eb2748e797210f3150 SHA1 9206abda4c9cf192e8cae7e707f2e4e65beb8f87 SHA256 11dd8d009809e41fc9a3a36766f59ff73d29075eede5b8724331d9a6e5259774
 DIST dahdi-fw-vpmadt032-1.07.tar.gz 41376 RMD160 33dfc6da198065a33de516bdd2e4185bb7355e75 SHA1 fd470e7aec0db62e3750aa4819ff03b70c6e9977 SHA256 f566cc82203bc3a49f4850ac08dec613d1a2eeda437482e1d0c2da1e9e8bb68e
 DIST dahdi-linux-2.1.0.4.tar.gz 1251822 RMD160 746a6b266e51003726046582bdbfcca2f6d11194 SHA1 e5fa4220b995b2841f1658e29fe710a649b1bd9c SHA256 42fde494ed205026037f6164f9112a7a7cac55adc8f8a535e3867ca83ae8c239
 DIST dahdi-linux-2.2.0.1.tar.gz 1386444 RMD160 cc5d9664666b1a639bc5df362ec25ce9a785569c SHA1 f361ab666edecbeef440e5d113e86197014ace94 SHA256 954d3287cda8e2fb11d3a964c8cf0556b3449f956f39ee07752e819fc14f89b1
+DIST dahdi-linux-2.2.0.2.tar.gz 1387811 RMD160 2fec5a75bb9be328d5de4a9282355490c787d266 SHA1 58a5244ee589d50cd3add601f6867cc82ee2e7cd SHA256 55da659f6acd5f706c0eaf74be8ed3d7fa3a5b1337954b5b663633e1300e4593
 EBUILD dahdi-2.1.0.4.ebuild 3575 RMD160 ed2a199b68182d56b2b3a1baa1cc21750aed929b SHA1 1b8fa535d62f618c3aa2f6d9a6f8e6fa33280cb7 SHA256 68c456b6235210bd00f7d712973557cc8a171c2ef05b9982406755959c684405
 EBUILD dahdi-2.2.0.1.ebuild 1906 RMD160 9e5b3830fb650b4634c808acf27c02c0274d37c3 SHA1 b5bf03f090cbbdf0e7f290a933ca90502769f144 SHA256 2ad152c96b85445ea52976c58ae16bdd90ebee499d8fc18370103c2d8479b9af
+EBUILD dahdi-2.2.0.2.ebuild 2013 RMD160 f367bd95ee0c8a3918daac06f8a64b1246afef0e SHA1 31ef72e66b5e1f33d1d35294657bf9749ee5064b SHA256 e6cd1f164285b5d1678a57afdb91537d4b3bd7c8700f394fd3ea32ffd50b573d
 MISC ChangeLog 1133 RMD160 0d0fbfc4e5d180072873135a8189f552f5c11bdc SHA1 593e48fc2af0a844bc7f8805ff6f8ec95d0139f5 SHA256 b446454deac72204543306e94242aa235a0c05ac4681cf6bfcde44cbe7fabef2
 MISC metadata.xml 139 RMD160 c84b2b78f85074cc5c7d26cb757d91c8384fa16a SHA1 00e3ae2ead875413d94aeafa5279646740c2c21d SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed

diff --git a/net-misc/dahdi/dahdi-2.2.0.2.ebuild b/net-misc/dahdi/dahdi-2.2.0.2.ebuild
new file mode 100644
index 0000000..f3a67ed
--- /dev/null
+++ b/net-misc/dahdi/dahdi-2.2.0.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.1.0.4.ebuild,v 1.1 2009/03/10 16:32:11 chainsaw Exp $
+
+inherit linux-mod eutils flag-o-matic
+
+MY_P="${P/dahdi/dahdi-linux}"
+MY_S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)."
+HOMEPAGE="http://www.asterisk.org"
+SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz
+http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmadt032-1.07.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix udev rules to work with both asterisk and callweaver
+	sed -i 's/GROUP="asterisk"/GROUP="dialout"/' "${MY_S}"/build_tools/genudevrules
+
+	# Copy the firmware tarballs over, the makefile will try and download them otherwise
+	for file in ${A} ; do
+		cp "${DISTDIR}"/${file} "${MY_P}"/drivers/dahdi/firmware/
+	done
+	# But without the .bin's it'll still fall over and die, so copy those too.
+	cp *.bin "${MY_P}"/drivers/dahdi/firmware/
+
+	epatch "${FILESDIR}"/${P}-no-depmod.patch
+
+	# https://issues.asterisk.org/view.php?id=15747
+	epatch "${FILESDIR}"/${P}-wctc4xxp-net-device-ops.patch
+
+}
+
+src_compile() {
+	cd "${MY_P}"
+	unset ARCH
+	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" modules || die "failed to build module"
+}
+
+src_install() {
+	cd "${MY_P}"
+
+	# setup directory structure so udev rules get installed
+	mkdir -p "${D}"/etc/udev/rules.d
+
+	einfo "Installing kernel module"
+	emake KSRC="${KERNEL_DIR}" DESTDIR="${D}" install || die "failed to install module"
+	rm -rf "$D"/lib/modules/*/modules.*
+}

diff --git a/net-misc/dahdi/files/dahdi-2.2.0.2-no-depmod.patch b/net-misc/dahdi/files/dahdi-2.2.0.2-no-depmod.patch
new file mode 100644
index 0000000..b87b28c
--- /dev/null
+++ b/net-misc/dahdi/files/dahdi-2.2.0.2-no-depmod.patch
@@ -0,0 +1,12 @@
+diff -uNr dahdi-linux-2.2.0.2.ORIG/Makefile dahdi-linux-2.2.0.2/Makefile
+--- dahdi-linux-2.2.0.2.ORIG/Makefile	2009-03-10 15:53:36.000000000 +0000
++++ dahdi-linux-2.2.0.2/Makefile	2009-03-10 15:53:59.000000000 +0000
+@@ -191,7 +191,7 @@
+ 	build_tools/uninstall-modules dahdi $(KVERS)
+ endif
+ 	$(KMAKE) INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=dahdi modules_install
+-	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
++#	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
+ 
+ uninstall-modules:
+ ifdef DESTDIR

diff --git a/net-misc/dahdi/files/dahdi-2.2.0.2-wctc4xxp-net-device-ops.patch b/net-misc/dahdi/files/dahdi-2.2.0.2-wctc4xxp-net-device-ops.patch
new file mode 100644
index 0000000..a8f0a1e
--- /dev/null
+++ b/net-misc/dahdi/files/dahdi-2.2.0.2-wctc4xxp-net-device-ops.patch
@@ -0,0 +1,42 @@
+--- dahdi-linux-2.2.0.2/drivers/dahdi/wctc4xxp/base.c	2009/08/04 16:30:11	6936
++++ dahdi-linux-2.2.0.2/drivers/dahdi/wctc4xxp/base.c	2009/08/04 16:38:56	6937
+@@ -742,6 +742,17 @@
+ 	return 0;
+ }
+ 
++#ifdef HAVE_NET_DEVICE_OPS
++static const struct net_device_ops wctc4xxp_netdev_ops = {
++	.ndo_set_multicast_list = &wctc4xxp_net_set_multi,
++	.ndo_open = &wctc4xxp_net_up,
++	.ndo_stop = &wctc4xxp_net_down,
++	.ndo_start_xmit = &wctc4xxp_net_hard_start_xmit,
++	.ndo_get_stats = &wctc4xxp_net_get_stats,
++	.ndo_do_ioctl = &wctc4xxp_net_ioctl,
++};
++#endif
++
+ /**
+  * wctc4xxp_net_register - Register a new network interface.
+  * @wc: transcoder card to register the interface for.
+@@ -773,14 +784,21 @@
+ 	netdev->priv = wc;
+ #	endif
+ 	memcpy(netdev->dev_addr, our_mac, sizeof(our_mac));
++
++#	ifdef HAVE_NET_DEVICE_OPS
++	netdev->netdev_ops = &wctc4xxp_netdev_ops;
++#	else
+ 	netdev->set_multicast_list = &wctc4xxp_net_set_multi;
+ 	netdev->open = &wctc4xxp_net_up;
+ 	netdev->stop = &wctc4xxp_net_down;
+ 	netdev->hard_start_xmit = &wctc4xxp_net_hard_start_xmit;
+ 	netdev->get_stats = &wctc4xxp_net_get_stats;
+ 	netdev->do_ioctl = &wctc4xxp_net_ioctl;
++#	endif
++
+ 	netdev->promiscuity = 0;
+ 	netdev->flags |= IFF_NOARP;
++
+ #	if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
+ 	netdev->poll = &wctc4xxp_poll;
+ 	netdev->weight = 64;


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-11 21:05 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-11 21:03 [gentoo-commits] proj/voip:master commit in: net-misc/dahdi/, net-misc/dahdi/files/ Sebastian Pipping
  -- strict thread matches above, loose matches on Subject: below --
2012-11-11 21:03 Sebastian Pipping
2012-11-11 21:03 Sebastian Pipping

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox