summaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-12-09 17:18:41 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-12-09 17:18:41 +0000
commit4df44b15e1816e2dcc5323c4648b445745a44788 (patch)
tree9eca71937456a9b606607732cc947d367cd64eaf /package/kernel
parent72cf52b1d8cabf8dbfb10c605c2805ec6de20af4 (diff)
downloadmaster-31e0f0ae-4df44b15e1816e2dcc5323c4648b445745a44788.tar.gz
master-31e0f0ae-4df44b15e1816e2dcc5323c4648b445745a44788.tar.bz2
master-31e0f0ae-4df44b15e1816e2dcc5323c4648b445745a44788.zip
kernel: fix raid module packaging on newer kernels (#8384)
SVN-Revision: 24394
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/modules/block.mk11
1 files changed, 10 insertions, 1 deletions
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index 8513f3d82e..6d36cde621 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -308,8 +308,17 @@ $(call KernelPackage/md/Depends,)
$(LINUX_DIR)/crypto/async_tx/async_xor.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/async_tx/async_pq.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/crypto/async_tx/async_raid6_recov.$(LINUX_KMOD_SUFFIX) \
- $(LINUX_DIR)/drivers/md/raid6_pq.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/md/raid456.$(LINUX_KMOD_SUFFIX)
+ # Additional files with kernel-dependent locations or presence
+ # For Linux >= 2.6.36
+ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.36)), 1)
+ FILES+= \
+ $(LINUX_DIR)/lib/raid6/raid6_pq.$(LINUX_KMOD_SUFFIX)
+ # For Linux < 2.6.36
+ else
+ FILES+= \
+ $(LINUX_DIR)/drivers/md/raid6_pq.$(LINUX_KMOD_SUFFIX)
+ endif
AUTOLOAD:=$(call AutoLoad,28, xor async_tx async_memcpy async_xor raid6_pq async_pq async_raid6_recov raid456)
endef