summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-16 19:21:21 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-08-16 19:21:21 +0000
commitdd1725daab3ab8a9561c82bc439e087666334f4d (patch)
tree525bb221ac387c48b2ef3b0b9b6d4fa43a8a29c5 /target/linux/generic-2.6
parente66151f7945dbff921c2a376753c0ed51338e0de (diff)
[kernel] 2.6.30: fix lzma compressed intitramfs support, and decrease dictionary size
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17289 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/998-openwrt_lzma_options.patch12
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 336c13ac7..b9c9b7868 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 }
+ };
+