commit 33096be8f3a0f884e2bba087c3f59024404b95b4
parent 56de27e0fe45036332dca9ce5eb73122547bc33f
Author: Álvaro Fernández Rojas <noltari@gmail.com>
Date: Tue, 21 Mar 2017 08:16:48 +0100
Merge pull request #4147 from diizzyy/patch-35
utils/dosfstools: Update to 4.1
Diffstat:
3 files changed, 5 insertions(+), 39 deletions(-)
diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile
@@ -8,13 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dosfstools
-PKG_VERSION:=4.0
-PKG_RELEASE:=2
+PKG_VERSION:=4.1
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/dosfstools/dosfstools/releases/download/v$(PKG_VERSION)/ \
http://fossies.org/linux/misc
-PKG_MD5SUM:=9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf
+PKG_HASH:=e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
PKG_LICENSE:=GPL-3.0+
diff --git a/utils/dosfstools/patches/0001-mkfs-Default-to-64-32-heads-sectors-for-targets-smal.patch b/utils/dosfstools/patches/0001-mkfs-Default-to-64-32-heads-sectors-for-targets-smal.patch
@@ -1,34 +0,0 @@
-From 1e76e5778a1885452939a79d9145b80634a5b023 Mon Sep 17 00:00:00 2001
-From: Andreas Bombe <aeb@debian.org>
-Date: Wed, 11 May 2016 03:44:58 +0200
-Subject: [PATCH] mkfs: Default to 64/32 heads/sectors for targets smaller than
- 512 MB
-
-This may put defaults in certain use cases a little bit more in line
-with the old defaults in versions up to 3.0.28. It has mostly aesthetic
-value in most cases.
-
-Signed-off-by: Andreas Bombe <aeb@debian.org>
----
- src/mkfs.fat.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/src/mkfs.fat.c
-+++ b/src/mkfs.fat.c
-@@ -519,6 +519,16 @@ static void establish_params(struct devi
- unsigned int cluster_size = 4; /* starting point for FAT12 and FAT16 */
- int def_root_dir_entries = 512;
-
-+ if (info->size < 512 * 1024 * 1024) {
-+ /*
-+ * These values are more or less meaningless, but we can at least
-+ * use less extreme values for smaller filesystems where the large
-+ * dummy values signifying LBA only access are not needed.
-+ */
-+ sec_per_track = 32;
-+ heads = 64;
-+ }
-+
- if (info->type != TYPE_FIXED) {
- /* enter default parameters for floppy disks if the size matches */
- switch (info->size / 1024) {
diff --git a/utils/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch b/utils/dosfstools/patches/0002-Switch-to-AC_CHECK_LIB-for-iconv-library-linking.patch
@@ -23,5 +23,5 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-AC_SEARCH_LIBS(iconv_open, iconv)
+AC_CHECK_LIB(iconv, iconv_open)
- AC_CONFIG_FILES([Makefile src/Makefile src/version.h
- manpages/Makefile manpages/mkfs.fat.8
+ # xxd (distributed with vim) is used in the testsuite
+ AC_CHECK_PROG([XXD_FOUND], [xxd], [yes])
