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

squashfsTools: fix 4k-align patch regression #64388

Merged
merged 1 commit into from Jul 8, 2019

Conversation

@charles-dyfis-net
Copy link
Contributor

commented Jul 6, 2019

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.

squashfsTools: Fix 4k-align patch (regression in 4.4dev)
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

This comment has been minimized.

Copy link
Contributor Author

commented Jul 6, 2019

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

@ruuda

ruuda approved these changes Jul 8, 2019

Copy link
Contributor

left a comment

Looks good to me, thanks!

@teto

This comment has been minimized.

Copy link
Contributor

commented Jul 8, 2019

trusting ruuda on this.

@teto teto merged commit f15d9d5 into NixOS:master Jul 8, 2019

13 checks passed

Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.