Changeset 27849


Ignore:
Timestamp:
2011-07-31T19:58:46+02:00 (7 years ago)
Author:
jogo
Message:

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

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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/modules/fs.mk

    r26901 r27849  
    7777  TITLE:=EXT2 filesystem support 
    7878  KCONFIG:=CONFIG_EXT2_FS 
    79   DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) @LINUX_2_6_30||LINUX_2_6_31 
     79  DEPENDS:=@LINUX_2_6_30||LINUX_2_6_31 
    8080  FILES:=$(LINUX_DIR)/fs/ext2/ext2.ko 
    8181  AUTOLOAD:=$(call AutoLoad,32,ext2,1) 
     
    9595        CONFIG_EXT3_FS \ 
    9696        CONFIG_JBD 
    97   DEPENDS:=$(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) @LINUX_2_6_30||LINUX_2_6_31 
     97  DEPENDS:=@LINUX_2_6_30||LINUX_2_6_31 
    9898  FILES:= \ 
    9999        $(LINUX_DIR)/fs/ext3/ext3.ko \ 
     
    115115        CONFIG_EXT4_FS \ 
    116116        CONFIG_JBD2 
    117   DEPENDS:= $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) 
    118117  FILES:= \ 
    119118        $(LINUX_DIR)/fs/ext4/ext4.ko \ 
    120119        $(LINUX_DIR)/fs/jbd2/jbd2.ko 
    121   AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1) 
     120 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.37)),1) 
     121    FILES+= \ 
     122        $(LINUX_DIR)/fs/mbcache.ko 
     123    AUTOLOAD:=$(call AutoLoad,30,mbcache jbd2 ext4,1) 
     124 else 
     125    AUTOLOAD:=$(call AutoLoad,30,jbd2 ext4,1) 
     126 endif 
    122127  $(call AddDepends/crc16) 
    123128endef 
     
    176181 
    177182$(eval $(call KernelPackage,fs-isofs)) 
    178  
    179  
    180 define KernelPackage/fs-mbcache 
    181   SUBMENU:=$(FS_MENU) 
    182   TITLE:=mbcache (used by ext2/ext3/ext4) 
    183   KCONFIG:=CONFIG_FS_MBCACHE 
    184   ifneq ($(CONFIG_FS_MBCACHE),) 
    185     FILES:=$(LINUX_DIR)/fs/mbcache.ko 
    186     AUTOLOAD:=$(call AutoLoad,20,mbcache,1) 
    187   endif 
    188 endef 
    189  
    190 define KernelPackage/fs-mbcache/description 
    191  Meta Block cache used by ext2/ext3 
    192  This package will only be installed if extended attributes  
    193  are enabled for ext2/ext3 
    194 endef 
    195  
    196 $(eval $(call KernelPackage,fs-mbcache)) 
    197183 
    198184 
Note: See TracChangeset for help on using the changeset viewer.