aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-02 12:44:10 +0000
committerJohn Crispin <john@openwrt.org>2014-06-02 12:44:10 +0000
commit14421bd7fbc53ced274d758fe3d6fe53ee8c7b20 (patch)
tree2a5bf5fb0bcb3cd3d7d9e5aa1e44b2b07b6309db
parent5fd7e00d9d8e624e460342e40a450566f2b70907 (diff)
downloadupstream-14421bd7fbc53ced274d758fe3d6fe53ee8c7b20.tar.gz
upstream-14421bd7fbc53ced274d758fe3d6fe53ee8c7b20.tar.bz2
upstream-14421bd7fbc53ced274d758fe3d6fe53ee8c7b20.zip
image: ext4: rename config options as these are only used for ext4 image creation
Signed-off-by: Michael Heimpold <mhei@heimpold.de> SVN-Revision: 40926
-rw-r--r--config/Config-images.in4
-rw-r--r--include/image.mk2
2 files changed, 3 insertions, 3 deletions
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