dosfstools: Update to version 4.2

Message ID 20210908212114.1600106-1-adolf.belka@ipfire.org
State Accepted
Commit 923cf5358ca02c25bb57efb39fa5d00740c86364
Headers
Series dosfstools: Update to version 4.2 |

Commit Message

Adolf Belka Sept. 8, 2021, 9:21 p.m. UTC
  - Update from 3.0.9 (2013) to 4.2 (2021)
- Update rootfile
- Program names changed in version 2.0.18
    dosfslabel became fatlabel
    dosfsck became fsck.fat
    and mkdosfs became mkfs.fat
- Added --enable-compat-symlinks to ./configure command to maintain original names as
   symlinks

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 config/rootfiles/common/dosfstools | 47 +++++++++++++++++-------------
 lfs/dosfstools                     |  9 ++++--
 2 files changed, 32 insertions(+), 24 deletions(-)
  

Comments

Peter Müller Sept. 9, 2021, 8:30 p.m. UTC | #1
Glad to see this updated. :-)

Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

> - Update from 3.0.9 (2013) to 4.2 (2021)
> - Update rootfile
> - Program names changed in version 2.0.18
>     dosfslabel became fatlabel
>     dosfsck became fsck.fat
>     and mkdosfs became mkfs.fat
> - Added --enable-compat-symlinks to ./configure command to maintain original names as
>    symlinks
> 
> Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
> ---
>  config/rootfiles/common/dosfstools | 47 +++++++++++++++++-------------
>  lfs/dosfstools                     |  9 ++++--
>  2 files changed, 32 insertions(+), 24 deletions(-)
> 
> diff --git a/config/rootfiles/common/dosfstools b/config/rootfiles/common/dosfstools
> index 4b38c2926..200066aac 100644
> --- a/config/rootfiles/common/dosfstools
> +++ b/config/rootfiles/common/dosfstools
> @@ -1,28 +1,33 @@
>  sbin/dosfsck
>  sbin/dosfslabel
> +sbin/fatlabel
> +sbin/fsck.fat
>  sbin/fsck.msdos
>  sbin/fsck.vfat
>  sbin/mkdosfs
> +sbin/mkfs.fat
>  sbin/mkfs.msdos
>  sbin/mkfs.vfat
> -#share
> -#share/doc
> -#share/doc/dosfstools
> -#share/doc/dosfstools/ANNOUNCE.mkdosfs
> -#share/doc/dosfstools/ChangeLog
> -#share/doc/dosfstools/ChangeLog.dosfsck
> -#share/doc/dosfstools/ChangeLog.dosfstools-2.x
> -#share/doc/dosfstools/ChangeLog.mkdosfs
> -#share/doc/dosfstools/README.dosfsck
> -#share/doc/dosfstools/README.dosfstools-2.x
> -#share/doc/dosfstools/README.mkdosfs
> -#share/doc/dosfstools/TODO.dosfstools-2.x
> -#share/man
> -#share/man/man8
> -#share/man/man8/dosfsck.8
> -#share/man/man8/dosfslabel.8
> -#share/man/man8/fsck.msdos.8
> -#share/man/man8/fsck.vfat.8
> -#share/man/man8/mkdosfs.8
> -#share/man/man8/mkfs.msdos.8
> -#share/man/man8/mkfs.vfat.8
> +#usr/share/doc/dosfstools
> +#usr/share/doc/dosfstools/ANNOUNCE.mkdosfs
> +#usr/share/doc/dosfstools/COPYING
> +#usr/share/doc/dosfstools/ChangeLog
> +#usr/share/doc/dosfstools/ChangeLog.dosfsck
> +#usr/share/doc/dosfstools/ChangeLog.dosfstools-2.x
> +#usr/share/doc/dosfstools/ChangeLog.mkdosfs
> +#usr/share/doc/dosfstools/NEWS
> +#usr/share/doc/dosfstools/README
> +#usr/share/doc/dosfstools/README.dosfsck
> +#usr/share/doc/dosfstools/README.dosfstools-2.x
> +#usr/share/doc/dosfstools/README.mkdosfs
> +#usr/share/doc/dosfstools/TODO.dosfstools-2.x
> +#usr/share/man/man8/dosfsck.8
> +#usr/share/man/man8/dosfslabel.8
> +#usr/share/man/man8/fatlabel.8
> +#usr/share/man/man8/fsck.fat.8
> +#usr/share/man/man8/fsck.msdos.8
> +#usr/share/man/man8/fsck.vfat.8
> +#usr/share/man/man8/mkdosfs.8
> +#usr/share/man/man8/mkfs.fat.8
> +#usr/share/man/man8/mkfs.msdos.8
> +#usr/share/man/man8/mkfs.vfat.8
> diff --git a/lfs/dosfstools b/lfs/dosfstools
> index 8a74661e9..49dddab6b 100644
> --- a/lfs/dosfstools
> +++ b/lfs/dosfstools
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 3.0.9
> +VER        = 4.2
>  
>  THISAPP    = dosfstools-$(VER)
>  DL_FILE    = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = bd273cf8aa6341c0b52cbac72050bcf4
> +$(DL_FILE)_MD5 = 49c8e457327dc61efab5b115a27b087a
>  
>  install : $(TARGET)
>  
> @@ -70,7 +70,10 @@ $(subst %,%_MD5,$(objects)) :
>  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
>  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
> -	cd $(DIR_APP) && sed -i -e "s|PREFIX = /usr/local||g" Makefile
> +	cd $(DIR_APP) && ./configure \
> +					--prefix=/usr \
> +					--sbindir=/sbin \
> +					--enable-compat-symlinks
>  	cd $(DIR_APP) && make $(MAKETUNING)
>  	cd $(DIR_APP) && make install
>  	@rm -rf $(DIR_APP)
>
  

Patch

diff --git a/config/rootfiles/common/dosfstools b/config/rootfiles/common/dosfstools
index 4b38c2926..200066aac 100644
--- a/config/rootfiles/common/dosfstools
+++ b/config/rootfiles/common/dosfstools
@@ -1,28 +1,33 @@ 
 sbin/dosfsck
 sbin/dosfslabel
+sbin/fatlabel
+sbin/fsck.fat
 sbin/fsck.msdos
 sbin/fsck.vfat
 sbin/mkdosfs
+sbin/mkfs.fat
 sbin/mkfs.msdos
 sbin/mkfs.vfat
-#share
-#share/doc
-#share/doc/dosfstools
-#share/doc/dosfstools/ANNOUNCE.mkdosfs
-#share/doc/dosfstools/ChangeLog
-#share/doc/dosfstools/ChangeLog.dosfsck
-#share/doc/dosfstools/ChangeLog.dosfstools-2.x
-#share/doc/dosfstools/ChangeLog.mkdosfs
-#share/doc/dosfstools/README.dosfsck
-#share/doc/dosfstools/README.dosfstools-2.x
-#share/doc/dosfstools/README.mkdosfs
-#share/doc/dosfstools/TODO.dosfstools-2.x
-#share/man
-#share/man/man8
-#share/man/man8/dosfsck.8
-#share/man/man8/dosfslabel.8
-#share/man/man8/fsck.msdos.8
-#share/man/man8/fsck.vfat.8
-#share/man/man8/mkdosfs.8
-#share/man/man8/mkfs.msdos.8
-#share/man/man8/mkfs.vfat.8
+#usr/share/doc/dosfstools
+#usr/share/doc/dosfstools/ANNOUNCE.mkdosfs
+#usr/share/doc/dosfstools/COPYING
+#usr/share/doc/dosfstools/ChangeLog
+#usr/share/doc/dosfstools/ChangeLog.dosfsck
+#usr/share/doc/dosfstools/ChangeLog.dosfstools-2.x
+#usr/share/doc/dosfstools/ChangeLog.mkdosfs
+#usr/share/doc/dosfstools/NEWS
+#usr/share/doc/dosfstools/README
+#usr/share/doc/dosfstools/README.dosfsck
+#usr/share/doc/dosfstools/README.dosfstools-2.x
+#usr/share/doc/dosfstools/README.mkdosfs
+#usr/share/doc/dosfstools/TODO.dosfstools-2.x
+#usr/share/man/man8/dosfsck.8
+#usr/share/man/man8/dosfslabel.8
+#usr/share/man/man8/fatlabel.8
+#usr/share/man/man8/fsck.fat.8
+#usr/share/man/man8/fsck.msdos.8
+#usr/share/man/man8/fsck.vfat.8
+#usr/share/man/man8/mkdosfs.8
+#usr/share/man/man8/mkfs.fat.8
+#usr/share/man/man8/mkfs.msdos.8
+#usr/share/man/man8/mkfs.vfat.8
diff --git a/lfs/dosfstools b/lfs/dosfstools
index 8a74661e9..49dddab6b 100644
--- a/lfs/dosfstools
+++ b/lfs/dosfstools
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER        = 3.0.9
+VER        = 4.2
 
 THISAPP    = dosfstools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = bd273cf8aa6341c0b52cbac72050bcf4
+$(DL_FILE)_MD5 = 49c8e457327dc61efab5b115a27b087a
 
 install : $(TARGET)
 
@@ -70,7 +70,10 @@  $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && sed -i -e "s|PREFIX = /usr/local||g" Makefile
+	cd $(DIR_APP) && ./configure \
+					--prefix=/usr \
+					--sbindir=/sbin \
+					--enable-compat-symlinks
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)