bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[package] update dosfstools to 3.0.5, split utilities into their own packages (#5885)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@17758 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian
2009-09-27 12:43:15 +00:00
parent 570fd40d1e
commit b1c9178391
3 changed files with 82 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
utils/dosfstools/patches/002-linux_26_headers.patch
View File

@ -1,69 +1,56 @@
--- a/dosfsck/common.h
+++ b/dosfsck/common.h
@@ -4,9 +4,7 @@
--- a/src/common.h
+++ b/src/common.h
@@ -19,7 +19,7 @@
can be found in /usr/share/common-licenses/GPL-3 file.
*/
#include <linux/version.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-# define __KERNEL__
-# include <asm/types.h>
-# undef __KERNEL__
+#include <linux/types.h>
# define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */
#endif
--- a/dosfsck/file.c
+++ b/dosfsck/file.c
@@ -18,9 +18,7 @@
#ifndef _COMMON_H
#define _COMMON_H
--- a/src/dosfsck.h
+++ b/src/dosfsck.h
@@ -32,8 +32,8 @@
#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__
-# include <asm/byteorder.h>
+#include <linux/types.h>
#endif
+#include <asm/byteorder.h>
#include <linux/msdos_fs.h>
--- a/dosfsck/io.c
+++ b/dosfsck/io.c
@@ -19,6 +19,10 @@
--- a/src/file.c
+++ b/src/file.c
@@ -34,7 +34,7 @@
#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 <asm/types.h>
+#include <linux/types.h>
#include <linux/msdos_fs.h>
--- a/src/io.c
+++ b/src/io.c
@@ -37,6 +37,7 @@
#include <sys/ioctl.h>
#include <errno.h>
#include <fcntl.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+#include <linux/types.h>
+#endif
#include <linux/fd.h>
#include "dosfsck.h"
--- a/mkdosfs/mkdosfs.c
+++ b/mkdosfs/mkdosfs.c
@@ -68,9 +68,7 @@
--- a/src/mkdosfs.c
+++ b/src/mkdosfs.c
@@ -63,7 +63,7 @@
#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__
+#include <linux/types.h>
#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