Drop capi4k-utils

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/capi4k-utils b/config/rootfiles/common/capi4k-utils
deleted file mode 100644 (file)
index 3a5d66a..0000000
--- a/config/rootfiles/common/capi4k-utils
+++ /dev/null
@@ -1,12 +0,0 @@
-sbin/capiinit
-usr/bin/capiinfo
-#usr/include/capi20.h
-#usr/include/capicmd.h
-#usr/include/capiutils.h
-#usr/lib/libcapi20.a
-#usr/lib/libcapi20.la
-usr/lib/libcapi20.so
-usr/lib/libcapi20.so.3
-usr/lib/libcapi20.so.3.0.4
-#usr/lib/libcapi20dyn.a
-#usr/man/man8/capiinfo.8

diff --git a/config/rootfiles/core/119/update.sh b/config/rootfiles/core/119/update.sh
index 7009e08d505d66e63f5b486b07e5983234b90ad0..42245ea45405d7e66b97e0b99706fad6dee17513 100644 (file)
--- a/config/rootfiles/core/119/update.sh
+++ b/config/rootfiles/core/119/update.sh
@@ -33,6 +33,12 @@ done
 
 # Stop services
 
+# Remove old files
+rm -vf \
+       /sbin/capiinit \
+       /usr/bin/capiinfo \
+       /usr/lib/libcapi20*
+
 # Extract files
 extract_files
 

diff --git a/lfs/capi4k-utils b/lfs/capi4k-utils
deleted file mode 100644 (file)
index b82c156..0000000
--- a/lfs/capi4k-utils
+++ /dev/null
@@ -1,89 +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        = 2005-07-18
-
-THISAPP    = capi4k-utils-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/capi4k-utils
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = c745759b6b3d64e19763727176648cdf
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# 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)
-       cd $(DIR_APP)/capiinit && sed -i -e 's/-O2/$(CFLAGS)/' configure
-       cd $(DIR_APP)/capiinit && ./configure
-       cd $(DIR_APP)/capiinit && make $(MAKETUNING)
-       cd $(DIR_APP)/capiinit && make install
-       cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux\/capi.h>/include <linux\/types.h>\n#include <linux\/capi.h>/' capidyn.c
-       cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux\/capi.h>/include <linux\/types.h>\n#include <linux\/capi.h>/' capi20.c
-       cd $(DIR_APP)/capi20 && sed -i "/include/a #include <stddef.h>" capi20.h
-       cd $(DIR_APP)/capi20 && sed -i -e 's/-O2/$(CFLAGS)/' configure
-       cd $(DIR_APP)/capi20 && SED=sed ./configure
-       cd $(DIR_APP)/capi20 && SED=sed make $(MAKETUNING)
-       cd $(DIR_APP)/capi20 && make install
-       cd $(DIR_APP)/capiinfo && sed -i -e 's/-O2/$(CFLAGS)/' configure
-       cd $(DIR_APP)/capiinfo && ./configure
-       cd $(DIR_APP)/capiinfo && make $(MAKETUNING)
-       cd $(DIR_APP)/capiinfo && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index a97e8afb9a8aaefc3a3dc730a231f23b940004b4..3f3cf8284a90689dc63e3bc18506f2f38de1397b 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1211,7 +1211,6 @@ buildipfire() {
   lfsmake2 iputils
   lfsmake2 l7-protocols
   lfsmake2 mISDNuser
-  lfsmake2 capi4k-utils
   lfsmake2 hwdata
   lfsmake2 logrotate
   lfsmake2 logwatch