commit 605dd60c9fbd24e16c67e61e5cbe17e60126d77f Author: Simone Rota <sip@crux.nu> Date: Wed Jan 3 14:06:58 2007 +0100 dosfstools: updated to 2.11 diff --git a/dosfstools/.md5sum b/dosfstools/.md5sum index e1cd249..e026088 100644 --- a/dosfstools/.md5sum +++ b/dosfstools/.md5sum @@ -1,2 +1 @@ -c73a56e19adceaac021096bd88ccf7f5 dosfstools-2.10-kernel-2.6.patch -59a02f311a891af8787c4c9e28c6b89b dosfstools-2.10.src.tar.gz +407d405ade410f7597d364ab5dc8c9f6 dosfstools-2.11.src.tar.gz diff --git a/dosfstools/Pkgfile b/dosfstools/Pkgfile index 7f38c87..9fd0d06 100644 --- a/dosfstools/Pkgfile +++ b/dosfstools/Pkgfile @@ -5,14 +5,12 @@ # Depends on: name=dosfstools -version=2.10 +version=2.11 release=1 -source=(http://mirror1.pdaxrom.org/source/src/$name-$version.src.tar.gz \ - $name-$version-kernel-2.6.patch) +source=(http://fresh.t-systems-sfr.com/linux/src/$name-$version.src.tar.gz) build() { cd $name-$version - patch -p1 < ../$name-$version-kernel-2.6.patch make mkdir -p $PKG/sbin mkdir -p $PKG/usr/man/man8 diff --git a/dosfstools/dosfstools-2.10-kernel-2.6.patch b/dosfstools/dosfstools-2.10-kernel-2.6.patch deleted file mode 100644 index 3ecafc3..0000000 --- a/dosfstools/dosfstools-2.10-kernel-2.6.patch +++ /dev/null @@ -1,74 +0,0 @@ -Submitted By: Jim Gifford (jim at linuxfromscratch dot org) -Date: 2004-02-09 -Initial Package Version: 2.6 -Origin: Jim Gifford -Upstream Status: Accepted -Description: Fixes Compile Issues with the 2.6 Kernel - ---- dosfstools-2.10/dosfsck/common.h.orig 2004-02-09 18:37:59.056737458 +0000 -+++ dosfstools-2.10/dosfsck/common.h 2004-02-09 18:38:18.333392952 +0000 -@@ -2,6 +2,13 @@ - - /* Written 1993 by Werner Almesberger */ - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -+ #define __KERNEL__ -+ #include <asm/types.h> -+ #undef __KERNEL__ -+ #define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */ -+#endif - - #ifndef _COMMON_H - #define _COMMON_H ---- dosfstools-2.10/dosfsck/file.c.orig 2004-02-09 18:40:52.016728845 +0000 -+++ dosfstools-2.10/dosfsck/file.c 2004-02-09 18:40:03.665117865 +0000 -@@ -15,6 +15,14 @@ - #define _LINUX_STAT_H /* hack to avoid inclusion of <linux/stat.h> */ - #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__ -+#endif -+ - #include <linux/msdos_fs.h> - - #include "common.h" ---- dosfstools-2.10/dosfsck/dosfsck.h.orig 2004-02-09 18:57:11.022870974 +0000 -+++ dosfstools-2.10/dosfsck/dosfsck.h 2004-02-09 18:56:20.628614393 +0000 -@@ -13,6 +13,15 @@ - #define _LINUX_STAT_H /* hack to avoid inclusion of <linux/stat.h> */ - #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> -+ #include <asm/byteorder.h> -+ #undef __KERNEL__ -+#endif -+ - #include <linux/msdos_fs.h> - - /* 2.1 kernels use le16_to_cpu() type functions for CF_LE_W & Co., but don't ---- dosfstools-2.10/mkdosfs/mkdosfs.c.orig 2004-02-09 18:31:41.997157413 +0000 -+++ dosfstools-2.10/mkdosfs/mkdosfs.c 2004-02-09 18:34:07.311945252 +0000 -@@ -66,6 +66,13 @@ - #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__ -+#endif -+ - #if __BYTE_ORDER == __BIG_ENDIAN - - #include <asm/byteorder.h>