diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-06-19 21:31:35 -0500 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2021-06-20 18:59:36 -1000 |
| commit | 3cbdc13bc1367a6fdc9bc2afadfae21b74d7c781 (patch) | |
| tree | 94c0a92c31d7d977fbfec9875ee36dab847cc9c6 | |
| parent | b154a2f8d37097e51099ed816a0f8142120405e6 (diff) | |
| download | upstream-3cbdc13bc1367a6fdc9bc2afadfae21b74d7c781.tar.gz upstream-3cbdc13bc1367a6fdc9bc2afadfae21b74d7c781.tar.bz2 upstream-3cbdc13bc1367a6fdc9bc2afadfae21b74d7c781.zip | |
tools/squashfskit4: fix compilation under big endian
The macro used is for the wrong struct. Just byte swap manually.
Refreshed patches.
Tested on sparc64.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
| -rw-r--r-- | tools/squashfskit4/Makefile | 2 | ||||
| -rw-r--r-- | tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch | 8 | ||||
| -rw-r--r-- | tools/squashfskit4/patches/0020-big-endian.patch | 14 |
3 files changed, 18 insertions, 6 deletions
diff --git a/tools/squashfskit4/Makefile b/tools/squashfskit4/Makefile index 9ed10ecef9..1800306d33 100644 --- a/tools/squashfskit4/Makefile +++ b/tools/squashfskit4/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=squashfskit4 PKG_VERSION:=4.14 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=squashfskit-v$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/squashfskit/squashfskit/releases/download/v$(PKG_VERSION)/ PKG_HASH:=5761aaa3aedc4f7112b708367d891c9abdc1ffea972e3fe47923ddba23984d95 diff --git a/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch b/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch index 46c6a5ea0f..de77299978 100644 --- a/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch +++ b/tools/squashfskit4/patches/0002-fix-build-failure-against-gcc-10.patch @@ -28,16 +28,14 @@ Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> squashfs-tools/mksquashfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h -index 1beefef7..b6503063 100644 --- a/squashfs-tools/mksquashfs.h +++ b/squashfs-tools/mksquashfs.h -@@ -143,7 +143,7 @@ struct append_file { - #endif +@@ -133,7 +133,7 @@ struct append_file { + #define BLOCK_OFFSET 2 extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache; -struct cache *bwriter_buffer, *fwriter_buffer; +extern struct cache *bwriter_buffer, *fwriter_buffer; extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer, - *to_frag, *locked_fragment, *to_process_frag; + *locked_fragment, *to_process_frag; extern struct append_file **file_mapping; diff --git a/tools/squashfskit4/patches/0020-big-endian.patch b/tools/squashfskit4/patches/0020-big-endian.patch new file mode 100644 index 0000000000..b388cb4d12 --- /dev/null +++ b/tools/squashfskit4/patches/0020-big-endian.patch @@ -0,0 +1,14 @@ +--- a/squashfs-tools/xz_wrapper.c ++++ b/squashfs-tools/xz_wrapper.c +@@ -192,7 +192,10 @@ static void xz_display_options(void *buf + if(size != sizeof(struct comp_opts)) + goto failed; + +- SQUASHFS_INSWAP_LZMA_COMP_OPTS(comp_opts); ++#if __BYTE_ORDER == __BIG_ENDIAN ++ comp_opts->dictionary_size = inswap_le32(comp_opts->dictionary_size); ++ comp_opts->flags = inswap_le32(comp_opts->flags); ++#endif + + dictionary_size = comp_opts->dictionary_size; + flags = comp_opts->flags; |