[orion] generic: use magic_long in sysupgrade

[openwrt.git] / tools / mtd-utils / patches / 110-portability.patch

diff --git a/tools/mtd-utils/patches/110-portability.patch b/tools/mtd-utils/patches/110-portability.patch
index 43b4faa..5bf1b95 100644 (file)
--- a/tools/mtd-utils/patches/110-portability.patch
+++ b/tools/mtd-utils/patches/110-portability.patch
@@ -1,23 +1,23 @@
 --- a/compr_lzo.c
 +++ b/compr_lzo.c
 --- a/compr_lzo.c
 +++ b/compr_lzo.c

-@@ -24,7 +24,6 @@
- #include <stdint.h>
- #include <stdio.h>
+@@ -26,7 +26,6 @@

  #include <string.h>
  #include <string.h>

+ 
+ #ifndef WITHOUT_LZO

 -#include <asm/types.h>
  #include <linux/jffs2.h>
  #include <lzo/lzo1x.h>
  #include "compr.h"
 --- a/compr_zlib.c
 +++ b/compr_zlib.c
 -#include <asm/types.h>
  #include <linux/jffs2.h>
  #include <lzo/lzo1x.h>
  #include "compr.h"
 --- a/compr_zlib.c
 +++ b/compr_zlib.c

-@@ -35,7 +35,6 @@
- #include <stdint.h>
+@@ -39,7 +39,6 @@

  #include <zlib.h>
  #include <zlib.h>

+ #undef crc32

  #include <stdio.h>
 -#include <asm/types.h>
  #include <linux/jffs2.h>
  #include <stdio.h>
 -#include <asm/types.h>
  #include <linux/jffs2.h>

+ #include "common.h"

  #include "compr.h"
  #include "compr.h"

- 

 --- a/rbtree.h
 +++ b/rbtree.h
 @@ -94,8 +94,7 @@ static inline struct page * rb_insert_pa
 --- a/rbtree.h
 +++ b/rbtree.h
 @@ -94,8 +94,7 @@ static inline struct page * rb_insert_pa


@@ -67,7 +67,7 @@
  #include <sys/types.h>
 --- a/mkfs.ubifs/mkfs.ubifs.c
 +++ b/mkfs.ubifs/mkfs.ubifs.c
  #include <sys/types.h>
 --- a/mkfs.ubifs/mkfs.ubifs.c
 +++ b/mkfs.ubifs/mkfs.ubifs.c

-@@ -773,8 +773,8 @@ int write_leb(int lnum, int len, void *b
+@@ -821,8 +821,8 @@ int write_leb(int lnum, int len, void *b

                if (ubi_leb_change_start(ubi, out_fd, lnum, c->leb_size, dtype))
                        return sys_err_msg("ubi_leb_change_start failed");
  
                if (ubi_leb_change_start(ubi, out_fd, lnum, c->leb_size, dtype))
                        return sys_err_msg("ubi_leb_change_start failed");
  


@@ -78,7 +78,7 @@
                                   (long long)pos);
  
        if (write(out_fd, buf, c->leb_size) != c->leb_size)
                                   (long long)pos);
  
        if (write(out_fd, buf, c->leb_size) != c->leb_size)

-@@ -1029,6 +1029,7 @@ static int add_inode_with_data(struct st
+@@ -1079,6 +1079,7 @@ static int add_inode_with_data(struct st

  
        if (c->default_compr != UBIFS_COMPR_NONE)
                use_flags |= UBIFS_COMPR_FL;
  
        if (c->default_compr != UBIFS_COMPR_NONE)
                use_flags |= UBIFS_COMPR_FL;


@@ -86,7 +86,7 @@
        if (flags & FS_COMPR_FL)
                use_flags |= UBIFS_COMPR_FL;
        if (flags & FS_SYNC_FL)
        if (flags & FS_COMPR_FL)
                use_flags |= UBIFS_COMPR_FL;
        if (flags & FS_SYNC_FL)

-@@ -1039,6 +1040,7 @@ static int add_inode_with_data(struct st
+@@ -1089,6 +1090,7 @@ static int add_inode_with_data(struct st

                use_flags |= UBIFS_APPEND_FL;
        if (flags & FS_DIRSYNC_FL && S_ISDIR(st->st_mode))
                use_flags |= UBIFS_DIRSYNC_FL;
                use_flags |= UBIFS_APPEND_FL;
        if (flags & FS_DIRSYNC_FL && S_ISDIR(st->st_mode))
                use_flags |= UBIFS_DIRSYNC_FL;


@@ -94,7 +94,7 @@
  
        memset(ino, 0, UBIFS_INO_NODE_SZ);
  
  
        memset(ino, 0, UBIFS_INO_NODE_SZ);
  

-@@ -1108,7 +1110,9 @@ static int add_dir_inode(DIR *dir, ino_t
+@@ -1158,7 +1160,9 @@ static int add_dir_inode(DIR *dir, ino_t

                fd = dirfd(dir);
                if (fd == -1)
                        return sys_err_msg("dirfd failed");
                fd = dirfd(dir);
                if (fd == -1)
                        return sys_err_msg("dirfd failed");


@@ -104,7 +104,7 @@
                        flags = 0;
        }
  
                        flags = 0;
        }
  

-@@ -1293,10 +1297,12 @@ static int add_file(const char *path_nam
+@@ -1343,10 +1347,12 @@ static int add_file(const char *path_nam

                key_write(&key, &dn->key);
                dn->size = cpu_to_le32(bytes_read);
                out_len = NODE_BUFFER_SIZE - UBIFS_DATA_NODE_SZ;
                key_write(&key, &dn->key);
                dn->size = cpu_to_le32(bytes_read);
                out_len = NODE_BUFFER_SIZE - UBIFS_DATA_NODE_SZ;


@@ -117,7 +117,7 @@
                        use_compr = c->default_compr;
                compr_type = compress_data(buf, bytes_read, &dn->data,
                                           &out_len, use_compr);
                        use_compr = c->default_compr;
                compr_type = compress_data(buf, bytes_read, &dn->data,
                                           &out_len, use_compr);

-@@ -1338,7 +1344,9 @@ static int add_non_dir(const char *path_
+@@ -1388,7 +1394,9 @@ static int add_non_dir(const char *path_

                if (fd == -1)
                        return sys_err_msg("failed to open file '%s'",
                                           path_name);
                if (fd == -1)
                        return sys_err_msg("failed to open file '%s'",
                                           path_name);