diff options
author | Felix Fietkau <nbd@openwrt.org> | 2006-10-13 22:51:49 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2016-03-20 17:29:15 +0100 |
commit | 60c1f0f64d23003a19a07d6b9638542130f6641d (patch) | |
tree | 8fb2787f4c49baded97cd55e0c371fe1cffce2b6 /tools/mtd-utils/patches | |
parent | d58a09110ccfa95f06c983fe796806f2e035c9d2 (diff) | |
parent | b3ce218b51746d3a576221ea542facf3a1703ab2 (diff) | |
download | mtk-20170518-60c1f0f64d23003a19a07d6b9638542130f6641d.zip mtk-20170518-60c1f0f64d23003a19a07d6b9638542130f6641d.tar.gz mtk-20170518-60c1f0f64d23003a19a07d6b9638542130f6641d.tar.bz2 |
finally move buildroot-ng to trunk
Diffstat (limited to 'tools/mtd-utils/patches')
-rw-r--r-- | tools/mtd-utils/patches/100-gcc4_fix.patch | 24 | ||||
-rw-r--r-- | tools/mtd-utils/patches/110-portability_fix.patch | 63 |
2 files changed, 87 insertions, 0 deletions
diff --git a/tools/mtd-utils/patches/100-gcc4_fix.patch b/tools/mtd-utils/patches/100-gcc4_fix.patch new file mode 100644 index 0000000..50c8edb --- /dev/null +++ b/tools/mtd-utils/patches/100-gcc4_fix.patch @@ -0,0 +1,24 @@ +diff -urN mtd-20050122.orig.old/include/mtd/jffs2-user.h mtd-20050122.orig.dev/include/mtd/jffs2-user.h +--- mtd-20050122.orig.old/include/mtd/jffs2-user.h 2004-05-05 13:57:54.000000000 +0200 ++++ mtd-20050122.orig.dev/include/mtd/jffs2-user.h 2005-07-02 10:03:09.000000000 +0200 +@@ -19,8 +19,6 @@ + #undef je32_to_cpu + #undef jemode_to_cpu + +-extern int target_endian; +- + #define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); }) + #define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); }) + +diff -urN mtd.old/util/jffs3.h mtd.dev/util/jffs3.h +--- mtd.old/util/jffs3.h 2005-01-22 00:00:13.000000000 +0100 ++++ mtd.dev/util/jffs3.h 2005-07-17 17:48:24.000000000 +0200 +@@ -177,8 +177,6 @@ + #undef je32_to_cpu + #undef jemode_to_cpu + +-extern int target_endian; +- + #define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); }) + #define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); }) + diff --git a/tools/mtd-utils/patches/110-portability_fix.patch b/tools/mtd-utils/patches/110-portability_fix.patch new file mode 100644 index 0000000..b5e91d5 --- /dev/null +++ b/tools/mtd-utils/patches/110-portability_fix.patch @@ -0,0 +1,63 @@ +diff -urN mtd.old/include/asm/types.h mtd.dev/include/asm/types.h +--- mtd.old/include/asm/types.h 1970-01-01 01:00:00.000000000 +0100 ++++ mtd.dev/include/asm/types.h 2006-09-27 16:50:03.000000000 +0200 +@@ -0,0 +1,3 @@ ++#ifdef linux ++#include_next <asm/types.h> ++#endif +diff -urN mtd.old/util/mkfs.jffs2.c mtd.dev/util/mkfs.jffs2.c +--- mtd.old/util/mkfs.jffs2.c 2004-11-27 00:00:13.000000000 +0100 ++++ mtd.dev/util/mkfs.jffs2.c 2006-09-27 16:51:56.000000000 +0200 +@@ -68,6 +68,7 @@ + #include <zlib.h> + #undef crc32 + #include "crc32.h" ++#include <endian.h> + + /* Do not use the wierd XPG version of basename */ + #undef basename +@@ -1032,7 +1033,7 @@ + case S_IFDIR: + if (verbose) { + printf("\td %04o %9lu %5d:%-3d %s\n", +- e->sb.st_mode & ~S_IFMT, e->sb.st_size, ++ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size, + (int) (e->sb.st_uid), (int) (e->sb.st_gid), + e->name); + } +@@ -1041,7 +1042,7 @@ + case S_IFSOCK: + if (verbose) { + printf("\ts %04o %9lu %5d:%-3d %s\n", +- e->sb.st_mode & ~S_IFMT, e->sb.st_size, ++ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size, + (int) e->sb.st_uid, (int) e->sb.st_gid, e->name); + } + write_pipe(e); +@@ -1049,7 +1050,7 @@ + case S_IFIFO: + if (verbose) { + printf("\tp %04o %9lu %5d:%-3d %s\n", +- e->sb.st_mode & ~S_IFMT, e->sb.st_size, ++ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size, + (int) e->sb.st_uid, (int) e->sb.st_gid, e->name); + } + write_pipe(e); +@@ -1075,7 +1076,7 @@ + case S_IFLNK: + if (verbose) { + printf("\tl %04o %9lu %5d:%-3d %s -> %s\n", +- e->sb.st_mode & ~S_IFMT, e->sb.st_size, ++ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size, + (int) e->sb.st_uid, (int) e->sb.st_gid, e->name, + e->link); + } +@@ -1084,7 +1085,7 @@ + case S_IFREG: + if (verbose) { + printf("\tf %04o %9lu %5d:%-3d %s\n", +- e->sb.st_mode & ~S_IFMT, e->sb.st_size, ++ e->sb.st_mode & ~S_IFMT, (unsigned long)e->sb.st_size, + (int) e->sb.st_uid, (int) e->sb.st_gid, e->name); + } + write_regular_file(e); |