From b7666a79346fb3ba2d57cc4a18cfc3fc42668504 Mon Sep 17 00:00:00 2001 From: jow Date: Thu, 9 Dec 2010 17:18:41 +0000 Subject: [PATCH] [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 --- package/kernel/modules/block.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index 8513f3d82..6d36cde62 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 -- 2.20.1