aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mtd-utils
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-10-03 12:15:04 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-10-03 12:15:04 +0000
commit8affb4906929251bfd594979a1eed12f19328aa7 (patch)
tree9454afede684ee3c894f5c6d3ff703cd3ee4910b /tools/mtd-utils
parent8d6ec9e470ef44a03a6b983e9ea2f5203412f125 (diff)
downloadmaster-187ad058-8affb4906929251bfd594979a1eed12f19328aa7.tar.gz
master-187ad058-8affb4906929251bfd594979a1eed12f19328aa7.tar.bz2
master-187ad058-8affb4906929251bfd594979a1eed12f19328aa7.zip
[tools] mtd-utils: refresh patches again
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23194 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mtd-utils')
-rw-r--r--tools/mtd-utils/patches/130-lzma_jffs2.patch2
-rw-r--r--tools/mtd-utils/patches/133-error-fix.patch4
2 files changed, 3 insertions, 3 deletions
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') {