chainsaw 14/07/18 18:44:16 Modified: ChangeLog Added: dahdi-2.9.0-r1.ebuild Log: The pciradio.c file still used interruptible_sleep_on_timeout, which is no longer available. Upstream fixed it in May but the commit is not in any release yet. This will now cope with 3.15 kernels. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A)
Revision Changes Path 1.61 net-misc/dahdi/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dahdi/ChangeLog?rev=1.61&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dahdi/ChangeLog?rev=1.61&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dahdi/ChangeLog?r1=1.60&r2=1.61 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- ChangeLog 23 Jun 2014 10:21:11 -0000 1.60 +++ ChangeLog 18 Jul 2014 18:44:16 -0000 1.61 @@ -1,6 +1,13 @@ # ChangeLog for net-misc/dahdi # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.60 2014/06/23 10:21:11 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/ChangeLog,v 1.61 2014/07/18 18:44:16 chainsaw Exp $ + +*dahdi-2.9.0-r1 (18 Jul 2014) + + 18 Jul 2014; Tony Vroon <chain...@gentoo.org> +dahdi-2.9.0-r1.ebuild: + The pciradio.c file still used interruptible_sleep_on_timeout, which is no + longer available. Upstream fixed it in May but the commit is not in any + release yet. This will now cope with 3.15 kernels. 23 Jun 2014; Tony Vroon <chain...@gentoo.org> dahdi-2.6.2.ebuild, dahdi-2.7.0.1.ebuild, dahdi-2.8.0.1.ebuild, dahdi-2.9.0.ebuild: 1.1 net-misc/dahdi/dahdi-2.9.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dahdi/dahdi-2.9.0-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/dahdi/dahdi-2.9.0-r1.ebuild?rev=1.1&content-type=text/plain Index: dahdi-2.9.0-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi/dahdi-2.9.0-r1.ebuild,v 1.1 2014/07/18 18:44:16 chainsaw Exp $ EAPI=5 inherit base linux-mod eutils flag-o-matic toolchain-funcs MY_P="${P/dahdi/dahdi-linux}" JNET=1.0.14 S="${WORKDIR}/${MY_P}" DESCRIPTION="Kernel modules for Digium compatible hardware (formerly known as Zaptel)." HOMEPAGE="http://www.asterisk.org"; SRC_URI="http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_P}.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-b0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1d0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.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-oct6114-256-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-te133-780017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-e0017.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz http://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz mirror://gentoo/gentoo-dahdi-patchset-1.1.8.tar.bz2 http://www.junghanns.net/downloads/jnet-dahdi-drivers-${JNET}.tar.gz"; LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="flash" RESTRICT="test" DEPEND="" RDEPEND="" EPATCH_SUFFIX="diff" PATCHES=( "${WORKDIR}/dahdi-patchset" ) CONFIG_CHECK="MODULES ~CRC_CCITT" src_unpack() { unpack ${A} # 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/ cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/cwain/*.[ch] "${MY_P}"/drivers/dahdi/ cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/qozap/*.[ch] "${MY_P}"/drivers/dahdi/ cp -p "${WORKDIR}"/jnet-dahdi-drivers-${JNET}/ztgsm/*.[ch] "${MY_P}"/drivers/dahdi/ } src_prepare() { if use flash; then sed -i -e "s:/\* #define FXSFLASH \*/:#define FXSFLASH:" include/dahdi/dahdi_config.h || die "Failed to define FXSFLASH" sed -i -e "s:/\* #define SHORT_FLASH_TIME \*/:#define SHORT_FLASH_TIME:" include/dahdi/dahdi_config.h || die "Failed to define SHORT_FLASH_TIME" fi base_src_prepare } src_compile() { unset ARCH emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" all } src_install() { einfo "Installing kernel module" emake V=1 CC=$(tc-getCC) LD=$(tc-getLD) KSRC="${KV_OUT_DIR}" DESTDIR="${D}" DAHDI_MODULES_EXTRA="cwain.o qozap.o ztgsm.o" install rm -rf "$D"/lib/modules/*/modules.* }
