From: Liangbin Lian <jjm2473@gmail.com>
Date: Wed, 19 Aug 2020 15:44:48 +0000 (+0800)
Subject: tools/squashfs4: fix bugs of xz compress options
X-Git-Tag: v18.06.9~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=910ac641cc65fafabf9b4fb1b0fc6aacf49ef38c;p=thirdparty%2Fopenwrt.git

tools/squashfs4: fix bugs of xz compress options

lzma_xz_dump_options never return NULL,
should compare real options with default options

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
---

diff --git a/tools/squashfs4/patches/160-expose_lzma_xz_options.patch b/tools/squashfs4/patches/160-expose_lzma_xz_options.patch
index 9e1c1fbb1ea..fa20ca7ea35 100644
--- a/tools/squashfs4/patches/160-expose_lzma_xz_options.patch
+++ b/tools/squashfs4/patches/160-expose_lzma_xz_options.patch
@@ -370,9 +370,9 @@
 +	if (options.preset == 6 &&
 +			options.extreme == 0 &&
 +			options.lc == LZMA_OPT_LC_DEFAULT &&
-+			options.lp == LZMA_OPT_LC_DEFAULT &&
++			options.lp == LZMA_OPT_LP_DEFAULT &&
 +			options.pb == LZMA_OPT_PB_DEFAULT &&
-+			options.fb == 0 &&
++			options.fb == LZMA_OPT_FB_DEFAULT &&
 +			options.dict_size == block_size &&
 +			flags == 0)
 +		return NULL;
@@ -405,7 +405,7 @@
 +		options.preset = 6;
 +		options.extreme = 0;
 +		options.lc = LZMA_OPT_LC_DEFAULT;
-+		options.lp = LZMA_OPT_LC_DEFAULT;
++		options.lp = LZMA_OPT_LP_DEFAULT;
 +		options.pb = LZMA_OPT_PB_DEFAULT;
 +		options.fb = LZMA_OPT_FB_DEFAULT;
 +		options.dict_size = block_size;