wok diff busybox/stuff/busybox-1.20-zmodules.u @ rev 12460
Up busybox (1.20.0)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Apr 22 13:08:24 2012 +0200 (2012-04-22) |
parents | |
children | b6347c31b319 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/busybox/stuff/busybox-1.20-zmodules.u Sun Apr 22 13:08:24 2012 +0200 1.3 @@ -0,0 +1,25 @@ 1.4 +Add LZMA_DEFAULT_MAGIC support 1.5 +--- busybox-1.20/archival/libarchive/open_transformer.c.ORG 1.6 ++++ busybox-1.20/archival/libarchive/open_transformer.c 1.7 +@@ -126,6 +126,21 @@ 1.8 + /* .gz and .bz2 both have 2-byte signature, and their 1.9 + * unpack_XXX_stream wants this header skipped. */ 1.10 + xread(fd, magic.b16, sizeof(magic.b16[0])); 1.11 ++#if 1 1.12 ++// SliTaz uses .gz suffix for lzma'd kernel modules 1.13 ++#if BB_BIG_ENDIAN 1.14 ++#define LZMA_DEFAULT_MAGIC 0x5d00 1.15 ++#else 1.16 ++#define LZMA_DEFAULT_MAGIC 0x5d 1.17 ++#endif 1.18 ++ if (ENABLE_FEATURE_SEAMLESS_LZMA 1.19 ++ && magic.b16[0] == LZMA_DEFAULT_MAGIC 1.20 ++ ) { 1.21 ++ USE_FOR_MMU(xformer = unpack_lzma_stream;) 1.22 ++ USE_FOR_NOMMU(xformer_prog = "unlzma";) 1.23 ++ goto found_magic; 1.24 ++ } 1.25 ++#endif 1.26 + if (ENABLE_FEATURE_SEAMLESS_GZ 1.27 + && magic.b16[0] == GZIP_MAGIC 1.28 + ) {