[Buildroot] [PATCH v4 2/5] fs/ext2: deprecate BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES option
Arnout Vandecappelle
arnout at mind.be
Tue Jul 4 12:00:51 UTC 2017
On 04-07-17 13:21, Samuel Martin wrote:
> Soon, the ext{2,3,4} rootfs image will no longer be generated with
> genext2fs, but using mke2fs instead which has no support for the extra
> inode number option.
>
> So, deprecate the BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES option and
> recommend, in lieu, to set the total inode number, taking account of
> the extra ones if needed.
>
> Signed-off-by: Samuel Martin <s.martin49 at gmail.com>
> Cc: Sébastien Szymanski <sebastien.szymanski at armadeus.com>
> Cc: "Yann E. MORIN" <yann.morin.1998 at free.fr>
>
> ---
> changes v3->v4:
> - rename deprecate prompt in Config.in.legacy (Arnout)
> - introduce a _WRAP symbol to actually select BR2_LEGACY when needed
> (Arnout)
>
> changes v2->v3:
> - new patch (Yann)
> ---
> Config.in.legacy | 16 ++++++++++++++++
> fs/ext2/Config.in | 8 --------
> fs/ext2/ext2.mk | 1 -
> 3 files changed, 16 insertions(+), 9 deletions(-)
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 453c5eb8b8..1ec8d3a76e 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -145,6 +145,22 @@ endif
> ###############################################################################
> comment "Legacy options removed in 2017.08"
>
> +config BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES
> + int "ext2 extra inodes has been removed" if BR2_TARGET_ROOTFS_EXT2_INODES = 0
> + default 0
> + help
> + Buildroot now uses mkfs.ext2/3/4 to generate ext2/3/4 images. So
> + let mkfs automatically selects the number of inodes needed. Set
> + this option to 0.
> + Note that, the number of inodes can still be set and passed to
> + mkfs; so if extra inodes are needed, prefer setting
> + BR2_TARGET_ROOTFS_EXT2_INODES taking account of them.
Buildroot now uses mkfs.ext2/3/4 to generate ext2/3/4 images. It
now automatically selects the number of inodes based on the image
size. The extra number of inodes can no longer be provided; instead,
provide the total number of inodes needed in
BR2_TARGET_ROOTFS_EXT2_INODES.
Regards,
Arnout
> +
> +config BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES_WRAP
> + bool
> + default y if BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES != 0
> + select BR2_LEGACY
> +
> config BR2_STRIP_none
> bool "Strip command 'none' has been removed"
> select BR2_LEGACY
> diff --git a/fs/ext2/Config.in b/fs/ext2/Config.in
> index ec69f05cb7..e573a3ca9b 100644
> --- a/fs/ext2/Config.in
> +++ b/fs/ext2/Config.in
> @@ -79,14 +79,6 @@ config BR2_TARGET_ROOTFS_EXT2_INODES
> int "exact number of inodes (leave at 0 for auto calculation)"
> default 0
>
> -config BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES
> - int "extra inodes" if BR2_TARGET_ROOTFS_EXT2_INODES = 0
> - default 0
> - help
> - Enter here the number of extra free inodes you want on
> - your filesystem. By default, Buildroot will not leave
> - many free inodes.
> -
> config BR2_TARGET_ROOTFS_EXT2_RESBLKS
> int "reserved blocks percentage"
> default 5
> diff --git a/fs/ext2/ext2.mk b/fs/ext2/ext2.mk
> index ec49caa3a5..24643afeb9 100644
> --- a/fs/ext2/ext2.mk
> +++ b/fs/ext2/ext2.mk
> @@ -15,7 +15,6 @@ EXT2_OPTS = \
> -B $(BR2_TARGET_ROOTFS_EXT2_BLOCK_SIZE) \
> -b $(BR2_TARGET_ROOTFS_EXT2_BLOCKS) \
> -i $(BR2_TARGET_ROOTFS_EXT2_INODES) \
> - -I $(BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES) \
> -r $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) \
> -l "$(EXT2_LABEL)"
>
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
More information about the buildroot
mailing list