target/linux/generic/hack-4.19/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 --- a/lib/decompress.c
  15 +++ b/lib/decompress.c
  16 @@ -49,6 +49,7 @@ static const struct compress_format comp
  17         { {0x1f, 0x9e}, "gzip", gunzip },
  18         { {0x42, 0x5a}, "bzip2", bunzip2 },
  19         { {0x5d, 0x00}, "lzma", unlzma },
  20 +       { {0x6d, 0x00}, "lzma-openwrt", unlzma },
  21         { {0xfd, 0x37}, "xz", unxz },
  22         { {0x89, 0x4c}, "lzo", unlzo },
  23         { {0x02, 0x21}, "lz4", unlz4 },
  24 --- a/scripts/Makefile.lib
  25 +++ b/scripts/Makefile.lib
  26 @@ -348,7 +348,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^)
  27
  28  quiet_cmd_lzma = LZMA    $@
  29  cmd_lzma = (cat $(filter-out FORCE,$^) | \
  30 -       lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
  31 +       lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
  32         (rm -f $@ ; false)
  33
  34  quiet_cmd_lzo = LZO     $@
  35 --- a/scripts/gen_initramfs_list.sh
  36 +++ b/scripts/gen_initramfs_list.sh
  37 @@ -229,7 +229,7 @@ cpio_list=
  38  output="/dev/stdout"
  39  output_file=""
  40  is_cpio_compressed=
  41 -compr="gzip -n -9 -f"
  42 +compr="gzip -n -9 -f -"
  43
  44  arg="$1"
  45  case "$arg" in
  46 @@ -245,13 +245,13 @@ case "$arg" in
  47                 output=${cpio_list}
  48                 echo "$output_file" | grep -q "\.gz$" \
  49                  && [ -x "`which gzip 2> /dev/null`" ] \
  50 -                && compr="gzip -n -9 -f"
  51 +                && compr="gzip -n -9 -f -"
  52                 echo "$output_file" | grep -q "\.bz2$" \
  53                  && [ -x "`which bzip2 2> /dev/null`" ] \
  54 -                && compr="bzip2 -9 -f"
  55 +                && compr="bzip2 -9 -f -"
  56                 echo "$output_file" | grep -q "\.lzma$" \
  57                  && [ -x "`which lzma 2> /dev/null`" ] \
  58 -                && compr="lzma -9 -f"
  59 +                && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
  60                 echo "$output_file" | grep -q "\.xz$" \
  61                  && [ -x "`which xz 2> /dev/null`" ] \
  62                  && compr="xz --check=crc32 --lzma2=dict=1MiB"
  63 @@ -320,7 +320,7 @@ if [ ! -z ${output_file} ]; then
  64         if [ "${is_cpio_compressed}" = "compressed" ]; then
  65                 cat ${cpio_tfile} > ${output_file}
  66         else
  67 -               (cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
  68 +               (cat ${cpio_tfile} | ${compr} > ${output_file}) \
  69                 || (rm -f ${output_file} ; false)
  70         fi
  71         [ -z ${cpio_file} ] && rm ${cpio_tfile}