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.3 -> 2.0.4 #45385

Merged
merged 3 commits into from Aug 27, 2018
Merged

cryptsetup: 2.0.3 -> 2.0.4 #45385

merged 3 commits into from Aug 27, 2018

Conversation

dmmarkov
Copy link

@dmmarkov dmmarkov commented Aug 20, 2018 •
edited

Motivation for this change

Remove patch from upstream.

Use the most relevant version.

I split outputs to out, dev and man, because sometimes not everybody need man or dev when using only binary files.

Things done
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Fits CONTRIBUTING.md.

@dmmarkov
Copy link
Author

@chaoflow

@dmmarkov
Copy link
Author

@GrahamcOfBorg build cryptsetup

@xeji xeji requested a review from lukateras August 21, 2018 09:37
@Mic92
Copy link
Member

Mic92 commented Aug 23, 2018

@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)

/nix/store/vp40my263xk32f07788srrgl59rycsna-binutils-2.30/bin/strip is /nix/store/vp40my263xk32f07788srrgl59rycsna-binutils-2.30/bin/strip
stripping (with command /nix/store/vp40my263xk32f07788srrgl59rycsna-binutils-2.30/bin/strip and flags -S) in /nix/store/0kn9vyihyc4yang5c90scssv827zan2d-cryptsetup-2.0.4-dev/lib
patching script interpreter paths in /nix/store/0kn9vyihyc4yang5c90scssv827zan2d-cryptsetup-2.0.4-dev
checking for references to /build in /nix/store/0kn9vyihyc4yang5c90scssv827zan2d-cryptsetup-2.0.4-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/0as5agrz89k36v0k0y06kfb0z81712w1-cryptsetup-2.0.4-man
gzipping man pages under /nix/store/0as5agrz89k36v0k0y06kfb0z81712w1-cryptsetup-2.0.4-man/share/man/
/nix/store/vp40my263xk32f07788srrgl59rycsna-binutils-2.30/bin/strip is /nix/store/vp40my263xk32f07788srrgl59rycsna-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/0as5agrz89k36v0k0y06kfb0z81712w1-cryptsetup-2.0.4-man
checking for references to /build in /nix/store/0as5agrz89k36v0k0y06kfb0z81712w1-cryptsetup-2.0.4-man...
/nix/store/p6csqqsb9fsmxj83hhd81gaggq685iii-cryptsetup-2.0.4

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: cryptsetup

Partial log (click to expand)

/nix/store/8wl4dykwswy42wxj671b6k7vk2ydxg86-binutils-2.30/bin/strip is /nix/store/8wl4dykwswy42wxj671b6k7vk2ydxg86-binutils-2.30/bin/strip
stripping (with command /nix/store/8wl4dykwswy42wxj671b6k7vk2ydxg86-binutils-2.30/bin/strip and flags -S) in /nix/store/d3f3z0zba88f6s8mz8cspnlgljgd6gwd-cryptsetup-2.0.4-dev/lib
patching script interpreter paths in /nix/store/d3f3z0zba88f6s8mz8cspnlgljgd6gwd-cryptsetup-2.0.4-dev
checking for references to /build in /nix/store/d3f3z0zba88f6s8mz8cspnlgljgd6gwd-cryptsetup-2.0.4-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/wimd4lki5g8pi8h4iq53apbmkqj2x0zd-cryptsetup-2.0.4-man
gzipping man pages under /nix/store/wimd4lki5g8pi8h4iq53apbmkqj2x0zd-cryptsetup-2.0.4-man/share/man/
/nix/store/8wl4dykwswy42wxj671b6k7vk2ydxg86-binutils-2.30/bin/strip is /nix/store/8wl4dykwswy42wxj671b6k7vk2ydxg86-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/wimd4lki5g8pi8h4iq53apbmkqj2x0zd-cryptsetup-2.0.4-man
checking for references to /build in /nix/store/wimd4lki5g8pi8h4iq53apbmkqj2x0zd-cryptsetup-2.0.4-man...
/nix/store/skajrwn2r0xkskmk4wg0b14yk5ap1k9w-cryptsetup-2.0.4

@Mic92
Copy link
Member

Mic92 commented Aug 23, 2018

@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)

error: while evaluating anonymous function at /var/lib/gc-of-borg/nix-test-rs-21/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-21/nixos/release.nix:30:25, called from undefined position:
while evaluating 'hydraJob' at /var/lib/gc-of-borg/nix-test-rs-21/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-21/lib/customisation.nix:157:14, called from /var/lib/gc-of-borg/nix-test-rs-21/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-21/nixos/release.nix:30:28:
while evaluating the attribute 'drvPath' at /var/lib/gc-of-borg/nix-test-rs-21/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-21/lib/customisation.nix:174:13:
while evaluating the attribute 'drvPath' at /var/lib/gc-of-borg/nix-test-rs-21/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-21/lib/customisation.nix:141:13:
while evaluating the attribute 'buildCommand' of the derivation 'vm-test-run-installer-luksroot' at /var/lib/gc-of-borg/nix-test-rs-21/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-21/pkgs/stdenv/generic/make-derivation.nix:179:11:
while evaluating the attribute 'testScript' of the derivation 'nixos-test-driver-installer-luksroot' at /var/lib/gc-of-borg/nix-test-rs-21/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-21/pkgs/stdenv/generic/make-derivation.nix:179:11:
while evaluating 'isFunction' at /var/lib/gc-of-borg/nix-test-rs-21/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-21/lib/trivial.nix:221:16, called from /var/lib/gc-of-borg/nix-test-rs-21/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-21/nixos/lib/testing.nix:104:12:
while evaluating 'testScriptFun' at /var/lib/gc-of-borg/nix-test-rs-21/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-21/nixos/tests/installer.nix:65:19, called from /var/lib/gc-of-borg/nix-test-rs-21/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-21/nixos/tests/installer.nix:264:20:
Non-EFI boot methods are only supported on i686 / x86_64

@Mic92
Copy link
Member

Mic92 commented Aug 23, 2018 •
edited

It seems to want libblkid to detect other files-systems now to avoid overriding them: https://gitlab.com/cryptsetup/cryptsetup/blob/master/docs/v2.0.4-ReleaseNotes#L25

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: tests.installer.luksroot

Partial log (click to expand)

machine: exit status 0
machine: must succeed: nixos-install < /dev/null >&2
machine# > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > building the configuration in /mnt/etc/nixos/configuration.nix...
machine# GC Warning: Bad initial heap size 100000 - ignoring it.
[  909.206901] systemd[1]: Starting Cleanup of Temporary Directories...
machine# [  910.921747] systemd[1]: Started Cleanup of Temporary Directories.
[  982.673683] NOHZ: local_softirq_pending 08
[ 1160.180650] hrtimer: interrupt took 5130261 ns
building of '/nix/store/mpp7p1wf1kcwcw8fc0dapsr0lvz6n4cw-vm-test-run-installer-luksroot.drv' timed out after 1800 seconds
error: build of '/nix/store/mpp7p1wf1kcwcw8fc0dapsr0lvz6n4cw-vm-test-run-installer-luksroot.drv' failed

@vkleen
Copy link
Contributor

vkleen commented Aug 26, 2018

@Mic92 libblkid is provided by libuuid, so it is already included.

@Mic92 Mic92 merged commit bc8ed35 into NixOS:master Aug 27, 2018
@Mic92
Copy link
Member

Mic92 commented Aug 27, 2018

Thanks!

@xeji
Copy link
Contributor

xeji commented Aug 27, 2018

for the record: tests.installer.luksroot passed with this locally

@Mic92
Copy link
Member

Mic92 commented Aug 27, 2018

Yeah, I did the same locally.

@dmmarkov dmmarkov deleted the update-cryptsetup branch August 28, 2018 08:07
@tkerber
Copy link
Member

tkerber commented Aug 29, 2018

This appears to have broken systemd-cryptsetup-generator, which can't find libcryptsetup, probably because ${cryptsetup}/lib/pkgconfig is now missing. Any ideas as to why?

@xeji
Copy link
Contributor

xeji commented Aug 29, 2018 via email

@tkerber
Copy link
Member

tkerber commented Aug 29, 2018

Tried it, same error, and the generated output doesn't contain pkgconfig information either. Unfortunately I don't have the time to look into this properly atm.

@Mic92
Copy link
Member

Mic92 commented Aug 29, 2018 •
edited

@tkerber can you try to replace it by ${cryptsetup.dev}/lib/pkgconfig?

@Mic92 Mic92 mentioned this pull request Aug 29, 2018
Merged
9 tasks
@Mic92
Copy link
Member

Mic92 commented Aug 29, 2018

@tkerber cryptsetup.dev was not included because, cryptsetup was not in buildInputs: #45754

@tkerber
Copy link
Member

tkerber commented Aug 29, 2018

Ah, thanks. I'd tried moving it to buildInputs too, but probably tripped on it using overrideDerivation. Thanks for solving this :)

@oxij
Copy link
Member

oxij commented Sep 6, 2018

This version fails tests. Revert PR: #46151.

(Yet another issue found via doCheckByDefault.)

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

@lukateras lukateras Awaiting requested review from lukateras

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
7 participants
@dmmarkov @Mic92 @GrahamcOfBorg @vkleen @xeji @tkerber @oxij