X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=utils%2Fdosfstools%2FMakefile;h=cf32d8484ed9dfae5037ba3f2aab4f4477c8799c;hp=0f2adaf50b32997dd44c378b20ca609568ba7183;hb=51d306b0cc0857a6c2ba7ce34307421ff66e1567;hpb=75ea41a2c060b638aed79b8ce50de8f86505c1b3

diff --git a/utils/dosfstools/Makefile b/utils/dosfstools/Makefile
index 0f2adaf50b..cf32d8484e 100644
--- a/utils/dosfstools/Makefile
+++ b/utils/dosfstools/Makefile
@@ -1,34 +1,57 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dosfstools
-PKG_VERSION:=2.11
+PKG_VERSION:=3.0.11
 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_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.daniel-baumann.ch/software/dosfstools
+PKG_MD5SUM:=8d2211d5bd813164e20740e7c852aa06
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/dosfstools
+define Package/dosfstools/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=MS-DOS FAT filesystems utilities
-  DESCRIPTION:=\
+  URL:=http://www.daniel-baumann.ch/software/dosfstools/
+  SUBMENU:=Filesystem
+endef
+
+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.
-  URL:=ftp://ftp.uni-erlangen.de:/pub/Linux/LOCAL/dosfstools/
+	(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
@@ -46,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/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/dosfstools/install
-	install -d -m0755 $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/dosfsck $(1)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/fsck.{msdos,vfat} $(1)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/mkdosfs $(1)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.{msdos,vfat} $(1)/usr/sbin/
+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))