From: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 25 Apr 2009 19:48:54 +0000 (+0000)
Subject: [ext4] add missing dependencies
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/09f00dd10adb0d5ee0f4257f27ad534aae89e1e4?hp=b8fd341162fe3f0189c277a198ce6bcf458745c5

[ext4] add missing dependencies


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15411 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index e1923e2d6..85b8e1ab8 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -112,6 +112,12 @@ endef
 
 $(eval $(call KernelPackage,fs-ext3))
 
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),lt,2.6.28)),1)
+	EXT4_NAME:=ext4dev
+else
+	EXT4_NAME:=ext4
+endif
+
 define KernelPackage/fs-ext4
   SUBMENU:=$(FS_MENU)
   TITLE:=EXT4 filesystem support
@@ -120,11 +126,13 @@ define KernelPackage/fs-ext4
 	CONFIG_EXT4_FS_XATTR=y \
 	CONFIG_EXT4_FS_POSIX_ACL=y \
 	CONFIG_EXT4_FS_SECURITY=y \
-	CONFIG_EXT4_FS
-  DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
+	CONFIG_EXT4_FS \
+	CONFIG_JBD2
+  DEPENDS:= @LINUX_2_6 +kmod-crc16 $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
   FILES:= \
-	$(LINUX_DIR)/fs/ext4/ext4.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,ext4)
+	$(LINUX_DIR)/fs/ext4/$(EXT4_NAME).$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/fs/jbd2/jbd2.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,jbd2 $(EXT4_NAME))
 endef
 
 define KernelPackage/fs-ext4/description