diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2009-08-16 19:21:21 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2009-08-16 19:21:21 +0000 |
commit | 7f1cd738fc347d322dcb229032f91dde7b54e118 (patch) | |
tree | 41208b89db2abcba276a4582566d08a01fc50afd /target/linux/generic-2.6/patches-2.6.30 | |
parent | c0d4cb1f242939db2548c791b9b424f759532447 (diff) | |
download | upstream-7f1cd738fc347d322dcb229032f91dde7b54e118.tar.gz upstream-7f1cd738fc347d322dcb229032f91dde7b54e118.tar.bz2 upstream-7f1cd738fc347d322dcb229032f91dde7b54e118.zip |
2.6.30: fix lzma compressed intitramfs support, and decrease dictionary size
SVN-Revision: 17289
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch index 336c13ac73..b9c9b78683 100644 --- a/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch +++ b/target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch @@ -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 } + }; + |