From: John Crispin Date: Mon, 2 Jun 2014 12:44:10 +0000 (+0000) Subject: image: ext4: rename config options as these are only used for ext4 image creation X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=3db5331e75dc77f5c43cd802d4e18325eced0650 image: ext4: rename config options as these are only used for ext4 image creation Signed-off-by: Michael Heimpold SVN-Revision: 40926 --- diff --git a/config/Config-images.in b/config/Config-images.in index 636a868d59..daed0f5390 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -72,14 +72,14 @@ menu "Target Images" help Build a ext4 root filesystem - config TARGET_ROOTFS_MAXINODE + config TARGET_EXT4_MAXINODE int "Maximum number of inodes in root filesystem" depends on TARGET_ROOTFS_EXT4FS default 6000 help Allows you to change the maximum number of inodes in the root filesystem - config TARGET_ROOTFS_RESERVED_PCT + config TARGET_EXT4_RESERVED_PCT int "Percentage of reserved blocks in root filesystem" depends on TARGET_ROOTFS_EXT4FS default 0 diff --git a/include/image.mk b/include/image.mk index 2f60ce06d9..a03d418529 100644 --- a/include/image.mk +++ b/include/image.mk @@ -188,7 +188,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_EXT4FS),) define Image/mkfs/ext4 # generate an ext2 fs - $(STAGING_DIR_HOST)/bin/genext2fs -U -B $(CONFIG_TARGET_EXT4_BLOCKSIZE) -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext4 -m $(CONFIG_TARGET_ROOTFS_RESERVED_PCT) $(MKFS_DEVTABLE_OPT) + $(STAGING_DIR_HOST)/bin/genext2fs -U -B $(CONFIG_TARGET_EXT4_BLOCKSIZE) -b $(E2SIZE) -N $(CONFIG_TARGET_EXT4_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext4 -m $(CONFIG_TARGET_EXT4_RESERVED_PCT) $(MKFS_DEVTABLE_OPT) # convert it to ext4 $(STAGING_DIR_HOST)/bin/tune2fs $(if $(CONFIG_TARGET_EXT4_JOURNAL),-j) -O extents,uninit_bg,dir_index $(KDIR)/root.ext4 # fix it up