target/linux/generic/hack-4.9/230-openwrt_lzma_options.patch

   1 From b3d00b452467f621317953d9e4c6f9ae8dcfd271 Mon Sep 17 00:00:00 2001
   2 From: Imre Kaloz <kaloz@openwrt.org>
   3 Date: Fri, 7 Jul 2017 17:06:55 +0200
   4 Subject: use the openwrt lzma options for now
   5
   6 lede-commit: 548de949f392049420a6a1feeef118b30ab8ea8c
   7 Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
   8 ---
   9  lib/decompress.c              |  1 +
  10  scripts/Makefile.lib          |  2 +-
  11  scripts/gen_initramfs_list.sh | 10 +++++-----
  12  3 files changed, 7 insertions(+), 6 deletions(-)
  13
  14 diff --git a/lib/decompress.c b/lib/decompress.c
  15 index 62696dff5730..d91a26e1a1b2 100644
  16 --- a/lib/decompress.c
  17 +++ b/lib/decompress.c
  18 @@ -48,6 +48,7 @@ static const struct compress_format compressed_formats[] __initconst = {
  19         { {0x1f, 0x9e}, "gzip", gunzip },
  20         { {0x42, 0x5a}, "bzip2", bunzip2 },
  21         { {0x5d, 0x00}, "lzma", unlzma },
  22 +       { {0x6d, 0x00}, "lzma-openwrt", unlzma },
  23         { {0xfd, 0x37}, "xz", unxz },
  24         { {0x89, 0x4c}, "lzo", unlzo },
  25         { {0x02, 0x21}, "lz4", unlz4 },
  26 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
  27 index 0a07f9014944..5324c072c598 100644
  28 --- a/scripts/Makefile.lib
  29 +++ b/scripts/Makefile.lib
  30 @@ -344,7 +344,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) | \
  31
  32  quiet_cmd_lzma = LZMA    $@
  33  cmd_lzma = (cat $(filter-out FORCE,$^) | \
  34 -       lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
  35 +       lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
  36         (rm -f $@ ; false)
  37
  38  quiet_cmd_lzo = LZO     $@
  39 diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
  40 index 0055b07b03b6..7710113e6a72 100755
  41 --- a/scripts/gen_initramfs_list.sh
  42 +++ b/scripts/gen_initramfs_list.sh
  43 @@ -229,7 +229,7 @@ cpio_list=
  44  output="/dev/stdout"
  45  output_file=""
  46  is_cpio_compressed=
  47 -compr="gzip -n -9 -f"
  48 +compr="gzip -n -9 -f -"
  49
  50  arg="$1"
  51  case "$arg" in
  52 @@ -245,13 +245,13 @@ case "$arg" in
  53                 output=${cpio_list}
  54                 echo "$output_file" | grep -q "\.gz$" \
  55                  && [ -x "`which gzip 2> /dev/null`" ] \
  56 -                && compr="gzip -n -9 -f"
  57 +                && compr="gzip -n -9 -f -"
  58                 echo "$output_file" | grep -q "\.bz2$" \
  59                  && [ -x "`which bzip2 2> /dev/null`" ] \
  60 -                && compr="bzip2 -9 -f"
  61 +                && compr="bzip2 -9 -f -"
  62                 echo "$output_file" | grep -q "\.lzma$" \
  63                  && [ -x "`which lzma 2> /dev/null`" ] \
  64 -                && compr="lzma -9 -f"
  65 +                && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
  66                 echo "$output_file" | grep -q "\.xz$" \
  67                  && [ -x "`which xz 2> /dev/null`" ] \
  68                  && compr="xz --check=crc32 --lzma2=dict=1MiB"
  69 @@ -318,7 +318,7 @@ if [ ! -z ${output_file} ]; then
  70         if [ "${is_cpio_compressed}" = "compressed" ]; then
  71                 cat ${cpio_tfile} > ${output_file}
  72         else
  73 -               (cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
  74 +               (cat ${cpio_tfile} | ${compr} > ${output_file}) \
  75                 || (rm -f ${output_file} ; false)
  76         fi
  77         [ -z ${cpio_file} ] && rm ${cpio_tfile}
  78 --
  79 2.11.0
  80