Removed zaptel.

diff --git a/config/rootfiles/defekt/zaptel b/config/rootfiles/defekt/zaptel
deleted file mode 100644 (file)
index 5383a49..0000000
--- a/config/rootfiles/defekt/zaptel
+++ /dev/null
@@ -1,113 +0,0 @@
-#etc/hotplug
-#etc/hotplug/usb
-#etc/hotplug/usb/xpp_fxloader
-#etc/hotplug/usb/xpp_fxloader.usermap
-etc/modprobe.d/zaptel
-#etc/udev/rules.d/xpp.rules
-etc/udev/rules.d/zaptel.rules
-etc/zaptel.conf
-#lib/modules/KVER-ipfire-smp/misc
-lib/modules/KVER-ipfire-smp/misc/pciradio.ko
-lib/modules/KVER-ipfire-smp/misc/tor2.ko
-lib/modules/KVER-ipfire-smp/misc/torisa.ko
-lib/modules/KVER-ipfire-smp/misc/wcfxo.ko
-lib/modules/KVER-ipfire-smp/misc/wct1xxp.ko
-lib/modules/KVER-ipfire-smp/misc/wct4xxp
-lib/modules/KVER-ipfire-smp/misc/wct4xxp/wct4xxp.ko
-lib/modules/KVER-ipfire-smp/misc/wctc4xxp
-lib/modules/KVER-ipfire-smp/misc/wctc4xxp/wctc4xxp.ko
-lib/modules/KVER-ipfire-smp/misc/wctdm.ko
-lib/modules/KVER-ipfire-smp/misc/wctdm24xxp.ko
-lib/modules/KVER-ipfire-smp/misc/wcte11xp.ko
-lib/modules/KVER-ipfire-smp/misc/wcte12xp.ko
-lib/modules/KVER-ipfire-smp/misc/wcusb.ko
-#lib/modules/KVER-ipfire-smp/misc/xpp
-lib/modules/KVER-ipfire-smp/misc/xpp/xpd_fxo.ko
-lib/modules/KVER-ipfire-smp/misc/xpp/xpd_fxs.ko
-lib/modules/KVER-ipfire-smp/misc/xpp/xpp.ko
-lib/modules/KVER-ipfire-smp/misc/xpp/xpp_usb.ko
-lib/modules/KVER-ipfire-smp/misc/zaptel.ko
-lib/modules/KVER-ipfire-smp/misc/ztd-eth.ko
-lib/modules/KVER-ipfire-smp/misc/ztd-loc.ko
-lib/modules/KVER-ipfire-smp/misc/ztdummy.ko
-lib/modules/KVER-ipfire-smp/misc/ztdynamic.ko
-lib/modules/KVER-ipfire-smp/misc/zttranscode.ko
-sbin/ztcfg
-#usr/include/zaptel
-#usr/include/zaptel/tonezone.h
-#usr/include/zaptel/zaptel.h
-#usr/lib/libtonezone.a
-usr/lib/libtonezone.so
-usr/lib/libtonezone.so.1
-usr/lib/libtonezone.so.1.0
-#usr/lib/perl5/site_perl/5.8.8/Zaptel
-usr/lib/perl5/site_perl/5.8.8/Zaptel.pm
-usr/lib/perl5/site_perl/5.8.8/Zaptel/Chans.pm
-#usr/lib/perl5/site_perl/5.8.8/Zaptel/Hardware
-usr/lib/perl5/site_perl/5.8.8/Zaptel/Hardware.pm
-usr/lib/perl5/site_perl/5.8.8/Zaptel/Hardware/PCI.pm
-usr/lib/perl5/site_perl/5.8.8/Zaptel/Hardware/USB.pm
-usr/lib/perl5/site_perl/5.8.8/Zaptel/Span.pm
-#usr/lib/perl5/site_perl/5.8.8/Zaptel/Xpp
-usr/lib/perl5/site_perl/5.8.8/Zaptel/Xpp.pm
-usr/lib/perl5/site_perl/5.8.8/Zaptel/Xpp/Xbus.pm
-usr/lib/perl5/site_perl/5.8.8/Zaptel/Xpp/Xpd.pm
-usr/sbin/fpga_load
-usr/sbin/genzaptelconf
-usr/sbin/lszaptel
-usr/sbin/xpp_blink
-usr/sbin/xpp_sync
-usr/sbin/zapconf
-usr/sbin/zaptel_hardware
-usr/sbin/zt_registration
-#usr/share/man/man8/fpga_load.8
-#usr/share/man/man8/genzaptelconf.8
-#usr/share/man/man8/lszaptel.8
-#usr/share/man/man8/xpp_blink.8
-#usr/share/man/man8/xpp_sync.8
-#usr/share/man/man8/zapconf.8
-#usr/share/man/man8/zaptel_hardware.8
-#usr/share/man/man8/zt_registration.8
-#usr/share/man/man8/ztcfg.8
-#usr/share/man/man8/zttool.8
-#usr/share/zaptel
-usr/share/zaptel/FPGA_1141.hex
-usr/share/zaptel/FPGA_1151.hex
-usr/share/zaptel/FPGA_FXS.hex
-usr/share/zaptel/USB_1130.hex
-usr/share/zaptel/USB_1140.hex
-usr/share/zaptel/USB_1150.hex
-usr/share/zaptel/calibrate_slics
-usr/share/zaptel/init_card_3_26
-usr/share/zaptel/init_card_4_26
-usr/share/zaptel/init_card_6_26
-usr/share/zaptel/init_card_7_26
-usr/share/zaptel/init_fxo_modes
-usr/share/zaptel/xpp_fxloader
-#etc/modprobe.d/zaptel.bak
-#lib/modules/KVER-ipfire/misc
-lib/modules/KVER-ipfire/misc/pciradio.ko
-lib/modules/KVER-ipfire/misc/tor2.ko
-lib/modules/KVER-ipfire/misc/torisa.ko
-lib/modules/KVER-ipfire/misc/wcfxo.ko
-lib/modules/KVER-ipfire/misc/wct1xxp.ko
-lib/modules/KVER-ipfire/misc/wct4xxp
-lib/modules/KVER-ipfire/misc/wct4xxp/wct4xxp.ko
-lib/modules/KVER-ipfire/misc/wctc4xxp
-lib/modules/KVER-ipfire/misc/wctc4xxp/wctc4xxp.ko
-lib/modules/KVER-ipfire/misc/wctdm.ko
-lib/modules/KVER-ipfire/misc/wctdm24xxp.ko
-lib/modules/KVER-ipfire/misc/wcte11xp.ko
-lib/modules/KVER-ipfire/misc/wcte12xp.ko
-lib/modules/KVER-ipfire/misc/wcusb.ko
-#lib/modules/KVER-ipfire/misc/xpp
-lib/modules/KVER-ipfire/misc/xpp/xpd_fxo.ko
-lib/modules/KVER-ipfire/misc/xpp/xpd_fxs.ko
-lib/modules/KVER-ipfire/misc/xpp/xpp.ko
-lib/modules/KVER-ipfire/misc/xpp/xpp_usb.ko
-lib/modules/KVER-ipfire/misc/zaptel.ko
-lib/modules/KVER-ipfire/misc/ztd-eth.ko
-lib/modules/KVER-ipfire/misc/ztd-loc.ko
-lib/modules/KVER-ipfire/misc/ztdummy.ko
-lib/modules/KVER-ipfire/misc/ztdynamic.ko
-lib/modules/KVER-ipfire/misc/zttranscode.ko

diff --git a/lfs/zaptel b/lfs/zaptel
deleted file mode 100644 (file)
index 98cee78..0000000
--- a/lfs/zaptel
+++ /dev/null
@@ -1,108 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 1.4.4
-
-THISAPP    = zaptel-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(SMP)" "1"
-       TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-else
-       TARGET     = $(DIR_INFO)/$(THISAPP)
-endif
-PROG       = zaptel
-PAK_VER    = 1
-
-DEPS = ""
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 46c0b34dc9279265a54cbbee827bae7c
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist: 
-       $(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(SMP)" "1"
-       cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && cp -f $(DIR_SRC)/config/asterisk/zaptel.makeopts \
-               menuselect.makeopts
-       cd $(DIR_APP) && make KVERS=$(KVER)-ipfire-smp
-       cd $(DIR_APP) && make install KVERS=$(KVER)-ipfire-smp
-else
-       cd $(DIR_APP) && ./configure --prefix=/usr
-       cd $(DIR_APP) && cp -f $(DIR_SRC)/config/asterisk/zaptel.makeopts \
-               menuselect.makeopts
-       cd $(DIR_APP) && make KVERS=$(KVER)-ipfire
-       cd $(DIR_APP) && make install KVERS=$(KVER)-ipfire
-endif
-       #cd $(DIR_APP) && install -D -m 644 zaptel.h /usr/include/zaptel.h
-       #cd $(DIR_APP) && install -D -m 644 zconfig.h /usr/include/zconfig.h
-       #cd $(DIR_APP) && install -D -m 644 ecdis.h /usr/include/ecdis.h
-       #cd $(DIR_APP) && install -D -m 644 fasthdlc.h /usr/include/fasthdlc.h
-       #cd $(DIR_APP) && install -D -m 644 kb1ec.h /usr/include/kb1ec.h
-       #cd $(DIR_APP) && install -D -m 644 kb1ec_const.h /usr/include/kb1ec_const.h
-       #cd $(DIR_APP) && install -D -m 644 biquad.h /usr/include/biquad.h
-       #cd $(DIR_APP) && install -D -m 644 arith.h /usr/include/arith.h
-       #cd $(DIR_APP) && install -D -m 644 mg2ec.h /usr/include/mg2ec.h
-       #cd $(DIR_APP) && install -D -m 644 mg2ec_const.h /usr/include/mg2ec_const.h
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 62752807cac344d7aaffb7593250db0e4b5e6c49..d777da4b379e03140ae54fe80e3bbd10dc0bf41d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -335,7 +335,6 @@ buildipfire() {
   ipfiremake linux                     SMP=1
 #  ipfiremake linux-fusion             SMP=1
 #  ipfiremake ipp2p                    SMP=1
   ipfiremake linux                     SMP=1
 #  ipfiremake linux-fusion             SMP=1
 #  ipfiremake ipp2p                    SMP=1

-#  ipfiremake zaptel                   SMP=1

 #  ipfiremake r8169                    SMP=1
 #  ipfiremake r8168                    SMP=1
 #  ipfiremake atl1                     SMP=1
 #  ipfiremake r8169                    SMP=1
 #  ipfiremake r8168                    SMP=1
 #  ipfiremake atl1                     SMP=1


@@ -348,7 +347,6 @@ buildipfire() {
   ipfiremake linux
 #  ipfiremake linux-fusion
 #  ipfiremake ipp2p
   ipfiremake linux
 #  ipfiremake linux-fusion
 #  ipfiremake ipp2p

-#  ipfiremake zaptel

 #  ipfiremake r8169
 #  ipfiremake r8168
 #  ipfiremake atl1
 #  ipfiremake r8169
 #  ipfiremake r8168
 #  ipfiremake atl1