Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The patch doesn't apply to squashfs-tools-4.4 #33

Open
morfikov opened this issue Apr 12, 2020 · 2 comments · May be fixed by #40
Open

The patch doesn't apply to squashfs-tools-4.4 #33

morfikov opened this issue Apr 12, 2020 · 2 comments · May be fixed by #40

Comments

@morfikov
Copy link

Is there any chance to fix the patch so it would be applied to squashfs-tools-4.4 ?

@hardfalcon
Copy link

One of the issues that would need to be solved for this is the conflicting compression algorithm identifiers in squashfs-tools/squashfs_fs.h.

sasquatch 4.3:

#define LZ4_COMPRESSION		5
// CJH: Added #defines for additional decompressors
#define LZMA_WRT_COMPRESSION        6
#define LZMA_ADAPTIVE_COMPRESSION   7
#define LZMA_ALT_COMPRESSION        8

squashfs-tools 4.4:

#define LZ4_COMPRESSION		5
#define ZSTD_COMPRESSION	6

You'd probably either have to try to remove zstd support from squashfs-tools 4.4 by reverting commit 6113361316, or (preferably) introduce additional code that allows end-users to switch between supporting lzma_wrt and zstd at runtime.

@cole-h cole-h linked a pull request Apr 17, 2021 that will close this issue
@cole-h
Copy link

cole-h commented Apr 17, 2021

I tried my hand at updating the patch in #40. WRT to the #define LZMA_* stuff, I just adjusted the index by 1 -- is there any obvious reason why this wouldn't be satisfactory? e.g. would it break interacting with squashfs-tools-4.3 stuff? (I'm wholly unfamiliar with this patch.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants