* dosfstools.make:

	fix download URL, version bump to 3.0.1


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9263 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 30 insertions, 54 deletions

diff --git a/rules/dosfstools.make b/rules/dosfstools.make
index 75dcb0e1e..3194b6a99 100644
--- a/rules/dosfstools.make
+++ b/rules/dosfstools.make
@@ -17,86 +17,60 @@ PACKAGES-$(PTXCONF_DOSFSTOOLS) += dosfstools
 #
 # Paths and names
 #
-DOSFSTOOLS_VERSION	= 2.11
-DOSFSTOOLS		= dosfstools-$(DOSFSTOOLS_VERSION)
-DOSFSTOOLS_SUFFIX	= tar.gz
-DOSFSTOOLS_SRC		= $(DOSFSTOOLS).src.$(DOSFSTOOLS_SUFFIX)
-DOSFSTOOLS_URL		= ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/$(DOSFSTOOLS_SRC)
-DOSFSTOOLS_SOURCE	= $(SRCDIR)/$(DOSFSTOOLS_SRC)
-DOSFSTOOLS_DIR		= $(BUILDDIR)/$(DOSFSTOOLS)
+DOSFSTOOLS_VERSION	:= 3.0.1
+DOSFSTOOLS		:= dosfstools-$(DOSFSTOOLS_VERSION)
+DOSFSTOOLS_SUFFIX	:= tar.bz2
+DOSFSTOOLS_SRC		:= $(DOSFSTOOLS).$(DOSFSTOOLS_SUFFIX)
+DOSFSTOOLS_URL		:= http://www.daniel-baumann.ch/software/dosfstools/$(DOSFSTOOLS_SRC)
+DOSFSTOOLS_SOURCE	:= $(SRCDIR)/$(DOSFSTOOLS_SRC)
+DOSFSTOOLS_DIR		:= $(BUILDDIR)/$(DOSFSTOOLS)
 
 
 # ----------------------------------------------------------------------------
 # Get
 # ----------------------------------------------------------------------------
 
-dosfstools_get: $(STATEDIR)/dosfstools.get
-
-$(STATEDIR)/dosfstools.get: $(dosfstools_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(DOSFSTOOLS_SOURCE):
-	@$(call targetinfo, $@)
+	@$(call targetinfo)
 	@$(call get, DOSFSTOOLS)
 
 # ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-dosfstools_extract: $(STATEDIR)/dosfstools.extract
-
-$(STATEDIR)/dosfstools.extract: $(dosfstools_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(DOSFSTOOLS_DIR))
-	@$(call extract, DOSFSTOOLS)
-	@$(call patchin, DOSFSTOOLS)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
-dosfstools_prepare: $(STATEDIR)/dosfstools.prepare
+DOSFSTOOLS_PATH	:= PATH=$(CROSS_PATH)
+DOSFSTOOLS_ENV 	:= $(CROSS_ENV)
+DOSFSTOOLS_MAKEVARS := PREFIX=/
 
-DOSFSTOOLS_PATH	=  PATH=$(CROSS_PATH)
-DOSFSTOOLS_ENV 	=  $(CROSS_ENV)
-
-$(STATEDIR)/dosfstools.prepare: $(dosfstools_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
+$(STATEDIR)/dosfstools.prepare:
+	@$(call targetinfo)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Compile
 # ----------------------------------------------------------------------------
 
-dosfstools_compile: $(STATEDIR)/dosfstools.compile
-
-$(STATEDIR)/dosfstools.compile: $(dosfstools_compile_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/dosfstools.compile:
+	@$(call targetinfo)
 	cd $(DOSFSTOOLS_DIR) && $(DOSFSTOOLS_ENV) $(DOSFSTOOLS_PATH) \
 		make CC=$(COMPILER_PREFIX)gcc
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Install
 # ----------------------------------------------------------------------------
 
-dosfstools_install: $(STATEDIR)/dosfstools.install
-
-$(STATEDIR)/dosfstools.install: $(dosfstools_install_deps_default)
-	@$(call targetinfo, $@)
-	# @$(call install, DOSFSTOOLS)
-	@$(call touch, $@)
+$(STATEDIR)/dosfstools.install:
+	@$(call targetinfo)
+	@$(call install, DOSFSTOOLS)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-dosfstools_targetinstall: $(STATEDIR)/dosfstools.targetinstall
-
-$(STATEDIR)/dosfstools.targetinstall: $(dosfstools_targetinstall_deps_default)
-	@$(call targetinfo, $@)
+$(STATEDIR)/dosfstools.targetinstall:
+	@$(call targetinfo)
 
 	@$(call install_init, dosfstools)
 	@$(call install_fixup, dosfstools,PACKAGE,dosfstools)
@@ -108,27 +82,29 @@ $(STATEDIR)/dosfstools.targetinstall: $(dosfstools_targetinstall_deps_default)
 	@$(call install_fixup, dosfstools,DESCRIPTION,missing)
 
 ifdef PTXCONF_DOSFSTOOLS_MKDOSFS
-	@$(call install_copy, dosfstools, 0, 0, 0755, $(DOSFSTOOLS_DIR)/mkdosfs/mkdosfs, /sbin/mkdosfs)
+	@$(call install_copy, dosfstools, 0, 0, 0755, $(DOSFSTOOLS_DIR)/mkdosfs, /sbin/mkdosfs)
+endif
 ifdef PTXCONF_DOSFSTOOLS_MKDOSFS_MSDOS
 	@$(call install_link, dosfstools, /sbin/mkdosfs, /sbin/mkfs.msdos)
 endif
 ifdef PTXCONF_DOSFSTOOLS_MKDOSFS_VFAT
 	@$(call install_link, dosfstools, /sbin/mkdosfs, /sbin/mkfs.vfat)
 endif
-endif
+
+
 ifdef PTXCONF_DOSFSTOOLS_DOSFSCK
-	@$(call install_copy, dosfstools, 0, 0, 0755, $(DOSFSTOOLS_DIR)/dosfsck/dosfsck, /sbin/dosfsck)
+	@$(call install_copy, dosfstools, 0, 0, 0755, $(DOSFSTOOLS_DIR)/dosfsck, /sbin/dosfsck)
+endif
 ifdef PTXCONF_DOSFSTOOLS_DOSFSCK_MSDOS
 	@$(call install_link, dosfstools, /sbin/dosfsck, /sbin/fsck.msdos)
 endif
 ifdef PTXCONF_DOSFSTOOLS_DOSFSCK_VFAT
 	@$(call install_link, dosfstools, /sbin/dosfsck, /sbin/fsck.vfat)
 endif
-endif
 
 	@$(call install_finish, dosfstools)
 
-	@$(call touch, $@)
+	@$(call touch)
 
 # ----------------------------------------------------------------------------
 # Clean