add target dosfstools and use it

diff --git a/make/applications.mk b/make/applications.mk
index 3827e9f00b33b1a651de89de660396cd0ec96a3d..25a63503486d59c79b1ae6fdb8fc80ede6c4a6f8 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -131,6 +131,27 @@ $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGETPREFIX)
        $(REMOVE)/e2fsprogs-$(E2FSPROGS_VER)
        $(TOUCH)
 
+DOSFSTOOLS_CFLAGS = $(TARGET_CFLAGS) -D_GNU_SOURCE -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
+
+$(D)/dosfstools: $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz | $(TARGETPREFIX)
+       $(START_BUILD)
+       $(REMOVE)/dosfstools-$(DOSFSTOOLS_VER)
+       $(UNTAR)/dosfstools-$(DOSFSTOOLS_VER).tar.xz
+       set -e; cd $(BUILD_TMP)/dosfstools-$(DOSFSTOOLS_VER); \
+               autoreconf -fi; \
+               $(CONFIGURE) \
+                       --prefix= \
+                       --mandir=/.remove \
+                       --docdir=/.remove \
+                       --without-udev \
+                       --enable-compat-symlinks \
+                       CFLAGS="$(DOSFSTOOLS_CFLAGS)" \
+               ; \
+               $(MAKE); \
+               $(MAKE) install DESTDIR=$(TARGETPREFIX)
+       $(REMOVE)/dosfstools-$(DOSFSTOOLS_VER)
+       $(TOUCH)
+
 $(D)/hotplug: $(D)/libblkid $(D)/libuuid $(ARCHIVE)/hotplug.tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
        $(UNTAR)/hotplug.tar.gz

diff --git a/make/archives.mk b/make/archives.mk
index 9131af7bfbdcaac71cfa0b34700070d73e607392..593081e7abc4697b7ef12843b59cdb2fc2d3b15b 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -171,6 +171,9 @@ $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz:
 $(ARCHIVE)/e2fsprogs-$(HOST_E2FSPROGS_VER).tar.gz:
        $(WGET) https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/v$(HOST_E2FSPROGS_VER)/e2fsprogs-$(HOST_E2FSPROGS_VER).tar.gz
 
+$(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz:
+       $(WGET) https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VER)/dosfstools-$(DOSFSTOOLS_VER).tar.xz
+
 $(ARCHIVE)/xfsprogs-3.1.11.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/xfsprogs-3.1.11.tar.gz
 

diff --git a/make/bootstrap.mk b/make/bootstrap.mk
index f2b55f9c2d9e5d19ffc93efc03eedf3cba95a5fd..7ce390ed758b45b3d878ffca89c61ec75165be70 100755 (executable)
--- a/make/bootstrap.mk
+++ b/make/bootstrap.mk
@@ -13,6 +13,7 @@ BOOTSTRAP += $(D)/host_mkcramfs
 BOOTSTRAP += $(D)/host_mksquashfs
 ifeq ($(BOXTYPE), armbox)
 BOOTSTRAP += $(D)/host_resize2fs
+BOOTSTRAP += $(D)/host_dosfstools
 BOOTSTRAP += $(D)/cortex-strings
 endif
 ifeq ($(BOXSERIES), hd2)
@@ -24,6 +25,7 @@ bootstrap: $(BOOTSTRAP)
 SYSTEM_TOOLS  = $(D)/busybox
 SYSTEM_TOOLS += $(D)/zlib
 SYSTEM_TOOLS += $(D)/e2fsprogs
+SYSTEM_TOOLS += $(D)/dosfstools
 SYSTEM_TOOLS += $(D)/exfat-utils
 SYSTEM_TOOLS += $(D)/util-linux
 SYSTEM_TOOLS += $(D)/vsftpd
@@ -173,6 +175,24 @@ $(D)/host_resize2fs: $(ARCHIVE)/e2fsprogs-$(HOST_E2FSPROGS_VER).tar.gz
        $(REMOVE)/e2fsprogs-$(HOST_E2FSPROGS_VER)
        $(TOUCH)
 
+#
+# host_dosfstools
+#
+$(D)/host_dosfstools: $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz
+       $(START_BUILD)
+       $(UNTAR)/dosfstools-$(DOSFSTOOLS_VER).tar.xz
+       set -e; cd $(BUILD_TMP)/dosfstools-$(DOSFSTOOLS_VER); \
+               ./configure \
+                       --without-udev \
+               ; \
+               $(MAKE)
+       install -D -m 0755 $(BUILD_TMP)/dosfstools-$(DOSFSTOOLS_VER)/src/mkfs.fat $(HOSTPREFIX)/bin/
+       ln -sf mkfs.fat $(HOSTPREFIX)/bin/mkfs.vfat
+       ln -sf mkfs.fat $(HOSTPREFIX)/bin/mkfs.msdos
+       ln -sf mkfs.fat $(HOSTPREFIX)/bin/mkdosfs
+       $(REMOVE)/dosfstools-$(DOSFSTOOLS_VER)
+       $(TOUCH)
+
 #
 # cortex-strings
 #

diff --git a/make/versions.mk b/make/versions.mk
index 5fcd1df5de386ff3ab5aa16baa0e144b30a35df9..21ff264939fda3693453d318d205195478b0c497 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -46,6 +46,9 @@ CURL_VER = 7.61.0
 # e2fsprogs; filesystem utilities for use with the ext[x] filesystem
 E2FSPROGS_VER=1.42.13
 
+# dosfstools consists of the programs mkfs.fat, fsck.fat and fatlabel to create, check and label file systems of the FAT family.
+DOSFSTOOLS_VER = 4.1
+
 # Free exFAT file system implementation
 FUSE_EXFAT_VER=1.2.8