aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2016-06-21 22:05:44 +0200
committerRalph Sennhauser <ralph.sennhauser@gmail.com>2016-11-06 13:45:32 +0100
commitf50b355db73a16a99d14deeca631aea7e62072d3 (patch)
tree96d242db75a4d847e18f076e32b8c5f17f4f1004 /tools
parentcabb0c506526fe468e4aa985086e50c440192122 (diff)
downloadmaster-187ad058-f50b355db73a16a99d14deeca631aea7e62072d3.tar.gz
master-187ad058-f50b355db73a16a99d14deeca631aea7e62072d3.tar.bz2
master-187ad058-f50b355db73a16a99d14deeca631aea7e62072d3.zip
squashfs4: use upstream xz compression header format
In the upstream kernel and the upstream squashfs4 tools the xz compression header looks the following: struct disk_comp_opts { __le32 dictionary_size; __le32 flags; }; We added some other members and also moved some existing members. Place the members which are already in upstream header at the same position as in that kernel and add our own at the end. The kernel should not have a problem when there are some additional members and just ignore them. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/squashfs4/patches/160-expose_lzma_xz_options.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/squashfs4/patches/160-expose_lzma_xz_options.patch b/tools/squashfs4/patches/160-expose_lzma_xz_options.patch
index 2fbd954859..9e1c1fbb1e 100644
--- a/tools/squashfs4/patches/160-expose_lzma_xz_options.patch
+++ b/tools/squashfs4/patches/160-expose_lzma_xz_options.patch
@@ -40,6 +40,7 @@
+
+
+struct lzma_opts {
++ uint32_t dict_size;
+ uint32_t flags;
+#define LZMA_OPT_FLT_MASK 0xffff
+#define LZMA_OPT_PRE_OFF 16
@@ -53,7 +54,6 @@
+#define LZMA_OPT_PB_OFF 6
+#define LZMA_OPT_PB_MASK (0x7 << LZMA_OPT_PB_OFF)
+ uint16_t fb;
-+ uint32_t dict_size;
+};
+
+#if __BYTE_ORDER == __BIG_ENDIAN