create branch for 2.2

4 files changed, 120 insertions, 0 deletions

diff --git a/dosfstools/.footprint b/dosfstools/.footprint
new file mode 100644
index 000000000..69982b29a
--- /dev/null
+++ b/dosfstools/.footprint
@@ -0,0 +1,16 @@
+drwxr-xr-x	root/root	sbin/
+-rwxr-xr-x	root/root	sbin/dosfsck
+lrwxrwxrwx	root/root	sbin/fsck.msdos -> dosfsck
+lrwxrwxrwx	root/root	sbin/fsck.vfat -> dosfsck
+-rwxr-xr-x	root/root	sbin/mkdosfs
+lrwxrwxrwx	root/root	sbin/mkfs.msdos -> mkdosfs
+lrwxrwxrwx	root/root	sbin/mkfs.vfat -> mkdosfs
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man8/
+-rw-r--r--	root/root	usr/man/man8/dosfsck.8.gz
+lrwxrwxrwx	root/root	usr/man/man8/fsck.msdos.8.gz -> dosfsck.8.gz
+lrwxrwxrwx	root/root	usr/man/man8/fsck.vfat.8.gz -> dosfsck.8.gz
+-rw-r--r--	root/root	usr/man/man8/mkdosfs.8.gz
+lrwxrwxrwx	root/root	usr/man/man8/mkfs.msdos.8.gz -> mkdosfs.8.gz
+lrwxrwxrwx	root/root	usr/man/man8/mkfs.vfat.8.gz -> mkdosfs.8.gz
diff --git a/dosfstools/.md5sum b/dosfstools/.md5sum
new file mode 100644
index 000000000..e1cd249a5
--- /dev/null
+++ b/dosfstools/.md5sum
@@ -0,0 +1,2 @@
+c73a56e19adceaac021096bd88ccf7f5  dosfstools-2.10-kernel-2.6.patch
+59a02f311a891af8787c4c9e28c6b89b  dosfstools-2.10.src.tar.gz
diff --git a/dosfstools/Pkgfile b/dosfstools/Pkgfile
new file mode 100644
index 000000000..e9cb36d07
--- /dev/null
+++ b/dosfstools/Pkgfile
@@ -0,0 +1,28 @@
+# URL: ftp://ftp.ibiblio.org/pub/Linux/system/filesystems/dosfs/
+# Description: tools for creating and checking DOS filesystems in linux
+# Packager: Ryan B. Lynch, rlynch at strozllc dot com
+# Maintainer: Simone Rota, sip at varlock dot com
+# Depends on:
+
+name=dosfstools
+version=2.10
+release=1
+source=(http://mirror1.pdaxrom.org/source/src/$name-$version.src.tar.gz \
+	$name-$version-kernel-2.6.patch)
+
+build() {
+	cd $name-$version
+	patch -p1 < ../$name-$version-kernel-2.6.patch
+	make
+	mkdir -p $PKG/sbin
+	mkdir -p $PKG/usr/man/man8
+	cp dosfsck/dosfsck $PKG/sbin
+	cp dosfsck/dosfsck.8 $PKG/usr/man/man8
+	cp mkdosfs/mkdosfs $PKG/sbin
+	cp mkdosfs/mkdosfs.8 $PKG/usr/man/man8
+	cd $PKG/sbin && ln -s dosfsck fsck.msdos && ln -s dosfsck fsck.vfat \
+		&& ln -s mkdosfs mkfs.msdos && ln -s mkdosfs mkfs.vfat
+	cd $PKG/usr/man/man8 && ln -s dosfsck.8 fsck.msdos.8 \
+		&& ln -s dosfsck.8 fsck.vfat.8 && ln -s mkdosfs.8 mkfs.msdos.8 \
+		&& ln -s mkdosfs.8 mkfs.vfat.8
+}
diff --git a/dosfstools/dosfstools-2.10-kernel-2.6.patch b/dosfstools/dosfstools-2.10-kernel-2.6.patch
new file mode 100644
index 000000000..3ecafc324
--- /dev/null
+++ b/dosfstools/dosfstools-2.10-kernel-2.6.patch
@@ -0,0 +1,74 @@
+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>