Make mkfs.vfat and mkdosfs individually selectable

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

4 files changed, 19 insertions, 10 deletions

diff --git a/include/applets.src.h b/include/applets.src.h
index 0293952ef..f834d9040 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -203,11 +203,9 @@ IF_MAN(APPLET(man, BB_DIR_USR_BIN, BB_SUID_DROP))
 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_MKFIFO(APPLET_NOEXEC(mkfifo, mkfifo, BB_DIR_USR_BIN, BB_SUID_DROP, mkfifo))
 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))
 IF_MKNOD(APPLET_NOEXEC(mknod, mknod, BB_DIR_BIN, BB_SUID_DROP, mknod))
 IF_MKSWAP(APPLET(mkswap, BB_DIR_SBIN, BB_SUID_DROP))
 IF_MORE(APPLET(more, BB_DIR_BIN, BB_SUID_DROP))
diff --git a/util-linux/Config.src b/util-linux/Config.src
index 72d3be1f8..9bef0d532 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -272,13 +272,6 @@ config MKFS_REISER
           Utility to create ReiserFS filesystems.
           Note: this applet needs a lot of testing and polishing.
 
-config MKFS_VFAT
-        bool "mkfs_vfat"
-        default y
-        select PLATFORM_LINUX
-        help
-          Utility to create FAT32 filesystems.
-
 config GETOPT
         bool "getopt"
         default y
diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src
index 41cf77809..dfd50afa2 100644
--- a/util-linux/Kbuild.src
+++ b/util-linux/Kbuild.src
@@ -28,7 +28,6 @@ lib-$(CONFIG_LSPCI)             += lspci.o
 lib-$(CONFIG_LSUSB)             += lsusb.o
 lib-$(CONFIG_MKFS_MINIX)        += mkfs_minix.o
 lib-$(CONFIG_MKFS_REISER)       += mkfs_reiser.o
-lib-$(CONFIG_MKFS_VFAT)         += mkfs_vfat.o
 lib-$(CONFIG_MKSWAP)            += mkswap.o
 lib-$(CONFIG_MORE)              += more.o
 lib-$(CONFIG_MOUNT)             += mount.o
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index d53c751eb..ab70853a1 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -7,6 +7,25 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+//config:config MKDOSFS
+//config:       bool "mkdosfs"
+//config:       default y
+//config:       select PLATFORM_LINUX
+//config:       help
+//config:         Utility to create FAT32 filesystems.
+//config:
+//config:config MKFS_VFAT
+//config:       bool "mkfs.vfat"
+//config:       default y
+//config:       select PLATFORM_LINUX
+//config:       help
+//config:         Alias to "mkdosfs".
+
+//applet:IF_MKDOSFS(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat))
+//applet:IF_MKFS_VFAT(APPLET_ODDNAME(mkfs.vfat, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat))
+
+//kbuild:lib-$(CONFIG_MKDOSFS) += mkfs_vfat.o
+//kbuild:lib-$(CONFIG_MKFS_VFAT) += mkfs_vfat.o
 
 //usage:#define mkfs_vfat_trivial_usage
 //usage:       "[-v] [-n LABEL] BLOCKDEV [KBYTES]"