[orion] generic: use magic_long in sysupgrade

[openwrt.git] / tools / mtd-utils / patches / 133-error-fix.patch

diff --git a/tools/mtd-utils/patches/133-error-fix.patch b/tools/mtd-utils/patches/133-error-fix.patch
index ada1ea8..4854138 100644 (file)
--- a/tools/mtd-utils/patches/133-error-fix.patch
+++ b/tools/mtd-utils/patches/133-error-fix.patch
@@ -1,7 +1,7 @@
 --- 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 
-       if (entry) {
+@@ -469,7 +469,7 @@ static int interpret_table_entry(struct
+       if (entry && !(count > 0 && (type == 'c' || type == 'b'))) {

                /* Check the type */
                if ((mode & S_IFMT) != (entry->sb.st_mode & S_IFMT)) {
 -                      error_msg ("skipping device_table entry '%s': type mismatch!", name);
                /* Check the type */
                if ((mode & S_IFMT) != (entry->sb.st_mode & S_IFMT)) {
 -                      error_msg ("skipping device_table entry '%s': type mismatch!", name);


@@ -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 
+@@ -485,7 +485,7 @@ static int interpret_table_entry(struct

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