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

Jump to bottom

squashfsTools: fix 4k-align patch regression #64388

Merged
merged 1 commit into from Jul 8, 2019
Merged

squashfsTools: fix 4k-align patch regression #64388

merged 1 commit into from Jul 8, 2019

Conversation

charles-dyfis-net
Copy link
Contributor

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
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after) no change; 34038808 both before and after
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@charles-dyfis-net
squashfsTools: Fix 4k-align patch (regression in 4.4dev)
81835ad 
The 4k-align squashfs patch was broken in the update to squashfs 4.4dev,
such that the patch was no longer actually applied in full (command line
option not even parsed).
@charles-dyfis-net
Copy link
Contributor Author

@danbst, @ruuda -- if either of y'all are available to review, I would be appreciative.

ruuda
ruuda approved these changes Jul 8, 2019
View reviewed changes
Copy link
Contributor

@ruuda ruuda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks!

@teto
Copy link
Member

teto commented Jul 8, 2019

trusting ruuda on this.

@teto teto merged commit f15d9d5 into NixOS:master Jul 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruuda ruuda ruuda approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@charles-dyfis-net @teto @ruuda