Changeset 19535


Ignore:
Timestamp:
2010-02-06T18:01:33+01:00 (8 years ago)
Author:
juhosg
Message:

kernel: merge lzma compressed initramfs fixes to 2.6.32 from [17289]

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic-2.6/patches-2.6.32/998-openwrt_lzma_options.patch

    r18440 r19535  
    66 cmd_lzma = (cat $(filter-out FORCE,$^) | \ 
    77-       lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ 
    8 +       lzma e -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ 
     8+       lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ 
    99        (rm -f $@ ; false) 
    1010  
     
    3030+               echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f -" 
    3131+               echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f -" 
    32 +               echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -lc1 -lp2 -pb2 -eos -si -so" 
     32+               echo "$output_file" | grep -q "\.lzma$" && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so" 
    3333                echo "$output_file" | grep -q "\.cpio$" && compr="cat" 
    3434                shift 
     
    4343        fi 
    4444        [ -z ${cpio_file} ] && rm ${cpio_tfile} 
     45--- a/lib/decompress.c 
     46+++ b/lib/decompress.c 
     47@@ -36,6 +36,7 @@ static const struct compress_format { 
     48        { {037, 0236}, "gzip", gunzip }, 
     49        { {0x42, 0x5a}, "bzip2", bunzip2 }, 
     50        { {0x5d, 0x00}, "lzma", unlzma }, 
     51+       { {0x6d, 0x00}, "lzma-openwrt", unlzma }, 
     52        { {0x89, 0x4c}, "lzo", unlzo }, 
     53        { {0, 0}, NULL, NULL } 
     54 }; 
Note: See TracChangeset for help on using the changeset viewer.