From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 5 Jan 2009 08:43:39 +0000 (+0000)
Subject: kernel/crypto: fix crypto breakage (patch by Jose Vasconcellos)
X-Git-Tag: reboot~24864
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9be7e1723fc8940cd03617dc944f06cc4edee207;p=openwrt%2Fstaging%2Flynxis.git

kernel/crypto: fix crypto breakage (patch by Jose Vasconcellos)

SVN-Revision: 13869
---

diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 89ab2d3885..99a80bfc0e 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -42,8 +42,8 @@ CRYPTO_MODULES = \
 	DEFLATE=deflate
 
 crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1)))
-crypto_file=$(if $($(call crypto_confvar,$(1))),$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).$(LINUX_KMOD_SUFFIX))
-crypto_name=$(if $($(call crypto_confvar,$(1))),$(word 2,$(subst =,$(space),$(1))))
+crypto_file=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).$(LINUX_KMOD_SUFFIX))
+crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subst =,$(space),$(1))))
 
 # XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is
 # always set, even if no hash modules are selected
@@ -52,7 +52,7 @@ define KernelPackage/crypto-core
   TITLE:=Core CryptoAPI modules
   KCONFIG:=CONFIG_CRYPTO=y $(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod)))
   FILES:=$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod)))
-  AUTOLOAD:=$(call AutoLoad,01,$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod))))
+  AUTOLOAD:=$(call AutoLoad,01,$(foreach mod,$(CRYPTO_MODULES),$(call crypto_name,$(mod))))
 endef
 
 define KernelPackage/crypto-core/2.4