Changeset 24084


Ignore:
Timestamp:
2010-11-22T13:12:39+01:00 (6 years ago)
Author:
kaloz
Message:

switch from ext2 to ext4 (w/o) journaling

Location:
trunk
Files:
30 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.in

    r23791 r24084  
    1 # Copyright (C) 2006-2009 OpenWrt.org 
     1# Copyright (C) 2006-2010 OpenWrt.org 
    22# 
    33# This is free software, licensed under the GNU General Public License v2. 
     
    6363        comment "Root filesystem images" 
    6464 
    65         config TARGET_ROOTFS_EXT2FS 
    66                 bool "ext2" 
    67                 default y if USES_EXT2 
     65        config TARGET_ROOTFS_EXT4FS 
     66                bool "ext4" 
     67                default y if USES_EXT4 
    6868                depends !TARGET_ROOTFS_INITRAMFS 
    6969                help 
    70                   Ext2 file system with some free space for uml images 
     70                  Ext4 file system with some free space for uml images 
    7171 
    7272        config TARGET_ROOTFS_ISO 
     
    104104        config TARGET_ROOTFS_PARTSIZE 
    105105                int "Root filesystem partition size (in MB)" 
    106                 depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS || TARGET_rb532 
     106                depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532 
    107107                default 48 
    108108                help 
     
    111111        config TARGET_ROOTFS_MAXINODE 
    112112                int "Maximum number of inodes in root filesystem" 
    113                 depends TARGET_ROOTFS_EXT2FS 
     113                depends TARGET_ROOTFS_EXT4FS 
    114114                default 6000 
    115115                help 
  • trunk/include/image.mk

    r21951 r24084  
    129129endif 
    130130 
    131 ifneq ($(CONFIG_TARGET_ROOTFS_EXT2FS),) 
     131ifneq ($(CONFIG_TARGET_ROOTFS_EXT4FS),) 
    132132  E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024))) 
    133133 
    134   define Image/mkfs/ext2 
    135                 $(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext2 
    136                 $(call Image/Build,ext2) 
     134  define Image/mkfs/ext4 
     135# generate an ext2 fs 
     136        $(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext4 
     137# convert it to ext4 
     138        $(STAGING_DIR_HOST)/bin/tune2fs -O extents,uninit_bg,dir_index $(KDIR)/root.ext4 
     139# fix it up 
     140        $(STAGING_DIR_HOST)/bin/e2fsck -fy $(KDIR)/root.ext4 
     141        $(call Image/Build,ext4) 
    137142  endef 
    138143endif 
     
    185190                $(call Image/mkfs/cpiogz) 
    186191                $(call Image/mkfs/targz) 
    187                 $(call Image/mkfs/ext2) 
     192                $(call Image/mkfs/ext4) 
    188193                $(call Image/mkfs/iso) 
    189194                $(call Image/mkfs/jffs2) 
     
    196201                $(call Image/mkfs/cpiogz) 
    197202                $(call Image/mkfs/targz) 
    198                 $(call Image/mkfs/ext2) 
     203                $(call Image/mkfs/ext4) 
    199204                $(call Image/mkfs/iso) 
    200205                $(call Image/mkfs/jffs2) 
  • trunk/scripts/metadata.pl

    r23375 r24084  
    164164                /squashfs/ and $ret .= "\tselect USES_SQUASHFS\n"; 
    165165                /jffs2/ and $ret .= "\tselect USES_JFFS2\n"; 
    166                 /ext2/ and $ret .= "\tselect USES_EXT2\n"; 
     166                /ext4/ and $ret .= "\tselect USES_EXT4\n"; 
    167167                /targz/ and $ret .= "\tselect USES_TARGZ\n"; 
    168168                /cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n"; 
  • trunk/target/Config.in

    r23791 r24084  
    4141        bool 
    4242 
    43 config USES_EXT2 
     43config USES_EXT4 
    4444        bool 
    4545 
  • trunk/target/linux/at91/config-default

    r23400 r24084  
    6565CONFIG_DEVPTS_MULTIPLE_INSTANCES=y 
    6666# CONFIG_DM9000 is not set 
    67 CONFIG_EXT2_FS=y 
     67CONFIG_EXT4_FS=y 
    6868# CONFIG_FPE_FASTFPE is not set 
    6969# CONFIG_FPE_NWFPE is not set 
  • trunk/target/linux/cobalt/Makefile

    r23851 r24084  
    11# 
    2 # Copyright (C) 2009 OpenWrt.org 
     2# Copyright (C) 2009-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010BOARD:=cobalt 
    1111BOARDNAME:=Cobalt Microservers 
    12 FEATURES:=targz pci ext2 
     12FEATURES:=targz pci ext4 
    1313CFLAGS:=-O2 -pipe -mtune=r5000 -funit-at-a-time 
    1414 
  • trunk/target/linux/ep93xx/Makefile

    r23762 r24084  
    11# 
    2 # Copyright (C) 2009 OpenWrt.org 
     2# Copyright (C) 2009-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010BOARD:=ep93xx 
    1111BOARDNAME:=Cirrus Logic EP93xx 
    12 FEATURES:=squashfs jffs2 ext2 targz usb 
     12FEATURES:=squashfs jffs2 ext4 targz usb 
    1313CFLAGS:=-Os -pipe -march=armv4t -funit-at-a-time 
    1414 
  • trunk/target/linux/ixp4xx/harddisk/config-default

    r18367 r24084  
    22CONFIG_BLK_DEV_SD=y 
    33CONFIG_CMDLINE="root=/dev/sda1 noinitrd console=ttyS0,115200" 
    4 CONFIG_EXT2_FS=y 
    5 CONFIG_EXT3_FS=y 
     4CONFIG_EXT4_FS=y 
    65CONFIG_JBD=y 
    76CONFIG_REISERFS_FS=y 
  • trunk/target/linux/kirkwood/config-default

    r23217 r24084  
    4545# CONFIG_DM9000 is not set 
    4646CONFIG_DNOTIFY=y 
    47 CONFIG_EXT2_FS=y 
    48 CONFIG_EXT3_FS=y 
     47CONFIG_EXT4_FS=y 
    4948# CONFIG_FPE_FASTFPE is not set 
    5049# CONFIG_FPE_NWFPE is not set 
  • trunk/target/linux/mpc52xx/Makefile

    r21238 r24084  
    11# 
    2 # Copyright (C) 2009 OpenWrt.org 
     2# Copyright (C) 2009-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010BOARD:=mpc52xx 
    1111BOARDNAME:=Freescale MPC52xx 
    12 FEATURES:=targz ext2 
     12FEATURES:=targz ext4 
    1313 
    1414LINUX_VERSION:=2.6.30.10 
  • trunk/target/linux/omap24xx/config-2.6.36

    r23853 r24084  
    146146# CONFIG_EASYCAP is not set 
    147147CONFIG_ENABLE_MUST_CHECK=y 
    148 CONFIG_EXT2_FS=y 
    149 CONFIG_EXT2_FS_POSIX_ACL=y 
    150 # CONFIG_EXT2_FS_SECURITY is not set 
    151 CONFIG_EXT2_FS_XATTR=y 
    152 CONFIG_EXT2_FS_XIP=y 
    153 CONFIG_EXT3_DEFAULTS_TO_ORDERED=y 
    154 CONFIG_EXT3_FS=y 
    155 CONFIG_EXT3_FS_POSIX_ACL=y 
    156 # CONFIG_EXT3_FS_SECURITY is not set 
    157 CONFIG_EXT3_FS_XATTR=y 
     148CONFIG_EXT4_FS=y 
    158149CONFIG_FAT_FS=y 
    159150CONFIG_FB=y 
  • trunk/target/linux/omap24xx/config-2.6.37

    r23888 r24084  
    172172CONFIG_ENABLE_MUST_CHECK=y 
    173173CONFIG_EXPORTFS=m 
    174 CONFIG_EXT2_FS=y 
    175 CONFIG_EXT2_FS_POSIX_ACL=y 
    176 # CONFIG_EXT2_FS_SECURITY is not set 
    177 CONFIG_EXT2_FS_XATTR=y 
    178 CONFIG_EXT2_FS_XIP=y 
    179 CONFIG_EXT3_DEFAULTS_TO_ORDERED=y 
    180 CONFIG_EXT3_FS=y 
    181 CONFIG_EXT3_FS_POSIX_ACL=y 
    182 # CONFIG_EXT3_FS_SECURITY is not set 
    183 CONFIG_EXT3_FS_XATTR=y 
     174CONFIG_EXT4_FS=y 
    184175CONFIG_FAT_FS=y 
    185176CONFIG_FB=y 
  • trunk/target/linux/omap35xx/beagleboard/profiles/beagleboard.mk

    r21858 r24084  
    11# 
    2 # Copyright (C) 2006 - 2009 OpenWrt.org 
     2# Copyright (C) 2006-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    88define Profile/Beagleboard 
    99  NAME:=beagleboard 
    10   FEATURES:=ext2 usb 
     10  FEATURES:=ext4 usb 
    1111endef 
    1212 
  • trunk/target/linux/omap35xx/config-2.6.32

    r22846 r24084  
    341341CONFIG_EXPERIMENTAL=y 
    342342CONFIG_EXPORTFS=m 
    343 # CONFIG_EXT2_FS_XATTR is not set 
    344 # CONFIG_EXT2_FS_XIP is not set 
    345 CONFIG_EXT2_FS=y 
    346 # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set 
    347 # CONFIG_EXT3_FS_XATTR is not set 
    348 CONFIG_EXT3_FS=y 
    349 # CONFIG_EXT4_DEBUG is not set 
    350 CONFIG_EXT4_FS=m 
    351 CONFIG_EXT4_FS_POSIX_ACL=y 
    352 CONFIG_EXT4_FS_SECURITY=y 
    353 CONFIG_EXT4_FS_XATTR=y 
     343CONFIG_EXT4_FS=y 
    354344# CONFIG_EZX_PCAP is not set 
    355345CONFIG_FAIR_GROUP_SCHED=y 
  • trunk/target/linux/omap35xx/gumstix/config-2.6.34

    r22571 r24084  
    108108CONFIG_ENABLE_MUST_CHECK=y 
    109109CONFIG_EXPORTFS=m 
    110 CONFIG_EXT2_FS=y 
    111 CONFIG_EXT3_FS=y 
    112 CONFIG_EXT4_FS=m 
    113 CONFIG_EXT4_FS_POSIX_ACL=y 
    114 CONFIG_EXT4_FS_SECURITY=y 
    115 CONFIG_EXT4_FS_XATTR=y 
     110CONFIG_EXT4_FS=y 
    116111CONFIG_FAT_FS=y 
    117112CONFIG_FB=y 
  • trunk/target/linux/omap35xx/gumstix/config-2.6.36

    r23688 r24084  
    120120CONFIG_ENABLE_MUST_CHECK=y 
    121121CONFIG_EXPORTFS=m 
    122 CONFIG_EXT2_FS=y 
    123 CONFIG_EXT3_FS=y 
    124 CONFIG_EXT4_FS=m 
    125 CONFIG_EXT4_FS_POSIX_ACL=y 
    126 CONFIG_EXT4_FS_SECURITY=y 
    127 CONFIG_EXT4_FS_XATTR=y 
     122CONFIG_EXT4_FS=y 
    128123CONFIG_FAT_FS=y 
    129124CONFIG_FB=y 
  • trunk/target/linux/orion/harddisk/config-default

    r18367 r24084  
    1111# CONFIG_DM_UEVENT is not set 
    1212# CONFIG_DM_ZERO is not set 
    13 CONFIG_EXT2_FS=y 
    14 CONFIG_EXT3_FS=y 
     13CONFIG_EXT4_FS=y 
    1514CONFIG_JBD=y 
    1615CONFIG_LBD=y 
  • trunk/target/linux/rb532/config-2.6.32

    r21749 r24084  
    6262CONFIG_DMA_NONCOHERENT=y 
    6363# CONFIG_ENABLE_WARN_DEPRECATED is not set 
    64 CONFIG_EXT2_FS=y 
     64CONFIG_EXT4_FS=y 
    6565# CONFIG_FSNOTIFY is not set 
    6666CONFIG_GENERIC_CLOCKEVENTS=y 
  • trunk/target/linux/rb532/config-2.6.33

    r21750 r24084  
    6464CONFIG_DMA_NONCOHERENT=y 
    6565# CONFIG_ENABLE_WARN_DEPRECATED is not set 
    66 CONFIG_EXT2_FS=y 
     66CONFIG_EXT4_FS=y 
    6767# CONFIG_FSNOTIFY is not set 
    6868CONFIG_GENERIC_CLOCKEVENTS=y 
  • trunk/target/linux/rb532/config-2.6.34

    r21995 r24084  
    6464CONFIG_DMA_NONCOHERENT=y 
    6565# CONFIG_ENABLE_WARN_DEPRECATED is not set 
    66 CONFIG_EXT2_FS=y 
     66CONFIG_EXT4_FS=y 
    6767# CONFIG_FSNOTIFY is not set 
    6868CONFIG_GENERIC_CLOCKEVENTS=y 
  • trunk/target/linux/rb532/config-2.6.35

    r21994 r24084  
    6868CONFIG_DMA_NONCOHERENT=y 
    6969# CONFIG_ENABLE_WARN_DEPRECATED is not set 
    70 CONFIG_EXT2_FS=y 
     70CONFIG_EXT4_FS=y 
    7171# CONFIG_FSNOTIFY is not set 
    7272CONFIG_GENERIC_CLOCKEVENTS=y 
  • trunk/target/linux/s3c24xx/openmoko-gta02/config-2.6.30

    r23592 r24084  
    7575CONFIG_EXT2_FS=y 
    7676CONFIG_EXT3_FS=y 
     77CONFIG_EXT4_FS=y 
    7778CONFIG_FB_CFB_COPYAREA=y 
    7879CONFIG_FB_CFB_FILLRECT=y 
  • trunk/target/linux/uml/Makefile

    r23851 r24084  
    2121BOARD:=uml 
    2222BOARDNAME:=User Mode Linux 
    23 FEATURES:=ext2 audio 
     23FEATURES:=ext4 audio 
    2424LINUX_CONFIG:=$(CURDIR)/config/$(ARCH) 
    2525 
  • trunk/target/linux/x86/Makefile

    r23926 r24084  
    1010BOARD:=x86 
    1111BOARDNAME:=x86 
    12 FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia targz 
     12FEATURES:=squashfs jffs2 ext4 vdi vmdk pcmcia targz 
    1313SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos 
    1414 
    15 LINUX_VERSION:=2.6.32.25 
     15LINUX_VERSION:=2.6.36 
    1616 
    1717include $(INCLUDE_DIR)/target.mk 
  • trunk/target/linux/x86/config-default

    r24081 r24084  
    102102# CONFIG_ELPLUS is not set 
    103103# CONFIG_EUROTECH_WDT is not set 
    104 CONFIG_EXT2_FS=y 
     104CONFIG_EXT4_FS=y 
    105105CONFIG_FIRMWARE_IN_KERNEL=y 
    106106CONFIG_FIRMWARE_MEMMAP=y 
  • trunk/target/linux/x86/image/Config.in

    r23414 r24084  
    22        bool "Build GRUB images (Linux x86 or x86_64 host only)" 
    33        depends TARGET_x86 && !TARGET_x86_olpc 
    4         depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS 
     4        depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS 
    55        select PACKAGE_grub 
    66        default y 
     
    3636        depends X86_GRUB_IMAGES 
    3737        depends TARGET_x86_generic 
    38         depends TARGET_ROOTFS_EXT2FS 
     38        depends TARGET_ROOTFS_EXT4FS 
    3939        select PACKAGE_kmod-pcnet32 
    4040 
     
    4343        depends X86_GRUB_IMAGES 
    4444        depends TARGET_x86_generic 
    45         depends TARGET_ROOTFS_EXT2FS 
     45        depends TARGET_ROOTFS_EXT4FS 
    4646        select PACKAGE_kmod-e1000 
    4747 
     
    5050        bool "Build images with bootscript" 
    5151        depends TARGET_x86_olpc 
    52         depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS 
     52        depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS 
    5353 
    5454 
  • trunk/target/linux/x86/image/Makefile

    r22553 r24084  
    3636  BOOTOPTS:=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS)) 
    3737 
    38   define Image/cmdline/ext2 
    39     root=$(ROOTPART) rootfstype=ext2 rootwait 
     38  define Image/cmdline/ext4 
     39    root=$(ROOTPART) rootfstype=ext4 rootwait 
    4040  endef 
    4141   
     
    8989ifneq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),) 
    9090 
    91   define Image/cmdline/ext2 
    92     root=$(ROOTPART) rootfstype=ext2 rootwait 
     91  define Image/cmdline/ext4 
     92    root=$(ROOTPART) rootfstype=ext4 rootwait 
    9393  endef 
    9494 
     
    142142  define Image/Build/vdi 
    143143    # left here because the image builder doesnt need these 
    144     ifeq ($(1),ext2) 
     144    ifeq ($(1),ext4) 
    145145                rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true 
    146146                qemu-img convert -f raw -O vdi \ 
     
    156156  define Image/Build/vmdk 
    157157    # left here because the image builder doesnt need these 
    158     ifeq ($(1),ext2) 
     158    ifeq ($(1),ext4) 
    159159                rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true 
    160160                qemu-img convert -f raw -O vmdk \ 
     
    185185        $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img 
    186186        $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz 
    187   ifeq ($(1),ext2) 
     187  ifeq ($(1),ext4) 
    188188        gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img 
    189189        gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img 
  • trunk/target/linux/xburst/config-2.6.34

    r21438 r24084  
    6868CONFIG_ELF_CORE=y 
    6969CONFIG_ENABLE_MUST_CHECK=y 
    70 CONFIG_EXT2_FS=y 
    71 CONFIG_EXT3_FS=y 
     70CONFIG_EXT4_FS=y 
    7271CONFIG_FAT_FS=y 
    7372# CONFIG_FB_JZ4740 is not set 
  • trunk/target/linux/xburst/config-2.6.35

    r22777 r24084  
    6969CONFIG_ELF_CORE=y 
    7070CONFIG_ENABLE_MUST_CHECK=y 
    71 CONFIG_EXT2_FS=y 
    72 CONFIG_EXT3_FS=y 
     71CONFIG_EXT4_FS=y 
    7372CONFIG_FAT_FS=y 
    7473# CONFIG_FB_JZ4740 is not set 
  • trunk/target/linux/xburst/config-2.6.36

    r23421 r24084  
    7070CONFIG_ELF_CORE=y 
    7171CONFIG_ENABLE_MUST_CHECK=y 
    72 CONFIG_EXT2_FS=y 
    73 CONFIG_EXT3_FS=y 
     72CONFIG_EXT4_FS=y 
    7473CONFIG_FAT_FS=y 
    7574# CONFIG_FB_JZ4740 is not set 
Note: See TracChangeset for help on using the changeset viewer.