aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiangbin Lian <jjm2473@gmail.com>2020-08-19 23:44:48 +0800
committerHauke Mehrtens <hauke@hauke-m.de>2020-09-28 00:37:50 +0200
commit910ac641cc65fafabf9b4fb1b0fc6aacf49ef38c (patch)
tree2c5a1329467b7428309f924fecf42f44d20b2918
parente6bcfdfdbaedf528a272b1b9425cd13d5c39a250 (diff)
downloadupstream-910ac641cc65fafabf9b4fb1b0fc6aacf49ef38c.tar.gz
upstream-910ac641cc65fafabf9b4fb1b0fc6aacf49ef38c.tar.bz2
upstream-910ac641cc65fafabf9b4fb1b0fc6aacf49ef38c.zip
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>
-rw-r--r--tools/squashfs4/patches/160-expose_lzma_xz_options.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/squashfs4/patches/160-expose_lzma_xz_options.patch b/tools/squashfs4/patches/160-expose_lzma_xz_options.patch
index 9e1c1fbb1e..fa20ca7ea3 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;