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

SVN-Revision: 17289

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 336c13ac73b092f377ba2158168405362d1a7c09..b9c9b786831f406a2457645693082bd0ca69fd60 100644 (file)
--- 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 }
+ };
+