2.6.30: fix lzma compressed intitramfs support, and decrease dictionary size

SVN-Revision: 17289
owl
Gabor Juhos 2009-08-16 19:21:21 +00:00
parent c0d4cb1f24
commit 7f1cd738fc
1 changed files with 11 additions and 1 deletions

View File

@ -26,7 +26,7 @@
- echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
+ echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f -"
+ echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -"
+ echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -lc1 -lp2 -pb2 -eos -si -so"
+ echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -d20 -lc1 -lp2 -pb2 -si -so"
echo "$output_file" | grep -q "\.cpio$" && compr="cat"
shift
;;
@ -39,3 +39,13 @@
|| (rm -f ${output_file} ; false)
fi
[ -z ${cpio_file} ] && rm ${cpio_tfile}
--- a/lib/decompress.c
+++ b/lib/decompress.c
@@ -32,6 +32,7 @@ static const struct compress_format {
{ {037, 0236}, "gzip", gunzip },
{ {0x42, 0x5a}, "bzip2", bunzip2 },
{ {0x5d, 0x00}, "lzma", unlzma },
+ { {0x6d, 0x00}, "lzma-openwrt", unlzma },
{ {0, 0}, NULL, NULL }
};