diff options
4 files changed, 1 insertions, 76 deletions
diff --git a/target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch b/target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch deleted file mode 100644 index ad11b30281..0000000000 --- a/target/linux/generic/patches-3.18/520-squashfs_update_xz_comp_opts.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f31b7c0efa255dd17a5f584022a319387f09b0d8 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski <jonas.gorski@gmail.com> -Date: Tue, 12 Apr 2011 19:55:41 +0200 -Subject: [PATCH] squashfs: update xz compressor options struct. - -Update the xz compressor options struct to match the squashfs userspace -one. ---- - fs/squashfs/xz_wrapper.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - ---- a/fs/squashfs/xz_wrapper.c -+++ b/fs/squashfs/xz_wrapper.c -@@ -40,8 +40,10 @@ struct squashfs_xz { - }; - - struct disk_comp_opts { -- __le32 dictionary_size; - __le32 flags; -+ __le16 bit_opts; -+ __le16 fb; -+ __le32 dictionary_size; - }; - - struct comp_opts { diff --git a/target/linux/generic/patches-4.1/520-squashfs_update_xz_comp_opts.patch b/target/linux/generic/patches-4.1/520-squashfs_update_xz_comp_opts.patch deleted file mode 100644 index ad11b30281..0000000000 --- a/target/linux/generic/patches-4.1/520-squashfs_update_xz_comp_opts.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f31b7c0efa255dd17a5f584022a319387f09b0d8 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski <jonas.gorski@gmail.com> -Date: Tue, 12 Apr 2011 19:55:41 +0200 -Subject: [PATCH] squashfs: update xz compressor options struct. - -Update the xz compressor options struct to match the squashfs userspace -one. ---- - fs/squashfs/xz_wrapper.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - ---- a/fs/squashfs/xz_wrapper.c -+++ b/fs/squashfs/xz_wrapper.c -@@ -40,8 +40,10 @@ struct squashfs_xz { - }; - - struct disk_comp_opts { -- __le32 dictionary_size; - __le32 flags; -+ __le16 bit_opts; -+ __le16 fb; -+ __le32 dictionary_size; - }; - - struct comp_opts { diff --git a/target/linux/generic/patches-4.4/520-squashfs_update_xz_comp_opts.patch b/target/linux/generic/patches-4.4/520-squashfs_update_xz_comp_opts.patch deleted file mode 100644 index ad11b30281..0000000000 --- a/target/linux/generic/patches-4.4/520-squashfs_update_xz_comp_opts.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f31b7c0efa255dd17a5f584022a319387f09b0d8 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski <jonas.gorski@gmail.com> -Date: Tue, 12 Apr 2011 19:55:41 +0200 -Subject: [PATCH] squashfs: update xz compressor options struct. - -Update the xz compressor options struct to match the squashfs userspace -one. ---- - fs/squashfs/xz_wrapper.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - ---- a/fs/squashfs/xz_wrapper.c -+++ b/fs/squashfs/xz_wrapper.c -@@ -40,8 +40,10 @@ struct squashfs_xz { - }; - - struct disk_comp_opts { -- __le32 dictionary_size; - __le32 flags; -+ __le16 bit_opts; -+ __le16 fb; -+ __le32 dictionary_size; - }; - - struct comp_opts { 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 |