mtd-utils: refresh patches again

SVN-Revision: 23194

diff --git a/tools/mtd-utils/patches/130-lzma_jffs2.patch b/tools/mtd-utils/patches/130-lzma_jffs2.patch
index b2364b63778aafe8904fce6060cf0439bf606326..f869118fc492f18d64921dc3a825e754bc135a80 100644 (file)
--- a/tools/mtd-utils/patches/130-lzma_jffs2.patch
+++ b/tools/mtd-utils/patches/130-lzma_jffs2.patch
@@ -5013,7 +5013,7 @@
 +}
 --- a/mkfs.jffs2.c
 +++ b/mkfs.jffs2.c
 +}
 --- a/mkfs.jffs2.c
 +++ b/mkfs.jffs2.c

-@@ -1691,11 +1691,11 @@ int main(int argc, char **argv)
+@@ -1684,11 +1684,11 @@ int main(int argc, char **argv)

                                                  }
                                                  erase_block_size *= units;
  
                                                  }
                                                  erase_block_size *= units;
  

diff --git a/tools/mtd-utils/patches/133-error-fix.patch b/tools/mtd-utils/patches/133-error-fix.patch
index ada1ea8e44c3be8fe284690109c0ed2fbb88478c..0fe072a6fb06febcf7405b41d78d945840ce2b73 100644 (file)
--- a/tools/mtd-utils/patches/133-error-fix.patch
+++ b/tools/mtd-utils/patches/133-error-fix.patch
@@ -1,6 +1,6 @@
 --- a/mkfs.jffs2.c
 +++ b/mkfs.jffs2.c
 --- a/mkfs.jffs2.c
 +++ b/mkfs.jffs2.c

-@@ -471,7 +471,7 @@ static int interpret_table_entry(struct 
+@@ -468,7 +468,7 @@ static int interpret_table_entry(struct 

        if (entry) {
                /* Check the type */
                if ((mode & S_IFMT) != (entry->sb.st_mode & S_IFMT)) {
        if (entry) {
                /* Check the type */
                if ((mode & S_IFMT) != (entry->sb.st_mode & S_IFMT)) {


@@ -9,7 +9,7 @@
                        free(name);
                        free(hostpath);
                        return 1;
                        free(name);
                        free(hostpath);
                        return 1;

-@@ -487,7 +487,7 @@ static int interpret_table_entry(struct 
+@@ -484,7 +484,7 @@ static int interpret_table_entry(struct 

                }
        } else {
                if (type == 'f' || type == 'l') {
                }
        } else {
                if (type == 'f' || type == 'l') {