X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=utils%2Fdosfstools%2FMakefile;h=fd24c7dd12900327884daed58ca53b1985d2302c;hp=7b47b94a10d3233bf6db23471f49ed001b7a0788;hb=b7464f0a7faa384d95caa43adfe53c2c9399b1f0;hpb=2fe94a455b8875b2385ac6de13979d9fc74d0907

diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile
index 7b47b94a10..fd24c7dd12 100644
--- a/utils/dosfstools/Makefile
+++ b/utils/dosfstools/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,25 +8,50 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dosfstools
-PKG_VERSION:=2.11
-PKG_RELEASE:=4
+PKG_VERSION:=3.0.7
+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:=2df41f537941ac9dff0dd747f2d635c8
 
 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))