4 files changed, 41 insertions, 63 deletions
diff --git a/recipes/dosfstools/dosfstools-native_2.10.bb b/recipes/dosfstools/dosfstools-native_2.10.bb
deleted file mode 100644
index 0aae86beb9..0000000000
--- a/recipes/dosfstools/dosfstools-native_2.10.bb
+++ /dev/null
@@ -1,27 +0,0 @@
-# dosfstools-native OE build file
-# Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require dosfstools_${PV}.bb
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dosfstools-${PV}"
-
-S="${WORKDIR}/dosfstools-${PV}"
-
-PR ="r4"
-
-SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
-	file://mkdosfs-bootcode.patch;patch=1 \
-	file://mkdosfs-dir.patch;patch=1 \
-	file://alignment_hack.patch;patch=1 \
-	file://dosfstools-2.10-kernel-2.6.patch;patch=1 \
-	file://msdos_fat12_undefined.patch;patch=1 \
-	file://dosfstools-msdos_fs-types.patch;patch=1 \
-	file://include-linux-types.patch;patch=1 \
-	file://2.6.20-syscall.patch;patch=1"
-
-inherit native
-
-do_stage() {
-	install -m 755 ${S}/mkdosfs/mkdosfs ${STAGING_BINDIR}/mkdosfs
-	install -m 755 ${S}/dosfsck/dosfsck ${STAGING_BINDIR}/dosfsck
-}
diff --git a/recipes/dosfstools/dosfstools_2.10.bb b/recipes/dosfstools/dosfstools_2.10.bb
deleted file mode 100644
index 119a4c3115..0000000000
--- a/recipes/dosfstools/dosfstools_2.10.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-# dosfstools OE build file
-# Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION = "DOS FAT Filesystem Utilities"
-
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-
-PR = "r2"
-
-SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
-	   file://alignment_hack.patch;patch=1 \
-	   file://dosfstools-2.10-kernel-2.6.patch;patch=1 \
-           file://msdos_fat12_undefined.patch;patch=1 \
-	   file://include-linux-types.patch;patch=1"
-
-do_install () {
-	oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
-		   "MANDIR=${D}${mandir}/man8" install
-}
-
-SRC_URI[md5sum] = "59a02f311a891af8787c4c9e28c6b89b"
-SRC_URI[sha256sum] = "55a7b2f5ea4506bde935ee3145573e1773427fc72283a36796c7c2cf861dd064"
diff --git a/recipes/dosfstools/dosfstools_2.11.bb b/recipes/dosfstools/dosfstools_2.11.bb
index cb70a9f54f..a66c56721d 100644
--- a/recipes/dosfstools/dosfstools_2.11.bb
+++ b/recipes/dosfstools/dosfstools_2.11.bb
@@ -1,24 +1,26 @@
 # dosfstools OE build file
 # Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
-
 DESCRIPTION = "DOS FAT Filesystem Utilities"
-
 SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
-
-PR = "r0"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
-	   file://alignment_hack.patch;patch=1 \
-           file://msdos_fat12_undefined.patch;patch=1 \
-	   file://include-linux-types.patch;patch=1"
+           file://alignment_hack.patch \
+           file://msdos_fat12_undefined.patch \
+           file://include-linux-types.patch"
+SRC_URI[md5sum] = "407d405ade410f7597d364ab5dc8c9f6"
+SRC_URI[sha256sum] = "0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484"
+
+CFLAGS_append = " -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+CFLAGS_append_libc-uclibc = ' ${@base_contains("DISTRO_FEATURES", "largefile", "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64", "", d)}'
 
 do_install () {
-	oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
-		   "MANDIR=${D}${mandir}/man8" install
+        oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
+                   "MANDIR=${D}${mandir}/man8" install
 }
 
-SRC_URI[md5sum] = "407d405ade410f7597d364ab5dc8c9f6"
-SRC_URI[sha256sum] = "0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484"
+BBCLASSEXTEND = "native"
+NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes/dosfstools/dosfstools_3.0.9.bb b/recipes/dosfstools/dosfstools_3.0.9.bb
new file mode 100644
index 0000000000..676c751ba0
--- /dev/null
+++ b/recipes/dosfstools/dosfstools_3.0.9.bb
@@ -0,0 +1,28 @@
+# dosfstools OE build file
+# Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "DOS FAT Filesystem Utilities"
+
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPLv3"
+
+DEFAULT_PREFERENCE = "-1"
+
+PR = "r1"
+
+SRC_URI = "http://www.daniel-baumann.ch/software/dosfstools/dosfstools-${PV}.tar.bz2 \
+	"
+# output of getconf LFS_CFLAGS
+#
+CFLAGS_append = ' -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+CFLAGS_append_libc-uclibc = ' ${@base_contains("DISTRO_FEATURES", "largefile", "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64", "", d)}'
+
+do_install () {
+	oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
+		   "MANDIR=${D}${mandir}/man8" install
+}
+
+SRC_URI[md5sum] = "7f159ec44d3b9c502904bab0236050e4"
+SRC_URI[sha256sum] = "3f63676faeac507e909d84c8920ddb6597da1eb688577c2fc9c756b821d0458f"