diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-10-02 16:42:57 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-10-02 16:42:57 +0000 |
| commit | 4e8f4e1d3968cc95ce33bb2e6ed54fae83a7cb49 (patch) | |
| tree | becb9f41221e51b561153af4f98ac7b78051fc49 /tools/mtd-utils/patches/120-cygwin_fixes.patch | |
| parent | ff9ddd7c0f6ca9b280691ff089cf4a688849c847 (diff) | |
| download | upstream-4e8f4e1d3968cc95ce33bb2e6ed54fae83a7cb49.tar.gz upstream-4e8f4e1d3968cc95ce33bb2e6ed54fae83a7cb49.tar.bz2 upstream-4e8f4e1d3968cc95ce33bb2e6ed54fae83a7cb49.zip | |
mtd-utils: refresh patches
SVN-Revision: 23179
Diffstat (limited to 'tools/mtd-utils/patches/120-cygwin_fixes.patch')
| -rw-r--r-- | tools/mtd-utils/patches/120-cygwin_fixes.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/mtd-utils/patches/120-cygwin_fixes.patch b/tools/mtd-utils/patches/120-cygwin_fixes.patch index 2b6cafedd3..e1c04048ed 100644 --- a/tools/mtd-utils/patches/120-cygwin_fixes.patch +++ b/tools/mtd-utils/patches/120-cygwin_fixes.patch @@ -373,9 +373,9 @@ + --- a/mkfs.jffs2.c +++ b/mkfs.jffs2.c -@@ -75,6 +75,14 @@ - #include "crc32.h" - #include "rbtree.h" +@@ -76,6 +76,14 @@ + + #include "common.h" +#ifdef __CYGWIN__ +#include <cygwin/ioctl.h> @@ -388,7 +388,7 @@ /* Do not use the weird XPG version of basename */ #undef basename -@@ -474,7 +482,7 @@ static struct filesystem_entry *recursiv +@@ -375,7 +383,7 @@ static struct filesystem_entry *recursiv the following macros use it if available or use a hacky workaround... */ @@ -397,7 +397,7 @@ #define SCANF_PREFIX "a" #define SCANF_STRING(s) (&s) #define GETCWD_SIZE 0 -@@ -557,6 +565,14 @@ static int interpret_table_entry(struct +@@ -458,6 +466,14 @@ static int interpret_table_entry(struct } entry = find_filesystem_entry(root, name, mode); if (entry) { @@ -412,7 +412,7 @@ /* Ok, we just need to fixup the existing entry * and we will be all done... */ entry->sb.st_uid = uid; -@@ -566,11 +582,21 @@ static int interpret_table_entry(struct +@@ -467,11 +483,21 @@ static int interpret_table_entry(struct entry->sb.st_rdev = makedev(major, minor); } } else { @@ -434,8 +434,8 @@ + } free(tmp); if (parent == NULL) { - error_msg ("skipping device_table entry '%s': no parent directory!", name); -@@ -584,6 +610,7 @@ static int interpret_table_entry(struct + errmsg ("skipping device_table entry '%s': no parent directory!", name); +@@ -485,6 +511,7 @@ static int interpret_table_entry(struct add_host_filesystem_entry(name, hostpath, uid, gid, mode, 0, parent); break; case 'f': @@ -445,7 +445,7 @@ case 'p': --- a/ubi-utils/src/libubi.c +++ b/ubi-utils/src/libubi.c -@@ -30,6 +30,9 @@ +@@ -32,6 +32,9 @@ #include <sys/ioctl.h> #include <sys/stat.h> #include <sys/types.h> |