From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 9 Dec 2010 17:18:41 +0000 (+0000)
Subject: kernel: fix raid module packaging on newer kernels (#8384)
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4df44b15e1816e2dcc5323c4648b445745a44788;p=openwrt%2Fstaging%2Fnbd.git

kernel: fix raid module packaging on newer kernels (#8384)

SVN-Revision: 24394
---

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