[package] update dosfstools to 3.0.5, split utilities into their own packages (#5885)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@17758 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-09-27 12:43:15 +00:00 · 2009-09-27 12:43:15 +00:00 · b1c9178391
commit b1c9178391
parent 570fd40d1e
3 changed files with 82 additions and 97 deletions
--- a/utils/dosfstools/Makefile
+++ b/utils/dosfstools/Makefile
@ -8,25 +8,50 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=dosfstools
-PKG_VERSION:=2.11
-PKG_RELEASE:=4
+PKG_VERSION:=3.0.5
+PKG_RELEASE:=1

-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).src.tar.gz
-PKG_SOURCE_URL:=ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/
-PKG_MD5SUM:=407d405ade410f7597d364ab5dc8c9f6
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.daniel-baumann.ch/software/dosfstools/
+PKG_MD5SUM:=0ac8c2119d2288958f4e2fd3dd942657

 include $(INCLUDE_DIR)/package.mk

-define Package/dosfstools
+define Package/dosfstools/Default
  SECTION:=utils
  CATEGORY:=Utilities
-  TITLE:=MS-DOS FAT filesystems utilities
-  URL:=ftp://ftp.uni-erlangen.de:/pub/Linux/LOCAL/dosfstools/
+  URL:=http://www.daniel-baumann.ch/software/dosfstools/
  SUBMENU:=Filesystem
 endef

-define Package/dosfstools/description
+define Package/dosfsck
+  $(call Package/dosfstools/Default)
+  TITLE:=dosfsck
+endef
+
+define Package/dosfslabel
+  $(call Package/dosfstools/Default)
+  TITLE:=dosfslabel
+endef
+
+define Package/mkdosfs
+  $(call Package/dosfstools/Default)
+  TITLE:=mkdosfs
+endef
+
+define Package/dosfsck/description
 	Utilities to create and check MS-DOS FAT filesystems.
+	(fsck.vfat and fsck.msdos for checking integrity of FAT volumes)
+endef
+
+define Package/dosfslabel/description
+	Utilities to create and check MS-DOS FAT filesystems.
+	(dosfslabel for reading and writing labels of FAT volumes)
+endef
+
+define Package/mkdosfs/description
+	Utilities to create and check MS-DOS FAT filesystems.
+	(mkfs.vfat and mkfs.msdos for creating FAT volumes)
 endef

 define Build/Configure
@ -44,15 +69,26 @@ define Build/Compile
 		OPTFLAGS="$(TARGET_CFLAGS) -D_FILE_OFFSET_BITS=64" \
 		PREFIX="$(PKG_INSTALL_DIR)/usr" \
 		SBINDIR="$(PKG_INSTALL_DIR)/usr/sbin" \
-		install
+		install-bin
 endef

-define Package/dosfstools/install
+define Package/dosfsck/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dosfsck $(1)/usr/sbin/
 	(cd $(1)/usr/sbin; ln -sf dosfsck fsck.msdos; ln -sf dosfsck fsck.vfat)
+endef
+
+define Package/dosfslabel/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dosfslabel $(1)/usr/sbin/
+endef
+
+define Package/mkdosfs/install
+	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkdosfs $(1)/usr/sbin/
 	(cd $(1)/usr/sbin; ln -sf mkdosfs mkfs.msdos; ln -sf mkdosfs mkfs.vfat)
 endef

-$(eval $(call BuildPackage,dosfstools))
+$(eval $(call BuildPackage,dosfsck))
+$(eval $(call BuildPackage,dosfslabel))
+$(eval $(call BuildPackage,mkdosfs))
--- a/utils/dosfstools/patches/001-symbolic_links.patch
+++ b/utils/dosfstools/patches/001-symbolic_links.patch
@ -1,38 +0,0 @@
-diff -urN dosfstools-2.11.orig/dosfsck/Makefile dosfstools-2.11/dosfsck/Makefile
--- dosfstools-2.11.orig/dosfsck/Makefile	1999-07-06 10:23:11.000000000 -0400
-+++ dosfstools-2.11/dosfsck/Makefile	2006-11-07 07:20:54.000000000 -0500
-@@ -15,11 +15,11 @@
- 	install -m 644 dosfsck.8 $(MANDIR)
- 	rm -f $(SBINDIR)/fsck.msdos
- 	rm -f $(SBINDIR)/fsck.vfat
-	ln -s dosfsck $(SBINDIR)/fsck.msdos
-	ln -s dosfsck $(SBINDIR)/fsck.vfat
-+	ln -sf dosfsck $(SBINDIR)/fsck.msdos
-+	ln -sf dosfsck $(SBINDIR)/fsck.vfat
- 	rm -f $(MANDIR)/fsck.msdos.8
-	ln -s dosfsck.8 $(MANDIR)/fsck.msdos.8
-	ln -s dosfsck.8 $(MANDIR)/fsck.vfat.8
-+	ln -sf dosfsck.8 $(MANDIR)/fsck.msdos.8
-+	ln -sf dosfsck.8 $(MANDIR)/fsck.vfat.8
- 
- clean:
- 	rm -f *.o *.s *.i *~ \#*# tmp_make .#* .new*
-diff -urN dosfstools-2.11.orig/mkdosfs/Makefile dosfstools-2.11/mkdosfs/Makefile
--- dosfstools-2.11.orig/mkdosfs/Makefile	1999-07-06 10:23:32.000000000 -0400
-+++ dosfstools-2.11/mkdosfs/Makefile	2006-11-07 07:20:38.000000000 -0500
-@@ -15,11 +15,11 @@
- 	install -m 644 mkdosfs.8 $(MANDIR)
- 	rm -f $(SBINDIR)/mkfs.msdos
- 	rm -f $(SBINDIR)/mkfs.vfat
-	ln -s mkdosfs $(SBINDIR)/mkfs.msdos
-	ln -s mkdosfs $(SBINDIR)/mkfs.vfat
-+	ln -sf mkdosfs $(SBINDIR)/mkfs.msdos
-+	ln -sf mkdosfs $(SBINDIR)/mkfs.vfat
- 	rm -f $(MANDIR)/mkfs.msdos.8
-	ln -s mkdosfs.8 $(MANDIR)/mkfs.msdos.8
-	ln -s mkdosfs.8 $(MANDIR)/mkfs.vfat.8
-+	ln -sf mkdosfs.8 $(MANDIR)/mkfs.msdos.8
-+	ln -sf mkdosfs.8 $(MANDIR)/mkfs.vfat.8
- 
- clean :
- 	echo *.o *.i *.s *~ \#*# core .#* .new*
--- a/utils/dosfstools/patches/002-linux_26_headers.patch
+++ b/utils/dosfstools/patches/002-linux_26_headers.patch
@ -1,69 +1,56 @@
--- a/dosfsck/common.h
-+++ b/dosfsck/common.h
-@@ -4,9 +4,7 @@
+--- a/src/common.h
+++ b/src/common.h
+@@ -19,7 +19,7 @@
+    can be found in /usr/share/common-licenses/GPL-3 file.
+ */
 
- #include <linux/version.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-# define __KERNEL__
 -# include <asm/types.h>
-# undef __KERNEL__
 +#include <linux/types.h>
- # define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */
- #endif
 
--- a/dosfsck/file.c
-+++ b/dosfsck/file.c
-@@ -18,9 +18,7 @@
+ #ifndef _COMMON_H
+ #define _COMMON_H
+--- a/src/dosfsck.h
+++ b/src/dosfsck.h
+@@ -32,8 +32,8 @@
+ #define _LINUX_STRING_H_	/* hack to avoid inclusion of <linux/string.h>*/
+ #define _LINUX_FS_H             /* hack to avoid inclusion of <linux/fs.h> */
 
- #include <linux/version.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-# define __KERNEL__
 -# include <asm/types.h>
-# undef __KERNEL__
+-# include <asm/byteorder.h>
 +#include <linux/types.h>
- #endif
+#include <asm/byteorder.h>
 
 #include <linux/msdos_fs.h>
--- a/dosfsck/io.c
-+++ b/dosfsck/io.c
-@@ -19,6 +19,10 @@
+ 
+--- a/src/file.c
+++ b/src/file.c
+@@ -34,7 +34,7 @@
+ #define _LINUX_STRING_H_	/* hack to avoid inclusion of <linux/string.h>*/
+ #define _LINUX_FS_H             /* hack to avoid inclusion of <linux/fs.h> */
+ 
+-# include <asm/types.h>
+#include <linux/types.h>
+ 
+ #include <linux/msdos_fs.h>
+ 
+--- a/src/io.c
+++ b/src/io.c
+@@ -37,6 +37,7 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 #include <fcntl.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
 +#include <linux/types.h>
-+#endif
 #include <linux/fd.h>
 
 #include "dosfsck.h"
--- a/mkdosfs/mkdosfs.c
-+++ b/mkdosfs/mkdosfs.c
-@@ -68,9 +68,7 @@
+--- a/src/mkdosfs.c
+++ b/src/mkdosfs.c
+@@ -63,7 +63,7 @@
+ #include <time.h>
+ #include <errno.h>
 
- #include <linux/version.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-# define __KERNEL__
 -# include <asm/types.h>
-# undef __KERNEL__
 +#include <linux/types.h>
- #endif
 
 #if __BYTE_ORDER == __BIG_ENDIAN
--- a/dosfsck/dosfsck.h
-+++ b/dosfsck/dosfsck.h
-@@ -15,13 +15,7 @@
- #define _LINUX_FS_H             /* hack to avoid inclusion of <linux/fs.h> */
 
- #include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-# define __KERNEL__
-# include <asm/types.h>
-# include <asm/byteorder.h>
-# undef __KERNEL__
-#endif
-
-+#include <linux/types.h>
- #include <linux/msdos_fs.h>
- 
- #undef CF_LE_W