projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f4f6ac4
)
fix dosfstools compile
author
Felix Fietkau
<nbd@openwrt.org>
Tue, 5 Aug 2008 07:02:48 +0000
(07:02 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Tue, 5 Aug 2008 07:02:48 +0000
(07:02 +0000)
SVN-Revision: 12125
utils/dosfstools/patches/002-linux_26_headers.patch
patch
|
blob
|
history
diff --git
a/utils/dosfstools/patches/002-linux_26_headers.patch
b/utils/dosfstools/patches/002-linux_26_headers.patch
index f116096db1551528484c83cab064f50bd721346d..6907c2dd8e297fefa72cf8e01bc036126dd538b5 100644
(file)
--- a/
utils/dosfstools/patches/002-linux_26_headers.patch
+++ b/
utils/dosfstools/patches/002-linux_26_headers.patch
@@
-1,6
+1,5
@@
-diff -urN dosfstools-2.11/dosfsck/common.h dosfstools-2.11.new/dosfsck/common.h
---- dosfstools-2.11/dosfsck/common.h 2004-02-25 10:07:01.000000000 +0100
-+++ dosfstools-2.11.new/dosfsck/common.h 2006-12-09 16:45:12.000000000 +0100
+--- a/dosfsck/common.h
++++ b/dosfsck/common.h
@@ -4,9 +4,7 @@
#include <linux/version.h>
@@ -4,9 +4,7 @@
#include <linux/version.h>
@@
-12,9
+11,8
@@
diff -urN dosfstools-2.11/dosfsck/common.h dosfstools-2.11.new/dosfsck/common.h
# define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */
#endif
# define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */
#endif
-diff -urN dosfstools-2.11/dosfsck/file.c dosfstools-2.11.new/dosfsck/file.c
---- dosfstools-2.11/dosfsck/file.c 2004-02-25 10:07:38.000000000 +0100
-+++ dosfstools-2.11.new/dosfsck/file.c 2006-12-09 16:45:22.000000000 +0100
+--- a/dosfsck/file.c
++++ b/dosfsck/file.c
@@ -18,9 +18,7 @@
#include <linux/version.h>
@@ -18,9 +18,7 @@
#include <linux/version.h>
@@
-26,9
+24,8
@@
diff -urN dosfstools-2.11/dosfsck/file.c dosfstools-2.11.new/dosfsck/file.c
#endif
#include <linux/msdos_fs.h>
#endif
#include <linux/msdos_fs.h>
-diff -urN dosfstools-2.11/dosfsck/io.c dosfstools-2.11.new/dosfsck/io.c
---- dosfstools-2.11/dosfsck/io.c 2005-03-12 16:33:58.000000000 +0100
-+++ dosfstools-2.11.new/dosfsck/io.c 2006-12-09 16:48:43.000000000 +0100
+--- a/dosfsck/io.c
++++ b/dosfsck/io.c
@@ -19,6 +19,10 @@
#include <sys/ioctl.h>
#include <errno.h>
@@ -19,6 +19,10 @@
#include <sys/ioctl.h>
#include <errno.h>
@@
-40,9
+37,8
@@
diff -urN dosfstools-2.11/dosfsck/io.c dosfstools-2.11.new/dosfsck/io.c
#include <linux/fd.h>
#include "dosfsck.h"
#include <linux/fd.h>
#include "dosfsck.h"
-diff -urN dosfstools-2.11/mkdosfs/mkdosfs.c dosfstools-2.11.new/mkdosfs/mkdosfs.c
---- dosfstools-2.11/mkdosfs/mkdosfs.c 2005-03-12 17:12:16.000000000 +0100
-+++ dosfstools-2.11.new/mkdosfs/mkdosfs.c 2006-12-09 16:44:57.000000000 +0100
+--- a/mkdosfs/mkdosfs.c
++++ b/mkdosfs/mkdosfs.c
@@ -68,9 +68,7 @@
#include <linux/version.h>
@@ -68,9 +68,7 @@
#include <linux/version.h>
@@
-54,3
+50,20
@@
diff -urN dosfstools-2.11/mkdosfs/mkdosfs.c dosfstools-2.11.new/mkdosfs/mkdosfs.
#endif
#if __BYTE_ORDER == __BIG_ENDIAN
#endif
#if __BYTE_ORDER == __BIG_ENDIAN
+--- a/dosfsck/dosfsck.h
++++ b/dosfsck/dosfsck.h
+@@ -15,13 +15,7 @@
+ #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/types.h>
+ #include <linux/msdos_fs.h>
+
+ #undef CF_LE_W