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-generator: add postFixup #38961

Merged
merged 1 commit into from May 5, 2018
Merged

cryptsetup-generator: add postFixup #38961

merged 1 commit into from May 5, 2018

Conversation

bachp
Copy link
Member

@bachp bachp commented Apr 15, 2018

This makes cryptsetup-generator link correctly
to the shared systemd library.

Motivation for this change

#35513 removed the fixup from systemd but the cryptsetup-generator still needs it in order to correctly link to the shared library. So add the fixupt there until a better solution is found.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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.

jtojnar
jtojnar requested changes Apr 15, 2018
View reviewed changes
pkgs/os-specific/linux/systemd/cryptsetup-generator.nix Outdated
@@ -13,6 +13,18 @@ stdenv.lib.overrideDerivation systemd (p: {
ninja systemd-cryptsetup systemd-cryptsetup-generator
'';

# The rpath to the shared systemd library is not added by meson. The
Copy link
Contributor

@jtojnar jtojnar Apr 15, 2018 •
edited

Choose a reason for hiding this comment

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

This comment needs to be updated. Meson sets the rpath now, but it is not done in this derivation because ninja install target (which would take care of that) is not used.

Copy link
Member Author

@bachp bachp Apr 29, 2018 •
edited

Choose a reason for hiding this comment

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

@jtojnar Comment updated

@bachp
cryptsetup-generator: add postFixup
caed187 
This makes cryptsetup-generator link correctly
to the shared systemd library.
@bachp
Copy link
Member Author

bachp commented May 2, 2018

@jtojnar Comment has been updated

@xeji
Copy link
Contributor

xeji commented May 4, 2018

@GrahamcOfBorg build systemd-cryptsetup-generator

@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: systemd-cryptsetup-generator

Partial log (click to expand)

Cannot nix-instantiate `systemd-cryptsetup-generator' because:
error: while evaluating the attribute 'buildInputs' of the derivation 'systemd-cryptsetup-generator' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix:5:3:
while evaluating 'getOutput' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/attrsets.nix:450:23, called from undefined position:
while evaluating anonymous function at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/stdenv/generic/make-derivation.nix:97:17, called from undefined position:
while evaluating 'callPackagesWith' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:123:36, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/top-level/all-packages.nix:13357:12:
while evaluating 'mapAttrs' at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/attrsets.nix:198:17, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:130:8:
while evaluating anonymous function at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/kernel-headers/default.nix:1:1, called from /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/lib/customisation.nix:128:14:
assertion failed at /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/os-specific/linux/kernel-headers/default.nix:6:1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: systemd-cryptsetup-generator

Partial log (click to expand)

shrinking /nix/store/x3y6pm0zh7s2vgdy2jhym87dam9s0zd7-systemd-cryptsetup-generator/lib/systemd/systemd-cryptsetup
shrinking /nix/store/x3y6pm0zh7s2vgdy2jhym87dam9s0zd7-systemd-cryptsetup-generator/lib/systemd/libsystemd-shared-238.so
shrinking /nix/store/x3y6pm0zh7s2vgdy2jhym87dam9s0zd7-systemd-cryptsetup-generator/lib/systemd/system-generators/systemd-cryptsetup-generator
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/x3y6pm0zh7s2vgdy2jhym87dam9s0zd7-systemd-cryptsetup-generator/lib
patching script interpreter paths in /nix/store/x3y6pm0zh7s2vgdy2jhym87dam9s0zd7-systemd-cryptsetup-generator
checking for references to /build in /nix/store/x3y6pm0zh7s2vgdy2jhym87dam9s0zd7-systemd-cryptsetup-generator...
warning: working around a Linux kernel bug by creating a hole of 2093056 bytes in ‘/nix/store/x3y6pm0zh7s2vgdy2jhym87dam9s0zd7-systemd-cryptsetup-generator/lib/systemd/system-generators/systemd-cryptsetup-generator’
warning: working around a Linux kernel bug by creating a hole of 2088960 bytes in ‘/nix/store/x3y6pm0zh7s2vgdy2jhym87dam9s0zd7-systemd-cryptsetup-generator/lib/systemd/systemd-cryptsetup’
/nix/store/x3y6pm0zh7s2vgdy2jhym87dam9s0zd7-systemd-cryptsetup-generator

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: systemd-cryptsetup-generator

Partial log (click to expand)

shrinking /nix/store/vdjbjgjcirlxgnj8sihrr7472nwawyvj-systemd-cryptsetup-generator/lib/systemd/system-generators/systemd-cryptsetup-generator
shrinking /nix/store/vdjbjgjcirlxgnj8sihrr7472nwawyvj-systemd-cryptsetup-generator/lib/systemd/libsystemd-shared-238.so
shrinking /nix/store/vdjbjgjcirlxgnj8sihrr7472nwawyvj-systemd-cryptsetup-generator/lib/systemd/systemd-cryptsetup
strip is /nix/store/gp7fylxwn18b7pl2c18ks89hsiaxyfvf-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/vdjbjgjcirlxgnj8sihrr7472nwawyvj-systemd-cryptsetup-generator/lib
patching script interpreter paths in /nix/store/vdjbjgjcirlxgnj8sihrr7472nwawyvj-systemd-cryptsetup-generator
checking for references to /build in /nix/store/vdjbjgjcirlxgnj8sihrr7472nwawyvj-systemd-cryptsetup-generator...
warning: working around a Linux kernel bug by creating a hole of 57344 bytes in ‘/nix/store/vdjbjgjcirlxgnj8sihrr7472nwawyvj-systemd-cryptsetup-generator/lib/systemd/systemd-cryptsetup’
warning: working around a Linux kernel bug by creating a hole of 57344 bytes in ‘/nix/store/vdjbjgjcirlxgnj8sihrr7472nwawyvj-systemd-cryptsetup-generator/lib/systemd/system-generators/systemd-cryptsetup-generator’
/nix/store/vdjbjgjcirlxgnj8sihrr7472nwawyvj-systemd-cryptsetup-generator

@xeji xeji merged commit e450d9f into NixOS:master May 5, 2018
@bachp bachp deleted the cryptsetup-generator branch May 5, 2018 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar requested changes

@xeji xeji xeji approved these changes

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@bachp @xeji @GrahamcOfBorg @jtojnar