aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/modules/crypto.mk
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2008-05-11 20:56:51 +0000
committerNicolas Thill <nico@openwrt.org>2008-05-11 20:56:51 +0000
commite93e293b4159df8beafa1d0cb219197dd6a61402 (patch)
treedf9e4258d6297c4d68f9fbc3c3382a104fb1ec3f /package/kernel/modules/crypto.mk
parentf06040500529f4f27e11a9f72622750621bc57c9 (diff)
downloadupstream-e93e293b4159df8beafa1d0cb219197dd6a61402.tar.gz
upstream-e93e293b4159df8beafa1d0cb219197dd6a61402.tar.bz2
upstream-e93e293b4159df8beafa1d0cb219197dd6a61402.zip
add a macro to compare kernel patch versions and use it for crypto and watchdog changes in 2.6.24+ kernels (closes: #3402)
SVN-Revision: 11115
Diffstat (limited to 'package/kernel/modules/crypto.mk')
-rw-r--r--package/kernel/modules/crypto.mk11
1 files changed, 8 insertions, 3 deletions
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 4bb591974f..68ccb60cd1 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -13,10 +13,15 @@ CRYPTO_MENU:=Cryptographic API modules
# - des > des_generic
# - sha1 > sha1_generic
# - sha256 > sha256_generic
-ifeq ($(KERNEL_PATCHVER),2.6.24)
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1)
CRYPTO_GENERIC:=_generic
endif
+# XXX: added CRYPTO_PREFIX as a workaround for modules renamed in 2.6.25:
+# - blkcipher -> crypto_blkcipher
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.25)),1)
+ CRYPTO_PREFIX:=crypto_
+endif
# XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is
# always set, even if no hash modules are selected
@@ -35,7 +40,7 @@ define KernelPackage/crypto-core
CONFIG_CRYPTO_MANAGER
FILES:= \
$(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/crypto/blkcipher.$(LINUX_KMOD_SUFFIX) \
+ $(LINUX_DIR)/crypto/$(CRYPTO_PREFIX)blkcipher.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/cbc.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/ecb.$(LINUX_KMOD_SUFFIX) \
@@ -45,7 +50,7 @@ define KernelPackage/crypto-core
crypto_algapi \
cryptomgr \
crypto_hash \
- blkcipher \
+ $(CRYPTO_PREFIX)blkcipher \
cbc \
ecb \
deflate \