Skip to content

Commit

Permalink
squashfs4: use upstream xz compression header format
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
hauke authored and blogic committed Jun 22, 2016
1 parent f080cfa commit f97ad87
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 76 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion tools/squashfs4/patches/160-expose_lzma_xz_options.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit f97ad87

Please sign in to comment.