tools/mtd-utils/patches/110-portability_fix.patch

   1 --- /dev/null
   2 +++ b/include/asm/types.h
   3 @@ -0,0 +1,3 @@
   4 +#ifdef linux
   5 +#include_next <asm/types.h>
   6 +#endif
   7 --- a/util/mkfs.jffs2.c
   8 +++ b/util/mkfs.jffs2.c
   9 @@ -68,6 +68,7 @@
  10  #include <zlib.h>
  11  #undef crc32
  12  #include "crc32.h"
  13 +#include <endian.h>
  14
  15  /* Do not use the wierd XPG version of basename */
  16  #undef basename
  17 @@ -1032,7 +1033,7 @@ static void recursive_populate_directory
  18                         case S_IFDIR:
  19                                 if (verbose) {
  20                                         printf("\td %04o %9lu %5d:%-3d %s\n",
  21 -                                                       e->sb.st_mode & ~S_IFMT, e->sb.st_size,
  22 +                                                       e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
  23                                                         (int) (e->sb.st_uid), (int) (e->sb.st_gid),
  24                                                         e->name);
  25                                 }
  26 @@ -1041,7 +1042,7 @@ static void recursive_populate_directory
  27                         case S_IFSOCK:
  28                                 if (verbose) {
  29                                         printf("\ts %04o %9lu %5d:%-3d %s\n",
  30 -                                                       e->sb.st_mode & ~S_IFMT, e->sb.st_size,
  31 +                                                       e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
  32                                                         (int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
  33                                 }
  34                                 write_pipe(e);
  35 @@ -1049,7 +1050,7 @@ static void recursive_populate_directory
  36                         case S_IFIFO:
  37                                 if (verbose) {
  38                                         printf("\tp %04o %9lu %5d:%-3d %s\n",
  39 -                                                       e->sb.st_mode & ~S_IFMT, e->sb.st_size,
  40 +                                                       e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
  41                                                         (int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
  42                                 }
  43                                 write_pipe(e);
  44 @@ -1075,7 +1076,7 @@ static void recursive_populate_directory
  45                         case S_IFLNK:
  46                                 if (verbose) {
  47                                         printf("\tl %04o %9lu %5d:%-3d %s -> %s\n",
  48 -                                                       e->sb.st_mode & ~S_IFMT, e->sb.st_size,
  49 +                                                       e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
  50                                                         (int) e->sb.st_uid, (int) e->sb.st_gid, e->name,
  51                                                         e->link);
  52                                 }
  53 @@ -1084,7 +1085,7 @@ static void recursive_populate_directory
  54                         case S_IFREG:
  55                                 if (verbose) {
  56                                         printf("\tf %04o %9lu %5d:%-3d %s\n",
  57 -                                                       e->sb.st_mode & ~S_IFMT, e->sb.st_size,
  58 +                                                       e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size,
  59                                                         (int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
  60                                 }
  61                                 write_regular_file(e);