| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980 |
- From b3d00b452467f621317953d9e4c6f9ae8dcfd271 Mon Sep 17 00:00:00 2001
- From: Imre Kaloz <[email protected]>
- Date: Fri, 7 Jul 2017 17:06:55 +0200
- Subject: use the openwrt lzma options for now
- lede-commit: 548de949f392049420a6a1feeef118b30ab8ea8c
- Signed-off-by: Imre Kaloz <[email protected]>
- ---
- lib/decompress.c | 1 +
- scripts/Makefile.lib | 2 +-
- scripts/gen_initramfs_list.sh | 10 +++++-----
- 3 files changed, 7 insertions(+), 6 deletions(-)
- diff --git a/lib/decompress.c b/lib/decompress.c
- index 62696dff5730..d91a26e1a1b2 100644
- --- a/lib/decompress.c
- +++ b/lib/decompress.c
- @@ -48,6 +48,7 @@ static const struct compress_format compressed_formats[] __initconst = {
- { {0x1f, 0x9e}, "gzip", gunzip },
- { {0x42, 0x5a}, "bzip2", bunzip2 },
- { {0x5d, 0x00}, "lzma", unlzma },
- + { {0x6d, 0x00}, "lzma-openwrt", unlzma },
- { {0xfd, 0x37}, "xz", unxz },
- { {0x89, 0x4c}, "lzo", unlzo },
- { {0x02, 0x21}, "lz4", unlz4 },
- diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
- index 0a07f9014944..5324c072c598 100644
- --- a/scripts/Makefile.lib
- +++ b/scripts/Makefile.lib
- @@ -344,7 +344,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) | \
-
- quiet_cmd_lzma = LZMA $@
- cmd_lzma = (cat $(filter-out FORCE,$^) | \
- - lzma -9 && $(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 $@
- diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
- index 0055b07b03b6..7710113e6a72 100755
- --- a/scripts/gen_initramfs_list.sh
- +++ b/scripts/gen_initramfs_list.sh
- @@ -229,7 +229,7 @@ cpio_list=
- output="/dev/stdout"
- output_file=""
- is_cpio_compressed=
- -compr="gzip -n -9 -f"
- +compr="gzip -n -9 -f -"
-
- arg="$1"
- case "$arg" in
- @@ -245,13 +245,13 @@ case "$arg" in
- output=${cpio_list}
- echo "$output_file" | grep -q "\.gz$" \
- && [ -x "`which gzip 2> /dev/null`" ] \
- - && compr="gzip -n -9 -f"
- + && compr="gzip -n -9 -f -"
- echo "$output_file" | grep -q "\.bz2$" \
- && [ -x "`which bzip2 2> /dev/null`" ] \
- - && compr="bzip2 -9 -f"
- + && compr="bzip2 -9 -f -"
- echo "$output_file" | grep -q "\.lzma$" \
- && [ -x "`which lzma 2> /dev/null`" ] \
- - && compr="lzma -9 -f"
- + && compr="lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so"
- echo "$output_file" | grep -q "\.xz$" \
- && [ -x "`which xz 2> /dev/null`" ] \
- && compr="xz --check=crc32 --lzma2=dict=1MiB"
- @@ -318,7 +318,7 @@ if [ ! -z ${output_file} ]; then
- if [ "${is_cpio_compressed}" = "compressed" ]; then
- cat ${cpio_tfile} > ${output_file}
- else
- - (cat ${cpio_tfile} | ${compr} - > ${output_file}) \
- + (cat ${cpio_tfile} | ${compr} > ${output_file}) \
- || (rm -f ${output_file} ; false)
- fi
- [ -z ${cpio_file} ] && rm ${cpio_tfile}
- --
- 2.11.0
|
