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.

Sign up for GitHub

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

Cryptsetup: 2.0.2 -> 2.0.3. Also, add upstream libressl-2.7 patch. #42200

Merged
merged 1 commit into from Jul 9, 2018
Merged

Cryptsetup: 2.0.2 -> 2.0.3. Also, add upstream libressl-2.7 patch. #42200

merged 1 commit into from Jul 9, 2018

Conversation

qolii
Copy link
Contributor

@qolii qolii commented Jun 19, 2018

Motivation for this change

[Let's try this again, now that #38382 is merged!]

Update Cryptsetup from 2.0.2 to 2.0.3.

Also, apply an upstream patch to support building against LibreSSL-2.7.

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/)
  • Fits CONTRIBUTING.md.

@joachifm joachifm requested a review from lukateras June 20, 2018 13:38
@lukateras
Copy link
Member

@GrahamcOfBorg build cryptsetup

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: cryptsetup

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: cryptsetup

Partial log (click to expand)

shrinking /nix/store/jbbqzfdp1944gxf2kxp3ryj3036m7jwn-cryptsetup-2.0.3/sbin/veritysetup
shrinking /nix/store/jbbqzfdp1944gxf2kxp3ryj3036m7jwn-cryptsetup-2.0.3/sbin/integritysetup
shrinking /nix/store/jbbqzfdp1944gxf2kxp3ryj3036m7jwn-cryptsetup-2.0.3/sbin/cryptsetup-reencrypt
gzipping man pages under /nix/store/jbbqzfdp1944gxf2kxp3ryj3036m7jwn-cryptsetup-2.0.3/share/man/
strip is /nix/store/4mf2xm9p32lzrim927yk92xhx35yaz62-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/jbbqzfdp1944gxf2kxp3ryj3036m7jwn-cryptsetup-2.0.3/lib  /nix/store/jbbqzfdp1944gxf2kxp3ryj3036m7jwn-cryptsetup-2.0.3/sbin
patching script interpreter paths in /nix/store/jbbqzfdp1944gxf2kxp3ryj3036m7jwn-cryptsetup-2.0.3
checking for references to /build in /nix/store/jbbqzfdp1944gxf2kxp3ryj3036m7jwn-cryptsetup-2.0.3...
moving /nix/store/jbbqzfdp1944gxf2kxp3ryj3036m7jwn-cryptsetup-2.0.3/sbin/* to /nix/store/jbbqzfdp1944gxf2kxp3ryj3036m7jwn-cryptsetup-2.0.3/bin
/nix/store/jbbqzfdp1944gxf2kxp3ryj3036m7jwn-cryptsetup-2.0.3

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: cryptsetup

Partial log (click to expand)

shrinking /nix/store/y1f3wvipdh9ic0x0c9dkbbqsgaxa0g28-cryptsetup-2.0.3/sbin/veritysetup
shrinking /nix/store/y1f3wvipdh9ic0x0c9dkbbqsgaxa0g28-cryptsetup-2.0.3/sbin/cryptsetup
shrinking /nix/store/y1f3wvipdh9ic0x0c9dkbbqsgaxa0g28-cryptsetup-2.0.3/lib/libcryptsetup.so.12.3.0
gzipping man pages under /nix/store/y1f3wvipdh9ic0x0c9dkbbqsgaxa0g28-cryptsetup-2.0.3/share/man/
strip is /nix/store/min150lkigznaayzpwvf8d4jdl1dqvx6-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/y1f3wvipdh9ic0x0c9dkbbqsgaxa0g28-cryptsetup-2.0.3/lib  /nix/store/y1f3wvipdh9ic0x0c9dkbbqsgaxa0g28-cryptsetup-2.0.3/sbin
patching script interpreter paths in /nix/store/y1f3wvipdh9ic0x0c9dkbbqsgaxa0g28-cryptsetup-2.0.3
checking for references to /build in /nix/store/y1f3wvipdh9ic0x0c9dkbbqsgaxa0g28-cryptsetup-2.0.3...
moving /nix/store/y1f3wvipdh9ic0x0c9dkbbqsgaxa0g28-cryptsetup-2.0.3/sbin/* to /nix/store/y1f3wvipdh9ic0x0c9dkbbqsgaxa0g28-cryptsetup-2.0.3/bin
/nix/store/y1f3wvipdh9ic0x0c9dkbbqsgaxa0g28-cryptsetup-2.0.3

@jtojnar jtojnar mentioned this pull request Jun 24, 2018
Closed
@qolii
Copy link
Contributor Author

qolii commented Jul 3, 2018

Any love for this one? I think it is safe.

@xeji
Copy link
Contributor

xeji commented Jul 9, 2018

Let's see if the installer test runs
@GrahamcOfBorg test installer.luksroot

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: tests.installer.luksroot

Partial log (click to expand)

while evaluating anonymous function at /var/lib/gc-of-borg/nix-test-rs-16/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-16/nixos/release.nix:30:25, called from /var/lib/gc-of-borg/nix-test-rs-16/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-16/lib/attrsets.nix:200:54:
while evaluating 'hydraJob' at /var/lib/gc-of-borg/nix-test-rs-16/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-16/lib/customisation.nix:162:14, called from /var/lib/gc-of-borg/nix-test-rs-16/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-16/nixos/release.nix:30:28:
while evaluating the attribute 'drvPath' at /var/lib/gc-of-borg/nix-test-rs-16/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-16/lib/customisation.nix:179:13:
while evaluating the attribute 'drvPath' at /var/lib/gc-of-borg/nix-test-rs-16/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-16/lib/customisation.nix:146:13:
while evaluating the attribute 'buildCommand' of the derivation 'vm-test-run-installer-luksroot' at /var/lib/gc-of-borg/nix-test-rs-16/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-16/pkgs/stdenv/generic/make-derivation.nix:175:11:
while evaluating the attribute 'testScript' of the derivation 'nixos-test-driver-installer-luksroot' at /var/lib/gc-of-borg/nix-test-rs-16/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-16/pkgs/stdenv/generic/make-derivation.nix:175:11:
while evaluating 'isFunction' at /var/lib/gc-of-borg/nix-test-rs-16/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-16/lib/trivial.nix:213:16, called from /var/lib/gc-of-borg/nix-test-rs-16/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-16/nixos/lib/testing.nix:104:12:
while evaluating 'testScriptFun' at /var/lib/gc-of-borg/nix-test-rs-16/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-16/nixos/tests/installer.nix:68:19, called from /var/lib/gc-of-borg/nix-test-rs-16/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-16/nixos/tests/installer.nix:267:20:
Non-EFI boot methods are only supported on i686 / x86_64

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.installer.luksroot

Partial log (click to expand)

machine# [   40.352380] systemd-shutdown[1]: All loop devices detached.
machine# [   40.356723] systemd-shutdown[1]: Detaching DM devices.
machine# [   40.370717] ACPI: Preparing to enter system sleep state S5
machine# [   40.375575] reboot: Power down
collecting coverage data
syncing
test script finished in 1117.53s
vde_switch: EOF on stdin, cleaning up and exiting
cleaning up
/nix/store/rdgz2k68mzvwjdakgr4gxkzpsy4jlf3v-vm-test-run-installer-luksroot

@xeji xeji merged commit c4adce7 into NixOS:master Jul 9, 2018
@qolii
Copy link
Contributor Author

qolii commented Jul 9, 2018

Thanks so much @xeji!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lukateras lukateras lukateras approved these changes

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@qolii @lukateras @GrahamcOfBorg @xeji