Changeset 19159


Ignore:
Timestamp:
2010-01-16T01:11:47+01:00 (8 years ago)
Author:
nbd
Message:

mtd-utils: refresh the cygwin_fixes patch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/mtd-utils/patches/120-cygwin_fixes.patch

    r19039 r19159  
    1 diff -urN mtd-20090505/Makefile mtd-20090505.new/Makefile 
    2 --- mtd-20090505/Makefile       2009-06-05 16:59:08.000000000 +0200 
    3 +++ mtd-20090505.new/Makefile   2010-01-05 11:11:24.000000000 +0100 
    4 @@ -7,6 +7,11 @@ 
     1--- a/Makefile 
     2+++ b/Makefile 
     3@@ -7,6 +7,11 @@ ifeq ($(WITHOUT_XATTR), 1) 
    54   CPPFLAGS += -DWITHOUT_XATTR 
    65 endif 
     
    1413  
    1514 TARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ 
    16 @@ -17,6 +22,10 @@ 
     15@@ -17,6 +22,10 @@ TARGETS = ftl_format flash_erase flash_e 
    1716        rfddump rfdformat \ 
    1817        serve_image recv_image \ 
     
    2524 SYMLINKS = 
    2625  
    27 diff -urN mtd-20090505/include/cygwin/bits-byteswap.h mtd-20090505.new/include/cygwin/bits-byteswap.h 
    28 --- mtd-20090505/include/cygwin/bits-byteswap.h 1970-01-01 01:00:00.000000000 +0100 
    29 +++ mtd-20090505.new/include/cygwin/bits-byteswap.h     2010-01-05 11:09:45.000000000 +0100 
     26--- /dev/null 
     27+++ b/include/cygwin/bits-byteswap.h 
    3028@@ -0,0 +1,132 @@ 
    3129+/* Macros to swap the order of bytes in integer values. 
     
    161159+ 
    162160+#endif /* _BITS_BYTESWAP_H */ 
    163 diff -urN mtd-20090505/include/cygwin/byteswap.h mtd-20090505.new/include/cygwin/byteswap.h 
    164 --- mtd-20090505/include/cygwin/byteswap.h      1970-01-01 01:00:00.000000000 +0100 
    165 +++ mtd-20090505.new/include/cygwin/byteswap.h  2010-01-05 11:09:45.000000000 +0100 
     161--- /dev/null 
     162+++ b/include/cygwin/byteswap.h 
    166163@@ -0,0 +1,40 @@ 
    167164+/* Copyright (C) 1997 Free Software Foundation, Inc. 
     
    205202+ 
    206203+#endif /* byteswap.h */ 
    207 diff -urN mtd-20090505/include/cygwin/endian.h mtd-20090505.new/include/cygwin/endian.h 
    208 --- mtd-20090505/include/cygwin/endian.h        1970-01-01 01:00:00.000000000 +0100 
    209 +++ mtd-20090505.new/include/cygwin/endian.h    2010-01-05 11:43:10.000000000 +0100 
     204--- /dev/null 
     205+++ b/include/cygwin/endian.h 
    210206@@ -0,0 +1,26 @@ 
    211207+#ifndef _CYGENDIAN_H_ 
     
    235231+ 
    236232+#endif /* _CYGENDIAN_H_ */ 
    237 diff -urN mtd-20090505/include/cygwin/ioctl.h mtd-20090505.new/include/cygwin/ioctl.h 
    238 --- mtd-20090505/include/cygwin/ioctl.h 1970-01-01 01:00:00.000000000 +0100 
    239 +++ mtd-20090505.new/include/cygwin/ioctl.h     2010-01-05 11:09:45.000000000 +0100 
     233--- /dev/null 
     234+++ b/include/cygwin/ioctl.h 
    240235@@ -0,0 +1,38 @@ 
    241236+#ifndef _CYGIOCTL_H_ 
     
    277272+ 
    278273+#endif /* _CYGIOCTL_H_ */ 
    279 diff -urN mtd-20090505/include/cygwin/pread.c mtd-20090505.new/include/cygwin/pread.c 
    280 --- mtd-20090505/include/cygwin/pread.c 1970-01-01 01:00:00.000000000 +0100 
    281 +++ mtd-20090505.new/include/cygwin/pread.c     2010-01-05 11:09:45.000000000 +0100 
     274--- /dev/null 
     275+++ b/include/cygwin/pread.c 
    282276@@ -0,0 +1,41 @@ 
    283277+#ifdef __CYGWIN__ 
     
    322316+ 
    323317+#endif /* __CYGWIN__ */ 
    324 diff -urN mtd-20090505/lnconf.sh mtd-20090505.new/lnconf.sh 
    325 --- mtd-20090505/lnconf.sh      1970-01-01 01:00:00.000000000 +0100 
    326 +++ mtd-20090505.new/lnconf.sh  2010-01-05 11:09:45.000000000 +0100 
     318--- /dev/null 
     319+++ b/lnconf.sh 
    327320@@ -0,0 +1,53 @@ 
    328321+#!/bin/sh 
     
    379372+lndir "$tdir" 
    380373+ 
    381 diff -urN mtd-20090505/mkfs.jffs2.c mtd-20090505.new/mkfs.jffs2.c 
    382 --- mtd-20090505/mkfs.jffs2.c   2009-06-05 16:59:08.000000000 +0200 
    383 +++ mtd-20090505.new/mkfs.jffs2.c       2010-01-05 11:25:52.000000000 +0100 
     374--- a/mkfs.jffs2.c 
     375+++ b/mkfs.jffs2.c 
    384376@@ -75,6 +75,14 @@ 
    385377 #include "crc32.h" 
     
    397389 #undef basename 
    398390  
    399 @@ -474,7 +482,7 @@ 
     391@@ -474,7 +482,7 @@ static struct filesystem_entry *recursiv 
    400392    the following macros use it if available or use a hacky workaround... 
    401393  */ 
     
    406398 #define SCANF_STRING(s) (&s) 
    407399 #define GETCWD_SIZE 0 
    408 @@ -557,6 +565,14 @@ 
     400@@ -557,6 +565,14 @@ static int interpret_table_entry(struct  
    409401        } 
    410402        entry = find_filesystem_entry(root, name, mode); 
     
    421413                 * and we will be all done... */ 
    422414                entry->sb.st_uid = uid; 
    423 @@ -566,11 +582,21 @@ 
     415@@ -566,11 +582,21 @@ static int interpret_table_entry(struct  
    424416                        entry->sb.st_rdev = makedev(major, minor); 
    425417                } 
     
    444436                if (parent == NULL) { 
    445437                        error_msg ("skipping device_table entry '%s': no parent directory!", name); 
    446 @@ -584,6 +610,7 @@ 
     438@@ -584,6 +610,7 @@ static int interpret_table_entry(struct  
    447439                                add_host_filesystem_entry(name, hostpath, uid, gid, mode, 0, parent); 
    448440                                break; 
     
    452444                                break; 
    453445                        case 'p': 
    454 diff -urN mtd-20090505/ubi-utils/src/libubi.c mtd-20090505.new/ubi-utils/src/libubi.c 
    455 --- mtd-20090505/ubi-utils/src/libubi.c 2009-06-05 16:59:08.000000000 +0200 
    456 +++ mtd-20090505.new/ubi-utils/src/libubi.c     2010-01-05 11:46:24.000000000 +0100 
     446--- a/ubi-utils/src/libubi.c 
     447+++ b/ubi-utils/src/libubi.c 
    457448@@ -30,6 +30,9 @@ 
    458449 #include <sys/ioctl.h> 
Note: See TracChangeset for help on using the changeset viewer.