squashfsTools: fix 4k-align patch regression #64388
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
In #49200, an option to use 4k-aligned squashfs blocks was incorporated. Originally developed by Google, this makes it easy to build squashfs images which tools such as casync/desync/etc. can effectively chunk for easier distribution.
In 2aafeed, this patch stopped being successfully applied. I haven't yet determined how this didn't break the build outright, but many of the strings inserted by the patch existed nowhere in the binary at all, and several components would have failed to apply, had it actually been attempted.
In this PR, the patch is updated to apply correctly on top of squashfs 4.4 as modified by the other patches previously applied.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after) no change; 34038808 both before and after