summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-09 17:18:41 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-12-09 17:18:41 +0000
commitb7666a79346fb3ba2d57cc4a18cfc3fc42668504 (patch)
tree9a703d61feec43e1d1c07f1281d8be597fbaf34a
parentea1d62b57cf6d0b8c414b8f8158b36595c455679 (diff)
[package] kernel: fix raid module packaging on newer kernels (#8384)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24394 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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