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

iso-image: make reproducible by not relying on mcopy's readdir #57559

Merged
merged 1 commit into from Mar 29, 2019
Merged

iso-image: make reproducible by not relying on mcopy's readdir #57559

merged 1 commit into from Mar 29, 2019

Conversation

Ekleog
Copy link
Member

@Ekleog Ekleog commented Mar 13, 2019

Motivation for this change

https://r13y.com/diff/a367e8e30543e46b5ba60b938d64758ec869a804cdfc4b741baa49a6787115bb-5e7bb023000e2db7a008918f0f7bb59a6f66d17fe4974a54ee7945e9cf9675d8.html

My investigation ended up in mcopy's copying implementation relying on readdir order (file unixdir.c).

I'm not sure of the fix yet, as diffoscope raises a much bigger than expected diff. If someone knows the attribute path to one of our tests that exercises this code, I'll be happy to trigger an ofborg run.

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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Ekleog Ekleog requested a review from infinisil as a code owner March 13, 2019 02:22
@Ekleog
Copy link
Member Author

Ekleog commented Mar 13, 2019

@GrahamcOfBorg build nixosTests.installer.lvm

(hopefully it uses that)

@grahamc grahamc merged commit bb32e32 into NixOS:master Mar 29, 2019
@srhb srhb mentioned this pull request Apr 1, 2019
Closed
@Ekleog Ekleog mentioned this pull request Apr 1, 2019
Closed
10 tasks
@Ekleog
Copy link
Member Author

Ekleog commented Apr 1, 2019

Looks like this did break master as reported in #58691. I've reverted for now and re-opened as WIP in #58694

Ekleog added a commit that referenced this pull request Apr 1, 2019
@Ekleog
Revert "Merge pull request #57559 from Ekleog/iso-image-reproducibili…
e3b87b0 
…zation"

This reverts commit bb32e32, reversing
changes made to e0b4356.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil Awaiting requested review from infinisil

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Ekleog @grahamc @GrahamcOfBorg