KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mtd-utils: do not rely on host kernel headers, redefine the integer types instead (#7950)

Browse source 
SVN-Revision: 23075
This commit is contained in:
Jo-Philipp Wich 2010-09-15 22:45:54 +00:00
parent ab5d942622
commit 297f110b2c
2 changed files with 38 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tools/mtd-utils/patches/110-portability.patch
View file

@ -42,13 +42,12 @@
const typeof( ((type *)0)->member ) *__mptr = (ptr); \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \
--- a/include/mtd/ubi-media.h --- a/include/mtd/ubi-media.h
+++ b/include/mtd/ubi-media.h +++ b/include/mtd/ubi-media.h
@@ -30,7 +30,15 @@ @@ -30,7 +30,13 @@
#ifndef __UBI_MEDIA_H__ #ifndef __UBI_MEDIA_H__
#define __UBI_MEDIA_H__ #define __UBI_MEDIA_H__
+#ifdef __linux__ -#include <asm/byteorder.h>
#include <asm/byteorder.h> +#if !defined(__u8) || !defined(__be16) || !defined(__be32) || !defined(__be64)
+#else
+#include <stdint.h> +#include <stdint.h>
+typedef uint8_t __u8; +typedef uint8_t __u8;
+typedef uint16_t __be16; +typedef uint16_t __be16;

70
tools/mtd-utils/patches/130-lzma_jffs2.patch
View file

@ -1,5 +1,5 @@
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
# -*- sh -*- # -*- sh -*-
@ -9,7 +9,7 @@
ifeq ($(WITHOUT_XATTR), 1) ifeq ($(WITHOUT_XATTR), 1)
CPPFLAGS += -DWITHOUT_XATTR CPPFLAGS += -DWITHOUT_XATTR
@@ -45,7 +45,9 @@ @@ -45,7 +45,9 @@ $(SYMLINKS):
ln -sf ../fs/jffs2/$@ $@ ln -sf ../fs/jffs2/$@ $@
$(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\ $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\
@ -20,9 +20,9 @@
compr.o rbtree.o) compr.o rbtree.o)
LDFLAGS_mkfs.jffs2 := $(ZLIBLDFLAGS) LDFLAGS_mkfs.jffs2 := $(ZLIBLDFLAGS)
--- a/compr.c 2009-06-05 16:59:08.000000000 +0200 --- a/compr.c
+++ b/compr.c 2010-03-20 23:16:14.556367000 +0100 +++ b/compr.c
@@ -520,6 +520,9 @@ @@ -520,6 +520,9 @@ int jffs2_compressors_init(void)
#ifdef CONFIG_JFFS2_LZO #ifdef CONFIG_JFFS2_LZO
jffs2_lzo_init(); jffs2_lzo_init();
#endif #endif
@ -32,7 +32,7 @@
return 0; return 0;
} }
@@ -534,5 +537,8 @@ @@ -534,5 +537,8 @@ int jffs2_compressors_exit(void)
#ifdef CONFIG_JFFS2_LZO #ifdef CONFIG_JFFS2_LZO
jffs2_lzo_exit(); jffs2_lzo_exit();
#endif #endif
@ -41,8 +41,8 @@
+#endif +#endif
return 0; return 0;
} }
--- a/compr.h 2010-03-20 23:08:46.289595000 +0100 --- a/compr.h
+++ b/compr.h 2010-03-20 23:51:41.953345921 +0100 +++ b/compr.h
@@ -18,12 +18,14 @@ @@ -18,12 +18,14 @@
#define CONFIG_JFFS2_ZLIB #define CONFIG_JFFS2_ZLIB
@ -60,7 +60,7 @@
#define JFFS2_COMPR_MODE_NONE 0 #define JFFS2_COMPR_MODE_NONE 0
#define JFFS2_COMPR_MODE_PRIORITY 1 #define JFFS2_COMPR_MODE_PRIORITY 1
@@ -114,5 +116,10 @@ @@ -114,5 +116,10 @@ void jffs2_rtime_exit(void);
int jffs2_lzo_init(void); int jffs2_lzo_init(void);
void jffs2_lzo_exit(void); void jffs2_lzo_exit(void);
#endif #endif
@ -71,8 +71,8 @@
+ +
#endif /* __JFFS2_COMPR_H__ */ #endif /* __JFFS2_COMPR_H__ */
--- a/compr_lzma.c 1970-01-01 01:00:00.000000000 +0100 --- /dev/null
+++ b/compr_lzma.c 2010-03-20 23:16:15.048654497 +0100 +++ b/compr_lzma.c
@@ -0,0 +1,128 @@ @@ -0,0 +1,128 @@
+/* +/*
+ * JFFS2 -- Journalling Flash File System, Version 2. + * JFFS2 -- Journalling Flash File System, Version 2.
@ -202,8 +202,8 @@
+ jffs2_unregister_compressor(&jffs2_lzma_comp); + jffs2_unregister_compressor(&jffs2_lzma_comp);
+ lzma_free_workspace(); + lzma_free_workspace();
+} +}
--- a/include/linux/jffs2.h 2009-06-05 16:59:08.000000000 +0200 --- a/include/linux/jffs2.h
+++ b/include/linux/jffs2.h 2010-03-20 23:16:15.305246000 +0100 +++ b/include/linux/jffs2.h
@@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@
#define JFFS2_COMPR_DYNRUBIN 0x05 #define JFFS2_COMPR_DYNRUBIN 0x05
#define JFFS2_COMPR_ZLIB 0x06 #define JFFS2_COMPR_ZLIB 0x06
@ -212,8 +212,8 @@
/* Compatibility flags. */ /* Compatibility flags. */
#define JFFS2_COMPAT_MASK 0xc000 /* What do to if an unknown nodetype is found */ #define JFFS2_COMPAT_MASK 0xc000 /* What do to if an unknown nodetype is found */
#define JFFS2_NODE_ACCURATE 0x2000 #define JFFS2_NODE_ACCURATE 0x2000
--- a/include/linux/lzma.h 1970-01-01 01:00:00.000000000 +0100 --- /dev/null
+++ b/include/linux/lzma.h 2010-03-20 23:16:16.380508712 +0100 +++ b/include/linux/lzma.h
@@ -0,0 +1,61 @@ @@ -0,0 +1,61 @@
+#ifndef __LZMA_H__ +#ifndef __LZMA_H__
+#define __LZMA_H__ +#define __LZMA_H__
@ -276,8 +276,8 @@
+static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free}; +static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free};
+ +
+#endif +#endif
--- a/include/linux/lzma/LzFind.h 1970-01-01 01:00:00.000000000 +0100 --- /dev/null
+++ b/include/linux/lzma/LzFind.h 2010-03-20 23:19:44.189059515 +0100 +++ b/include/linux/lzma/LzFind.h
@@ -0,0 +1,116 @@ @@ -0,0 +1,116 @@
+/* LzFind.h -- Match finder for LZ algorithms +/* LzFind.h -- Match finder for LZ algorithms
+2008-04-04 +2008-04-04
@ -395,8 +395,8 @@
+void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num); +void Hc3Zip_MatchFinder_Skip(CMatchFinder *p, UInt32 num);
+ +
+#endif +#endif
--- a/include/linux/lzma/LzHash.h 1970-01-01 01:00:00.000000000 +0100 --- /dev/null
+++ b/include/linux/lzma/LzHash.h 2010-03-20 23:19:44.588791287 +0100 +++ b/include/linux/lzma/LzHash.h
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+/* LzHash.h -- HASH functions for LZ algorithms +/* LzHash.h -- HASH functions for LZ algorithms
+2008-03-26 +2008-03-26
@ -454,8 +454,8 @@
+ hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); } + hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); }
+ +
+#endif +#endif
--- a/include/linux/lzma/LzmaDec.h 1970-01-01 01:00:00.000000000 +0100 --- /dev/null
+++ b/include/linux/lzma/LzmaDec.h 2010-03-20 23:19:43.766328000 +0100 +++ b/include/linux/lzma/LzmaDec.h
@@ -0,0 +1,232 @@ @@ -0,0 +1,232 @@
+/* LzmaDec.h -- LZMA Decoder +/* LzmaDec.h -- LZMA Decoder
+2008-04-29 +2008-04-29
@ -689,8 +689,8 @@
+ ELzmaStatus *status, ISzAlloc *alloc); + ELzmaStatus *status, ISzAlloc *alloc);
+ +
+#endif +#endif
--- a/include/linux/lzma/LzmaEnc.h 1970-01-01 01:00:00.000000000 +0100 --- /dev/null
+++ b/include/linux/lzma/LzmaEnc.h 2010-03-20 23:19:47.392642470 +0100 +++ b/include/linux/lzma/LzmaEnc.h
@@ -0,0 +1,74 @@ @@ -0,0 +1,74 @@
+/* LzmaEnc.h -- LZMA Encoder +/* LzmaEnc.h -- LZMA Encoder
+2008-04-27 +2008-04-27
@ -766,8 +766,8 @@
+ ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig); + ICompressProgress *progress, ISzAlloc *alloc, ISzAlloc *allocBig);
+ +
+#endif +#endif
--- a/include/linux/lzma/Types.h 1970-01-01 01:00:00.000000000 +0100 --- /dev/null
+++ b/include/linux/lzma/Types.h 2010-03-20 23:19:44.013465852 +0100 +++ b/include/linux/lzma/Types.h
@@ -0,0 +1,130 @@ @@ -0,0 +1,130 @@
+/* Types.h -- Basic types +/* Types.h -- Basic types
+2008-04-11 +2008-04-11
@ -899,8 +899,8 @@
+#define IAlloc_Free(p, a) (p)->Free((p), a) +#define IAlloc_Free(p, a) (p)->Free((p), a)
+ +
+#endif +#endif
--- a/lzma/LzFind.c 1970-01-01 01:00:00.000000000 +0100 --- /dev/null
+++ b/lzma/LzFind.c 2010-03-20 23:19:47.990406000 +0100 +++ b/lzma/LzFind.c
@@ -0,0 +1,753 @@ @@ -0,0 +1,753 @@
+/* LzFind.c -- Match finder for LZ algorithms +/* LzFind.c -- Match finder for LZ algorithms
+2008-04-04 +2008-04-04
@ -1655,8 +1655,8 @@
+ vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip; + vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip;
+ } + }
+} +}
--- a/lzma/LzmaDec.c 1970-01-01 01:00:00.000000000 +0100 --- /dev/null
+++ b/lzma/LzmaDec.c 2010-03-20 23:19:44.413562000 +0100 +++ b/lzma/LzmaDec.c
@@ -0,0 +1,1014 @@ @@ -0,0 +1,1014 @@
+/* LzmaDec.c -- LZMA Decoder +/* LzmaDec.c -- LZMA Decoder
+2008-04-29 +2008-04-29
@ -2672,8 +2672,8 @@
+ LzmaDec_FreeProbs(&p, alloc); + LzmaDec_FreeProbs(&p, alloc);
+ return res; + return res;
+} +}
--- a/lzma/LzmaEnc.c 1970-01-01 01:00:00.000000000 +0100 --- /dev/null
+++ b/lzma/LzmaEnc.c 2010-03-20 23:19:47.815156000 +0100 +++ b/lzma/LzmaEnc.c
@@ -0,0 +1,2335 @@ @@ -0,0 +1,2335 @@
+/* LzmaEnc.c -- LZMA Encoder +/* LzmaEnc.c -- LZMA Encoder
+2008-04-28 +2008-04-28
@ -5010,9 +5010,9 @@
+ LzmaEnc_Destroy(p, alloc, allocBig); + LzmaEnc_Destroy(p, alloc, allocBig);
+ return res; + return res;
+} +}
--- a/mkfs.jffs2.c 2009-06-05 16:59:08.000000000 +0200 --- a/mkfs.jffs2.c
+++ b/mkfs.jffs2.c 2010-03-20 23:16:16.877026000 +0100 +++ b/mkfs.jffs2.c
@@ -1761,11 +1761,11 @@ int main(int argc, char **argv) @@ -1788,11 +1788,11 @@ int main(int argc, char **argv)
} }
erase_block_size *= units; erase_block_size *= units;