Drop cryptodev

This module isn't used by openssl any more and therefore
quite unnecessary.

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

diff --git a/config/rootfiles/core/96/update.sh b/config/rootfiles/core/96/update.sh
index b415337fb99667c5fd60a6828bb0cedf60815d2e..b860207b5e499a8a121dfbb45763d629238a092a 100644 (file)
--- a/config/rootfiles/core/96/update.sh
+++ b/config/rootfiles/core/96/update.sh
@@ -76,6 +76,9 @@ fi
 /etc/init.d/dnsmasq restart
 qosctrl start
 
+# Disable loading of cryptodev
+sed -e "s/^cryptodev/# &/g" -i /etc/sysconfig/modules
+
 # This update need a reboot...
 #touch /var/run/need_reboot
 

diff --git a/lfs/cryptodev b/lfs/cryptodev
deleted file mode 100644 (file)
index 00e83e7..0000000
--- a/lfs/cryptodev
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team <info@ipfire.org>                      #
-#                                                                             #
-# 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
-
-ifeq "$(KCFG)" "-xen"
-       KVER = 2.6.32.61
-endif
-
-VERSUFIX=ipfire$(KCFG)
-
-VER        = 6aa62a2c320b04f55fdfe0ed015c3d9b48997239
-
-THISAPP    = cryptodev-linux-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = ddf7876487c876f6676ef0e050e9d204
-
-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 axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make build \
-               KERNEL_DIR=/lib/modules/$(KVER)-$(VERSUFIX)/build
-
-       -mkdir -pv /usr/include/crypto
-       cd $(DIR_APP) && make install \
-               KERNEL_DIR=/lib/modules/$(KVER)-$(VERSUFIX)/build
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 0a74a21aa63abf333e573b439db8efc667ecb5b3..422e87131991d14cbdfbda60ee14731f9feaf5a5 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -422,7 +422,6 @@ buildipfire() {
        x86_64)
                ipfiremake linux                        KCFG=""
                ipfiremake backports                    KCFG=""
-               ipfiremake cryptodev                    KCFG=""
                ipfiremake e1000e                       KCFG=""
                ipfiremake igb                          KCFG=""
                ipfiremake ixgbe                        KCFG=""
@@ -433,7 +432,6 @@ buildipfire() {
                # x86-pae (Native and new XEN) kernel build
                ipfiremake linux                        KCFG="-pae"
                ipfiremake backports                    KCFG="-pae"
-               ipfiremake cryptodev                    KCFG="-pae"
                ipfiremake e1000e                       KCFG="-pae"
                ipfiremake igb                          KCFG="-pae"
                ipfiremake ixgbe                        KCFG="-pae"
@@ -443,7 +441,6 @@ buildipfire() {
                # x86 kernel build
                ipfiremake linux                        KCFG=""
                ipfiremake backports                    KCFG=""
-               ipfiremake cryptodev                    KCFG=""
                ipfiremake e1000e                       KCFG=""
                ipfiremake igb                          KCFG=""
                ipfiremake ixgbe                        KCFG=""
@@ -455,14 +452,12 @@ buildipfire() {
                # arm-rpi (Raspberry Pi) kernel build
                ipfiremake linux                        KCFG="-rpi"
                ipfiremake backports                    KCFG="-rpi"
-               ipfiremake cryptodev                    KCFG="-rpi"
                ipfiremake xtables-addons               KCFG="-rpi"
                ipfiremake linux-initrd                 KCFG="-rpi"
 
                # arm multi platform (Panda, Wandboard ...) kernel build
                ipfiremake linux                        KCFG="-multi"
                ipfiremake backports                    KCFG="-multi"
-               ipfiremake cryptodev                    KCFG="-multi"
                ipfiremake e1000e                       KCFG="-multi"
                ipfiremake igb                          KCFG="-multi"
                ipfiremake ixgbe                        KCFG="-multi"
@@ -472,7 +467,6 @@ buildipfire() {
                # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
                ipfiremake linux                        KCFG="-kirkwood"
                ipfiremake backports                    KCFG="-kirkwood"
-               ipfiremake cryptodev                    KCFG="-kirkwood"
                ipfiremake e1000e                       KCFG="-kirkwood"
                ipfiremake igb                          KCFG="-kirkwood"
                ipfiremake ixgbe                        KCFG="-kirkwood"

diff --git a/src/initscripts/sysconfig/modules b/src/initscripts/sysconfig/modules
index cdbcca4f4ec04be56c0687061c019b0112198a6b..5f8a77d8b19938c80ae445aa9e938709f3704cd3 100644 (file)
--- a/src/initscripts/sysconfig/modules
+++ b/src/initscripts/sysconfig/modules
@@ -33,8 +33,4 @@ lp
 ### fusion
 # fusion
 
-### cryptodev
-#
-cryptodev
-
 # End /etc/sysconfig/modules