diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2010-11-22 12:12:39 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2010-11-22 12:12:39 +0000 |
commit | c1725149e15b97d88bf8518543be15269bbec6af (patch) | |
tree | 546b7bb3d3fec36635a8979ef611f64be31743d8 /include | |
parent | b0f15545ca8656df1248462a37f17cc789d611de (diff) | |
download | upstream-c1725149e15b97d88bf8518543be15269bbec6af.tar.gz upstream-c1725149e15b97d88bf8518543be15269bbec6af.tar.bz2 upstream-c1725149e15b97d88bf8518543be15269bbec6af.zip |
switch from ext2 to ext4 (w/o) journaling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24084 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r-- | include/image.mk | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/include/image.mk b/include/image.mk index 4ec7d91bf7..d7d981ba1c 100644 --- a/include/image.mk +++ b/include/image.mk @@ -128,12 +128,17 @@ ifneq ($(CONFIG_TARGET_ROOTFS_TARGZ),) endef endif -ifneq ($(CONFIG_TARGET_ROOTFS_EXT2FS),) +ifneq ($(CONFIG_TARGET_ROOTFS_EXT4FS),) E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024))) - define Image/mkfs/ext2 - $(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext2 - $(call Image/Build,ext2) + define Image/mkfs/ext4 +# generate an ext2 fs + $(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext4 +# convert it to ext4 + $(STAGING_DIR_HOST)/bin/tune2fs -O extents,uninit_bg,dir_index $(KDIR)/root.ext4 +# fix it up + $(STAGING_DIR_HOST)/bin/e2fsck -fy $(KDIR)/root.ext4 + $(call Image/Build,ext4) endef endif @@ -184,7 +189,7 @@ define BuildImage $(call Image/BuildKernel) $(call Image/mkfs/cpiogz) $(call Image/mkfs/targz) - $(call Image/mkfs/ext2) + $(call Image/mkfs/ext4) $(call Image/mkfs/iso) $(call Image/mkfs/jffs2) $(call Image/mkfs/squashfs) @@ -195,7 +200,7 @@ define BuildImage $(call Image/BuildKernel) $(call Image/mkfs/cpiogz) $(call Image/mkfs/targz) - $(call Image/mkfs/ext2) + $(call Image/mkfs/ext4) $(call Image/mkfs/iso) $(call Image/mkfs/jffs2) $(call Image/mkfs/squashfs) |