diff options
author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-09-15 22:45:54 +0000 |
---|---|---|
committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-09-15 22:45:54 +0000 |
commit | c7af995072ed5588ccd2e4e3b6c64ad9f839b62c (patch) | |
tree | 946a21d76d780614ca51eb2b39b512e3a25afbda /tools/mtd-utils | |
parent | 61f8be35692f9c25aac6948fdfa421796119a8af (diff) |
[tools] mtd-utils: do not rely on host kernel headers, redefine the integer types instead (#7950)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23075 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools/mtd-utils')
-rw-r--r-- | tools/mtd-utils/patches/110-portability.patch | 7 | ||||
-rw-r--r-- | tools/mtd-utils/patches/130-lzma_jffs2.patch | 70 |
2 files changed, 38 insertions, 39 deletions
diff --git a/tools/mtd-utils/patches/110-portability.patch b/tools/mtd-utils/patches/110-portability.patch index d35b446587..4be69046ff 100644 --- a/tools/mtd-utils/patches/110-portability.patch +++ b/tools/mtd-utils/patches/110-portability.patch @@ -42,13 +42,12 @@ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ --- a/include/mtd/ubi-media.h +++ b/include/mtd/ubi-media.h -@@ -30,7 +30,15 @@ +@@ -30,7 +30,13 @@ #ifndef __UBI_MEDIA_H__ #define __UBI_MEDIA_H__ -+#ifdef __linux__ - #include <asm/byteorder.h> -+#else +-#include <asm/byteorder.h> ++#if !defined(__u8) || !defined(__be16) || !defined(__be32) || !defined(__be64) +#include <stdint.h> +typedef uint8_t __u8; +typedef uint16_t __be16; diff --git a/tools/mtd-utils/patches/130-lzma_jffs2.patch b/tools/mtd-utils/patches/130-lzma_jffs2.patch index 0f2b8af561..c2167820f9 100644 --- a/tools/mtd-utils/patches/130-lzma_jffs2.patch +++ b/tools/mtd-utils/patches/130-lzma_jffs2.patch @@ -1,5 +1,5 @@ ---- a/Makefile -+++ b/Makefile +--- a/Makefile ++++ b/Makefile @@ -1,7 +1,7 @@ # -*- sh -*- @@ -9,7 +9,7 @@ ifeq ($(WITHOUT_XATTR), 1) CPPFLAGS += -DWITHOUT_XATTR -@@ -45,7 +45,9 @@ +@@ -45,7 +45,9 @@ $(SYMLINKS): ln -sf ../fs/jffs2/$@ $@ $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\ @@ -20,9 +20,9 @@ compr.o rbtree.o) LDFLAGS_mkfs.jffs2 := $(ZLIBLDFLAGS) ---- a/compr.c 2009-06-05 16:59:08.000000000 +0200 -+++ b/compr.c 2010-03-20 23:16:14.556367000 +0100 -@@ -520,6 +520,9 @@ +--- a/compr.c ++++ b/compr.c +@@ -520,6 +520,9 @@ int jffs2_compressors_init(void) #ifdef CONFIG_JFFS2_LZO jffs2_lzo_init(); #endif @@ -32,7 +32,7 @@ return 0; } -@@ -534,5 +537,8 @@ +@@ -534,5 +537,8 @@ int jffs2_compressors_exit(void) #ifdef CONFIG_JFFS2_LZO jffs2_lzo_exit(); #endif @@ -41,8 +41,8 @@ +#endif return 0; } ---- a/compr.h 2010-03-20 23:08:46.289595000 +0100 -+++ b/compr.h 2010-03-20 23:51:41.953345921 +0100 +--- a/compr.h ++++ b/compr.h @@ -18,12 +18,14 @@ #define CONFIG_JFFS2_ZLIB @@ -60,7 +60,7 @@ #define JFFS2_COMPR_MODE_NONE 0 #define JFFS2_COMPR_MODE_PRIORITY 1 -@@ -114,5 +116,10 @@ +@@ -114,5 +116,10 @@ void jffs2_rtime_exit(void); int jffs2_lzo_init(void); void jffs2_lzo_exit(void); #endif @@ -71,8 +71,8 @@ + #endif /* __JFFS2_COMPR_H__ */ ---- a/compr_lzma.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/compr_lzma.c 2010-03-20 23:16:15.048654497 +0100 +--- /dev/null ++++ b/compr_lzma.c @@ -0,0 +1,128 @@ +/* + * JFFS2 -- Journalling Flash File System, Version 2. @@ -202,8 +202,8 @@ + jffs2_unregister_compressor(&jffs2_lzma_comp); + lzma_free_workspace(); +} ---- a/include/linux/jffs2.h 2009-06-05 16:59:08.000000000 +0200 -+++ b/include/linux/jffs2.h 2010-03-20 23:16:15.305246000 +0100 +--- a/include/linux/jffs2.h ++++ b/include/linux/jffs2.h @@ -47,6 +47,7 @@ #define JFFS2_COMPR_DYNRUBIN 0x05 #define JFFS2_COMPR_ZLIB 0x06 @@ -212,8 +212,8 @@ /* Compatibility flags. */ #define JFFS2_COMPAT_MASK 0xc000 /* What do to if an unknown nodetype is found */ #define JFFS2_NODE_ACCURATE 0x2000 ---- a/include/linux/lzma.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/linux/lzma.h 2010-03-20 23:16:16.380508712 +0100 +--- /dev/null ++++ b/include/linux/lzma.h @@ -0,0 +1,61 @@ +#ifndef __LZMA_H__ +#define __LZMA_H__ @@ -276,8 +276,8 @@ +static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free}; + +#endif ---- a/include/linux/lzma/LzFind.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/linux/lzma/LzFind.h 2010-03-20 23:19:44.189059515 +0100 +--- /dev/null ++++ b/include/linux/lzma/LzFind.h @@ -0,0 +1,116 @@ +/* LzFind.h -- Match finder for LZ algorithms +2008-04-04 @@ -395,8 +395,8 @@ +void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num); + +#endif ---- a/include/linux/lzma/LzHash.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/linux/lzma/LzHash.h 2010-03-20 23:19:44.588791287 +0100 +--- /dev/null ++++ b/include/linux/lzma/LzHash.h @@ -0,0 +1,56 @@ +/* LzHash.h -- HASH functions for LZ algorithms +2008-03-26 @@ -454,8 +454,8 @@ + hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); } + +#endif ---- a/include/linux/lzma/LzmaDec.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/linux/lzma/LzmaDec.h 2010-03-20 23:19:43.766328000 +0100 +--- /dev/null ++++ b/include/linux/lzma/LzmaDec.h @@ -0,0 +1,232 @@ +/* LzmaDec.h -- LZMA Decoder +2008-04-29 @@ -689,8 +689,8 @@ + ELzmaStatus *status, ISzAlloc *alloc); + +#endif ---- a/include/linux/lzma/LzmaEnc.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/linux/lzma/LzmaEnc.h 2010-03-20 23:19:47.392642470 +0100 +--- /dev/null ++++ b/include/linux/lzma/LzmaEnc.h @@ -0,0 +1,74 @@ +/* LzmaEnc.h -- LZMA Encoder +2008-04-27 @@ -766,8 +766,8 @@ + ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); + +#endif ---- a/include/linux/lzma/Types.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/linux/lzma/Types.h 2010-03-20 23:19:44.013465852 +0100 +--- /dev/null ++++ b/include/linux/lzma/Types.h @@ -0,0 +1,130 @@ +/* Types.h -- Basic types +2008-04-11 @@ -899,8 +899,8 @@ +#define IAlloc_Free(p, a) (p)->Free((p), a) + +#endif ---- a/lzma/LzFind.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/lzma/LzFind.c 2010-03-20 23:19:47.990406000 +0100 +--- /dev/null ++++ b/lzma/LzFind.c @@ -0,0 +1,753 @@ +/* LzFind.c -- Match finder for LZ algorithms +2008-04-04 @@ -1655,8 +1655,8 @@ + vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip; + } +} ---- a/lzma/LzmaDec.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/lzma/LzmaDec.c 2010-03-20 23:19:44.413562000 +0100 +--- /dev/null ++++ b/lzma/LzmaDec.c @@ -0,0 +1,1014 @@ +/* LzmaDec.c -- LZMA Decoder +2008-04-29 @@ -2672,8 +2672,8 @@ + LzmaDec_FreeProbs(&p, alloc); + return res; +} ---- a/lzma/LzmaEnc.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/lzma/LzmaEnc.c 2010-03-20 23:19:47.815156000 +0100 +--- /dev/null ++++ b/lzma/LzmaEnc.c @@ -0,0 +1,2335 @@ +/* LzmaEnc.c -- LZMA Encoder +2008-04-28 @@ -5010,9 +5010,9 @@ + LzmaEnc_Destroy(p, alloc, allocBig); + return res; +} ---- a/mkfs.jffs2.c 2009-06-05 16:59:08.000000000 +0200 -+++ b/mkfs.jffs2.c 2010-03-20 23:16:16.877026000 +0100 -@@ -1761,11 +1761,11 @@ int main(int argc, char **argv) +--- a/mkfs.jffs2.c ++++ b/mkfs.jffs2.c +@@ -1788,11 +1788,11 @@ int main(int argc, char **argv) } erase_block_size *= units; |