diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-06-21 22:05:44 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2016-06-22 19:32:06 +0200 |
| commit | f97ad870e11ebe5f3dcf833dda6c83b9165b37cb (patch) | |
| tree | 435acc51f4bacb3c9f9137d227ea3f4c38d7b827 /tools/squashfs4/patches | |
| parent | f080cfab72d8801856fa01f0476f1fc9b920a9d9 (diff) | |
| download | upstream-f97ad870e11ebe5f3dcf833dda6c83b9165b37cb.tar.gz upstream-f97ad870e11ebe5f3dcf833dda6c83b9165b37cb.tar.bz2 upstream-f97ad870e11ebe5f3dcf833dda6c83b9165b37cb.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>
Diffstat (limited to 'tools/squashfs4/patches')
| -rw-r--r-- | tools/squashfs4/patches/160-expose_lzma_xz_options.patch | 2 |
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 |