Author: lisu Date: Thu Feb 9 14:58:22 2012 GMT Module: packages Tag: HEAD ---- Log message: - dahdi_dummy module is no longer necessary from version 2.4 (DAHDI is now able to provide timing and audio mixing using kernel timers using a built-in timer, so there is no need for a separate module)
---- Files affected: packages/dahdi-linux: dahdi-linux.spec (1.101 -> 1.102) ---- Diffs: ================================================================ Index: packages/dahdi-linux/dahdi-linux.spec diff -u packages/dahdi-linux/dahdi-linux.spec:1.101 packages/dahdi-linux/dahdi-linux.spec:1.102 --- packages/dahdi-linux/dahdi-linux.spec:1.101 Thu Feb 9 09:57:43 2012 +++ packages/dahdi-linux/dahdi-linux.spec Thu Feb 9 15:58:16 2012 @@ -33,7 +33,7 @@ %undefine with_dist_kernel %endif -%define rel 0.1 +%define rel 1 %define pname dahdi-linux %define FIRMWARE_URL http://downloads.digium.com/pub/telephony/firmware/releases Summary: DAHDI telephony device support @@ -55,10 +55,9 @@ # Source6-md5: 2ea860bb8a9d8ede2858b9557b74ee3c Source7: %{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz # Source7-md5: a7f3886942bb3e9fed349a41b3390c9f -Patch0: %{pname}-dummy.patch -Patch1: %{pname}-build.patch +Patch0: %{pname}-build.patch # http://oss.axsentis.de/people/stkn/openzap/dahdi-2.4.0-linux-2.6.37.patch -Patch2: dahdi-2.4.0-linux-2.6.37.patch +Patch1: dahdi-2.4.0-linux-2.6.37.patch URL: http://www.asterisk.org/ %if %{with dist_kernel} BuildRequires: kernel%{_alt_kernel}-module-build @@ -73,8 +72,8 @@ # - keep X and X_in in sync # - X is used for actual building (entries separated with space), X_in for pld macros (entries separated with comma) -%define modules_1 dahdi.o dahdi_dynamic.o dahdi_dynamic_eth.o dahdi_dynamic_ethmf.o dahdi_dynamic_loc.o dahdi_dummy.o dahdi_echocan_jpah.o dahdi_echocan_kb1.o dahdi_echocan_mg2.o dahdi_echocan_sec.o dahdi_echocan_sec2.o pciradio.o tor2.o wcfxo.o wct1xxp.o wctdm.o wcte11xp.o -%define modules_1_in dahdi,dahdi_dynamic,dahdi_dynamic_eth,dahdi_dynamic_ethmf,dahdi_dynamic_loc,dahdi_dummy,dahdi_echocan_jpah,dahdi_echocan_kb1,dahdi_echocan_mg2,dahdi_echocan_sec,dahdi_echocan_sec2,pciradio,tor2,wcfxo,wct1xxp,wctdm,wcte11xp +%define modules_1 dahdi.o dahdi_dynamic.o dahdi_dynamic_eth.o dahdi_dynamic_ethmf.o dahdi_dynamic_loc.o dahdi_echocan_jpah.o dahdi_echocan_kb1.o dahdi_echocan_mg2.o dahdi_echocan_sec.o dahdi_echocan_sec2.o pciradio.o tor2.o wcfxo.o wct1xxp.o wctdm.o wcte11xp.o +%define modules_1_in dahdi,dahdi_dynamic,dahdi_dynamic_eth,dahdi_dynamic_ethmf,dahdi_dynamic_loc,dahdi_echocan_jpah,dahdi_echocan_kb1,dahdi_echocan_mg2,dahdi_echocan_sec,dahdi_echocan_sec2,pciradio,tor2,wcfxo,wct1xxp,wctdm,wcte11xp %define modules_2 voicebus/ wct4xxp/ wcte12xp/ %{?with_xpp:xpp/} %define modules_2_in voicebus/dahdi_voicebus,wct4xxp/wct4xxp,wcte12xp/wcte12xp,%{?with_xpp:xpp/xpd_bri,xpp/xpd_echo,xpp/xpd_fxo,xpp/xpd_fxs,xpp/xpd_pri,xpp/xpp,xpp/xpp_usb} %ifnarch alpha @@ -136,8 +135,7 @@ %prep %setup -q -n %{pname}-%{version} %patch0 -p1 -%patch1 -p1 -#%patch2 -p1 +#%patch1 -p1 for a in %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}; do ln -s $a drivers/dahdi/firmware @@ -222,6 +220,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.102 2012/02/09 14:58:16 lisu +- dahdi_dummy module is no longer necessary from version 2.4 +(DAHDI is now able to provide timing and audio mixing using kernel timers +using a built-in timer, so there is no need for a separate module) + Revision 1.101 2012/02/09 08:57:43 lisu - rel 0.1 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dahdi-linux/dahdi-linux.spec?r1=1.101&r2=1.102&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
