domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/kernel: move kmod-fs-mbcache into fs-ext4

Browse Source 
mbcache is only needed if xattr support is enabled, but this is only true
for ext4 on 2.6.37+, so just bundle it with ext4 when needed.

SVN-Revision: 27849
This commit is contained in:
Jonas Gorski
2011-07-31 17:58:46 +00:00
parent 8fc2981bcd
commit eb90f30ce7
1 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
package/kernel/modules/fs.mk
View File

@@ -76,7 +76,7 @@ define KernelPackage/fs-ext2
SUBMENU:=$(FS_MENU) SUBMENU:=$(FS_MENU)
TITLE:=EXT2 filesystem support TITLE:=EXT2 filesystem support
KCONFIG:=CONFIG_EXT2_FS KCONFIG:=CONFIG_EXT2_FS
DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) @LINUX_2_6_30||LINUX_2_6_31 DEPENDS:=@LINUX_2_6_30||LINUX_2_6_31
FILES:=$(LINUX_DIR)/fs/ext2/ext2.ko FILES:=$(LINUX_DIR)/fs/ext2/ext2.ko
AUTOLOAD:=$(call AutoLoad,32,ext2,1) AUTOLOAD:=$(call AutoLoad,32,ext2,1)
endef endef
@@ -94,7 +94,7 @@ define KernelPackage/fs-ext3
KCONFIG:= \ KCONFIG:= \
CONFIG_EXT3_FS \ CONFIG_EXT3_FS \
CONFIG_JBD CONFIG_JBD
DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) @LINUX_2_6_30||LINUX_2_6_31 DEPENDS:=@LINUX_2_6_30||LINUX_2_6_31
FILES:= \ FILES:= \
$(LINUX_DIR)/fs/ext3/ext3.ko \ $(LINUX_DIR)/fs/ext3/ext3.ko \
$(LINUX_DIR)/fs/jbd/jbd.ko $(LINUX_DIR)/fs/jbd/jbd.ko
@@ -114,11 +114,16 @@ define KernelPackage/fs-ext4
KCONFIG:= \ KCONFIG:= \
CONFIG_EXT4_FS \ CONFIG_EXT4_FS \
CONFIG_JBD2 CONFIG_JBD2
DEPENDS:= $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache)
FILES:= \ FILES:= \
$(LINUX_DIR)/fs/ext4/ext4.ko \ $(LINUX_DIR)/fs/ext4/ext4.ko \
$(LINUX_DIR)/fs/jbd2/jbd2.ko $(LINUX_DIR)/fs/jbd2/jbd2.ko
AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1) ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.37)),1)
FILES+= \
$(LINUX_DIR)/fs/mbcache.ko
AUTOLOAD:=$(call AutoLoad,30,mbcache jbd2 ext4,1)
else
AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1)
endif
$(call AddDepends/crc16) $(call AddDepends/crc16)
endef endef
@@ -177,25 +182,6 @@ endef
$(eval $(call KernelPackage,fs-isofs)) $(eval $(call KernelPackage,fs-isofs))
define KernelPackage/fs-mbcache
SUBMENU:=$(FS_MENU)
TITLE:=mbcache (used by ext2/ext3/ext4)
KCONFIG:=CONFIG_FS_MBCACHE
ifneq ($(CONFIG_FS_MBCACHE),)
FILES:=$(LINUX_DIR)/fs/mbcache.ko
AUTOLOAD:=$(call AutoLoad,20,mbcache,1)
endif
endef
define KernelPackage/fs-mbcache/description
Meta Block cache used by ext2/ext3
This package will only be installed if extended attributes
are enabled for ext2/ext3
endef
$(eval $(call KernelPackage,fs-mbcache))
define KernelPackage/fs-minix define KernelPackage/fs-minix
SUBMENU:=$(FS_MENU) SUBMENU:=$(FS_MENU)
TITLE:=Minix filesystem support TITLE:=Minix filesystem support