aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-01-05 08:43:39 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-01-05 08:43:39 +0000
commit580b57fe713a79041a368bf0a18f09b21d697867 (patch)
treecd6771222c7919e03936f7d52a8f0ab6d79439f6
parent06312d678370e4509bf1d3dba32e20904ccf9d26 (diff)
downloadupstream-580b57fe713a79041a368bf0a18f09b21d697867.tar.gz
upstream-580b57fe713a79041a368bf0a18f09b21d697867.tar.bz2
upstream-580b57fe713a79041a368bf0a18f09b21d697867.zip
[package] kernel/crypto: fix crypto breakage (patch by Jose Vasconcellos)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13869 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/crypto.mk6
1 files changed, 3 insertions, 3 deletions
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