diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-16 16:12:11 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-16 16:12:11 +0100 |
| commit | 0581a2f3041184db1af997305908e211d3e4e34f (patch) | |
| tree | 4cadd22998d5f63d3743e0739f5b6963100f456a | |
| parent | eb3fdc843e4a56740f2de41a0a7e37c25bde246c (diff) | |
| download | busybox-0581a2f3041184db1af997305908e211d3e4e34f.tar.gz | |
Make mke2fs and mkfs.ext2 individually selectable
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/applets.src.h | 3 | ||||
| -rw-r--r-- | util-linux/Config.src | 7 | ||||
| -rw-r--r-- | util-linux/Kbuild.src | 1 | ||||
| -rw-r--r-- | util-linux/mkfs_ext2.c | 20 |
4 files changed, 20 insertions, 11 deletions
diff --git a/include/applets.src.h b/include/applets.src.h index 36e1f0266..0293952ef 100644 --- a/include/applets.src.h +++ b/include/applets.src.h @@ -204,10 +204,7 @@ IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP)) IF_MICROCOM(APPLET(microcom, BB_DIR_USR_BIN, BB_SUID_DROP)) IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir)) IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat)) -IF_MKFS_EXT2(APPLET_ODDNAME(mke2fs, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) IF_MKFIFO(APPLET_NOEXEC(mkfifo, mkfifo, BB_DIR_USR_BIN, BB_SUID_DROP, mkfifo)) -IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) -//IF_MKE2FS(APPLET_ODDNAME(mkfs.ext3, mke2fs, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext3)) IF_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, BB_DIR_SBIN, BB_SUID_DROP, mkfs_minix)) IF_MKFS_REISER(APPLET_ODDNAME(mkfs.reiser, mkfs_reiser, BB_DIR_SBIN, BB_SUID_DROP, mkfs_reiser)) IF_MKFS_VFAT(APPLET_ODDNAME(mkfs.vfat, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat)) diff --git a/util-linux/Config.src b/util-linux/Config.src index ee0d8a632..72d3be1f8 100644 --- a/util-linux/Config.src +++ b/util-linux/Config.src @@ -246,13 +246,6 @@ config FSCK_MINIX check for and attempt to repair any corruption that occurs to a minix filesystem. -config MKFS_EXT2 - bool "mkfs_ext2" - default y - select PLATFORM_LINUX - help - Utility to create EXT2 filesystems. - config MKFS_MINIX bool "mkfs_minix" default y diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src index 5ee5cf7ff..41cf77809 100644 --- a/util-linux/Kbuild.src +++ b/util-linux/Kbuild.src @@ -26,7 +26,6 @@ lib-$(CONFIG_IPCS) += ipcs.o lib-$(CONFIG_LOSETUP) += losetup.o lib-$(CONFIG_LSPCI) += lspci.o lib-$(CONFIG_LSUSB) += lsusb.o -lib-$(CONFIG_MKFS_EXT2) += mkfs_ext2.o lib-$(CONFIG_MKFS_MINIX) += mkfs_minix.o lib-$(CONFIG_MKFS_REISER) += mkfs_reiser.o lib-$(CONFIG_MKFS_VFAT) += mkfs_vfat.o diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index 413e7aa15..5816a208e 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c @@ -7,6 +7,26 @@ * * Licensed under GPLv2, see file LICENSE in this source tree. */ +//config:config MKE2FS +//config: bool "mke2fs" +//config: default y +//config: select PLATFORM_LINUX +//config: help +//config: Utility to create EXT2 filesystems. +//config: +//config:config MKFS_EXT2 +//config: bool "mkfs.ext2" +//config: default y +//config: select PLATFORM_LINUX +//config: help +//config: Alias to "mke2fs". + +//applet:IF_MKE2FS(APPLET_ODDNAME(mke2fs, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) +//applet:IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) +////////:IF_MKFS_EXT3(APPLET_ODDNAME(mkfs.ext3, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) + +//kbuild:lib-$(CONFIG_MKE2FS) += mkfs_ext2.o +//kbuild:lib-$(CONFIG_MKFS_EXT2) += mkfs_ext2.o //usage:#define mkfs_ext2_trivial_usage //usage: "[-Fn] " |