From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 3 Oct 2010 12:15:04 +0000 (+0000)
Subject: [tools] mtd-utils: refresh patches again
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=880f27e729ed44e1d304f89ac652da74b9726914;p=openwrt.git

[tools] mtd-utils: refresh patches again


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23194 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/tools/mtd-utils/patches/130-lzma_jffs2.patch b/tools/mtd-utils/patches/130-lzma_jffs2.patch
index b2364b6377..f869118fc4 100644
--- 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
-@@ -1691,11 +1691,11 @@ int main(int argc, char **argv)
+@@ -1684,11 +1684,11 @@ int main(int argc, char **argv)
  						  }
  						  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 ada1ea8e44..0fe072a6fb 100644
--- 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
-@@ -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)) {
@@ -9,7 +9,7 @@
  			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') {