diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-02-06 17:01:33 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-02-06 17:01:33 +0000 |
| commit | 277682aaee812bf954ff7ea78c6de5c18c57ddac (patch) | |
| tree | 565d4c1de4c5cbd0085b71427625453c1a6422e1 /target | |
| parent | c7479020420857ed99f9aa7c460ec21989614e28 (diff) | |
| download | upstream-277682aaee812bf954ff7ea78c6de5c18c57ddac.tar.gz upstream-277682aaee812bf954ff7ea78c6de5c18c57ddac.tar.bz2 upstream-277682aaee812bf954ff7ea78c6de5c18c57ddac.zip | |
kernel: merge lzma compressed initramfs fixes to 2.6.32 from [17289]
SVN-Revision: 19535
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.32/998-openwrt_lzma_options.patch | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.32/998-openwrt_lzma_options.patch b/target/linux/generic-2.6/patches-2.6.32/998-openwrt_lzma_options.patch index 08bb83a433..face9154d8 100644 --- a/target/linux/generic-2.6/patches-2.6.32/998-openwrt_lzma_options.patch +++ b/target/linux/generic-2.6/patches-2.6.32/998-openwrt_lzma_options.patch @@ -5,7 +5,7 @@ quiet_cmd_lzma = LZMA $@ cmd_lzma = (cat $(filter-out FORCE,$^) | \ - lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ -+ lzma e -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ ++ lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ (rm -f $@ ; false) quiet_cmd_lzo = LZO $@ @@ -29,7 +29,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 -eos -si -so" echo "$output_file" | grep -q "\.cpio$" && compr="cat" shift ;; @@ -42,3 +42,13 @@ || (rm -f ${output_file} ; false) fi [ -z ${cpio_file} ] && rm ${cpio_tfile} +--- a/lib/decompress.c ++++ b/lib/decompress.c +@@ -36,6 +36,7 @@ static const struct compress_format { + { {037, 0236}, "gzip", gunzip }, + { {0x42, 0x5a}, "bzip2", bunzip2 }, + { {0x5d, 0x00}, "lzma", unlzma }, ++ { {0x6d, 0x00}, "lzma-openwrt", unlzma }, + { {0x89, 0x4c}, "lzo", unlzo }, + { {0, 0}, NULL, NULL } + }; |