aboutsummaryrefslogtreecommitdiffstats
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
commit2f18c70fb64b794976253267fd3dd6c693ae7799 (patch)
treee6a114118dd9c4198851a6b807c42cc48be322a7
parent78aa6df4e3952a1d5ca649a4e248bc4e7db30ce2 (diff)
downloadmaster-187ad058-2f18c70fb64b794976253267fd3dd6c693ae7799.tar.gz
master-187ad058-2f18c70fb64b794976253267fd3dd6c693ae7799.tar.bz2
master-187ad058-2f18c70fb64b794976253267fd3dd6c693ae7799.zip
add a macro to compare kernel patch versions and use it for crypto and watchdog changes in 2.6.24+ kernels (closes: #3402)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11115 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/kernel.mk4
-rw-r--r--package/kernel/modules/crypto.mk11
-rw-r--r--package/kernel/modules/other.mk2
3 files changed, 13 insertions, 4 deletions
diff --git a/include/kernel.mk b/include/kernel.mk
index 52355dcdd3..b80c3b63ff 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -145,3 +145,7 @@ define AutoLoad
add_module $(1) "$(2)";
endef
+define CompareKernelPatchVer
+ $(shell [ $$(echo $(1) | tr . 0) -$(2) $$(echo $(3) | tr . 0) ] && echo 1 || echo 0)
+endef
+
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 \
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index bf674644d4..482c06c4a8 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -270,7 +270,7 @@ $(eval $(call KernelPackage,mmc-at91))
ifeq ($(KERNEL),2.4)
WATCHDOG_DIR=char
endif
-ifeq ($(KERNEL_PATCHVER),2.6.24)
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1)
WATCHDOG_DIR=watchdog
endif
WATCHDOG_DIR?=char/watchdog