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

   1 --- a/compr_lzo.c
   2 +++ b/compr_lzo.c
   3 @@ -26,7 +26,6 @@
   4  #include <string.h>
   5
   6  #ifndef WITHOUT_LZO
   7 -#include <asm/types.h>
   8  #include <linux/jffs2.h>
   9  #include <lzo/lzo1x.h>
  10  #include "compr.h"
  11 --- a/compr_zlib.c
  12 +++ b/compr_zlib.c
  13 @@ -39,7 +39,6 @@
  14  #include <zlib.h>
  15  #undef crc32
  16  #include <stdio.h>
  17 -#include <asm/types.h>
  18  #include <linux/jffs2.h>
  19  #include "common.h"
  20  #include "compr.h"
  21 --- a/rbtree.h
  22 +++ b/rbtree.h
  23 @@ -94,8 +94,7 @@ static inline struct page * rb_insert_pa
  24  #ifndef        _LINUX_RBTREE_H
  25  #define        _LINUX_RBTREE_H
  26
  27 -#include <linux/kernel.h>
  28 -#include <linux/stddef.h>
  29 +#include <stddef.h>
  30
  31  struct rb_node
  32  {
  33 --- a/include/mtd/ubi-media.h
  34 +++ b/include/mtd/ubi-media.h
  35 @@ -30,7 +30,15 @@
  36  #ifndef __UBI_MEDIA_H__
  37  #define __UBI_MEDIA_H__
  38
  39 +#ifdef __linux__
  40  #include <asm/byteorder.h>
  41 +#else
  42 +#include <stdint.h>
  43 +typedef uint8_t __u8;
  44 +typedef uint16_t __be16;
  45 +typedef uint32_t __be32;
  46 +typedef uint64_t __be64;
  47 +#endif
  48
  49  /* The version of UBI images supported by this implementation */
  50  #define UBI_VERSION 1
  51 --- a/mkfs.ubifs/mkfs.ubifs.h
  52 +++ b/mkfs.ubifs/mkfs.ubifs.h
  53 @@ -34,7 +34,17 @@
  54  #include <endian.h>
  55  #include <byteswap.h>
  56  #include <linux/types.h>
  57 +#ifdef __linux__
  58  #include <linux/fs.h>
  59 +# if defined(__x86_64__) && defined(__ILP32__)
  60 +#  define llseek lseek64
  61 +# endif
  62 +#else
  63 +# ifndef O_LARGEFILE
  64 +#  define O_LARGEFILE 0
  65 +# endif
  66 +# define llseek lseek
  67 +#endif
  68
  69  #include <getopt.h>
  70  #include <sys/types.h>
  71 --- a/mkfs.ubifs/mkfs.ubifs.c
  72 +++ b/mkfs.ubifs/mkfs.ubifs.c
  73 @@ -821,8 +821,8 @@ int write_leb(int lnum, int len, void *b
  74                 if (ubi_leb_change_start(ubi, out_fd, lnum, c->leb_size, dtype))
  75                         return sys_err_msg("ubi_leb_change_start failed");
  76
  77 -       if (lseek64(out_fd, pos, SEEK_SET) != pos)
  78 -               return sys_err_msg("lseek64 failed seeking %lld",
  79 +       if (llseek(out_fd, pos, SEEK_SET) != pos)
  80 +               return sys_err_msg("llseek failed seeking %lld",
  81                                    (long long)pos);
  82
  83         if (write(out_fd, buf, c->leb_size) != c->leb_size)
  84 @@ -1079,6 +1079,7 @@ static int add_inode_with_data(struct st
  85
  86         if (c->default_compr != UBIFS_COMPR_NONE)
  87                 use_flags |= UBIFS_COMPR_FL;
  88 +#ifndef NO_NATIVE_SUPPORT
  89         if (flags & FS_COMPR_FL)
  90                 use_flags |= UBIFS_COMPR_FL;
  91         if (flags & FS_SYNC_FL)
  92 @@ -1089,6 +1090,7 @@ static int add_inode_with_data(struct st
  93                 use_flags |= UBIFS_APPEND_FL;
  94         if (flags & FS_DIRSYNC_FL && S_ISDIR(st->st_mode))
  95                 use_flags |= UBIFS_DIRSYNC_FL;
  96 +#endif
  97
  98         memset(ino, 0, UBIFS_INO_NODE_SZ);
  99
 100 @@ -1158,7 +1160,9 @@ static int add_dir_inode(DIR *dir, ino_t
 101                 fd = dirfd(dir);
 102                 if (fd == -1)
 103                         return sys_err_msg("dirfd failed");
 104 +#ifndef NO_NATIVE_SUPPORT
 105                 if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1)
 106 +#endif
 107                         flags = 0;
 108         }
 109
 110 @@ -1343,10 +1347,12 @@ static int add_file(const char *path_nam
 111                 key_write(&key, &dn->key);
 112                 dn->size = cpu_to_le32(bytes_read);
 113                 out_len = NODE_BUFFER_SIZE - UBIFS_DATA_NODE_SZ;
 114 +#ifndef NO_NATIVE_SUPPORT
 115                 if (c->default_compr == UBIFS_COMPR_NONE &&
 116                     (flags & FS_COMPR_FL))
 117                         use_compr = UBIFS_COMPR_LZO;
 118                 else
 119 +#endif
 120                         use_compr = c->default_compr;
 121                 compr_type = compress_data(buf, bytes_read, &dn->data,
 122                                            &out_len, use_compr);
 123 @@ -1388,7 +1394,9 @@ static int add_non_dir(const char *path_
 124                 if (fd == -1)
 125                         return sys_err_msg("failed to open file '%s'",
 126                                            path_name);
 127 +#ifndef NO_NATIVE_SUPPORT
 128                 if (ioctl(fd, FS_IOC_GETFLAGS, &flags) == -1)
 129 +#endif
 130                         flags = 0;
 131                 if (close(fd) == -1)
 132                         return sys_err_msg("failed to close file '%s'",
 133 --- a/mkfs.ubifs/devtable.c
 134 +++ b/mkfs.ubifs/devtable.c
 135 @@ -134,6 +134,7 @@ static int interpret_table_entry(const c
 136         unsigned int mode = 0755, uid = 0, gid = 0, major = 0, minor = 0;
 137         unsigned int start = 0, increment = 0, count = 0;
 138
 139 +       buf[1023] = 0;
 140         if (sscanf(line, "%1023s %c %o %u %u %u %u %u %u %u",
 141                    buf, &type, &mode, &uid, &gid, &major, &minor,
 142                    &start, &increment, &count) < 0)
 143 @@ -144,8 +145,8 @@ static int interpret_table_entry(const c
 144                 buf, type, mode, uid, gid, major, minor, start,
 145                 increment, count);
 146
 147 -       len = strnlen(buf, 1024);
 148 -       if (len == 1024)
 149 +       len = strlen(buf);
 150 +       if (len == 1023)
 151                 return err_msg("too long path");
 152
 153         if (!strcmp(buf, "/"))