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

nfs-utils: 2.1.1 -> 2.3.2, integrate libnfsidmap #45748

Merged
merged 3 commits into from
Aug 31, 2018
Merged

nfs-utils: 2.1.1 -> 2.3.2, integrate libnfsidmap #45748

merged 3 commits into from
Aug 31, 2018
+16 −38

Conversation

xeji
Copy link
Contributor

@xeji xeji commented Aug 29, 2018 •
edited
Loading

Motivation for this change

Update, replaces #41285 .

Previously, nfs-utils (2.1.1) and libnfsidmap (0.25) had different versions and different (potentially inconsistent) sources. Switch the source to kernel.org.

Current version nfs-utils 2.3.2 integrates building libnfsidmap from the same source, so there's no need for a separate package. Put libnfsidmap in nfs-utils.lib and remove libnfsidmap as a separate package.

Adapt sssd, the only other package using libnfsidmap.

nfs3 test passes. WIP becuse the NFS4 test still fails with this update (like with the nfs-utils bump in #41285) - still need to investigate that. Update: nfs4 test fixed.

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

cc @abbradar @dtzWill

Sorry, something went wrong.

@xeji xeji added the 2.status: work-in-progress This PR isn't done label Aug 29, 2018
@xeji xeji mentioned this pull request Aug 29, 2018
Closed
@GrahamcOfBorg GrahamcOfBorg added 8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Aug 29, 2018
xeji added 2 commits August 30, 2018 19:55
@xeji
nfs-utils: 2.1.1 -> 2.3.2, integrate libnfsidmap
c62bb34 
- switch source to kernel.org
- libnfsidmap 2.3.2 is built from the nfs-utils source,
  put it in nfs-utils.lib
- split outputs
- adapt sssd, the only other package using libnfsidmap
@xeji
nixos/tests/nfs: fix nfs4 client mount path
e0ca51c 
nfs4 exports from a virtual filesystem root,
so the client mount path differs from nfs3
@xeji xeji mentioned this pull request Aug 30, 2018
Merged
@GrahamcOfBorg GrahamcOfBorg added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Aug 30, 2018
@xeji

This comment has been minimized.

Sign in to view
@GrahamcOfBorg

This comment has been minimized.

Sign in to view
@GrahamcOfBorg

This comment has been minimized.

Sign in to view
@GrahamcOfBorg

This comment has been minimized.

Sign in to view
@xeji
Copy link
Contributor Author

xeji commented Aug 30, 2018

@GrahamcOfBorg build nfs-utils

@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: nfs-utils

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: nfs-utils

Partial log (click to expand)

shrinking /nix/store/jqkqx5bhxmrss709z3qynpm3xyni302s-nfs-utils-2.3.2-lib/lib/libnfsidmap.so.1.0.0
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/jqkqx5bhxmrss709z3qynpm3xyni302s-nfs-utils-2.3.2-lib/lib
patching script interpreter paths in /nix/store/jqkqx5bhxmrss709z3qynpm3xyni302s-nfs-utils-2.3.2-lib
checking for references to /build in /nix/store/jqkqx5bhxmrss709z3qynpm3xyni302s-nfs-utils-2.3.2-lib...
shrinking RPATHs of ELF executables and libraries in /nix/store/kcy8wbnxpj8zhhj4x7480vs6p0nrp1yp-nfs-utils-2.3.2-man
gzipping man pages under /nix/store/kcy8wbnxpj8zhhj4x7480vs6p0nrp1yp-nfs-utils-2.3.2-man/share/man/
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/kcy8wbnxpj8zhhj4x7480vs6p0nrp1yp-nfs-utils-2.3.2-man
checking for references to /build in /nix/store/kcy8wbnxpj8zhhj4x7480vs6p0nrp1yp-nfs-utils-2.3.2-man...

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: nfs-utils

Partial log (click to expand)

strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/3mmplscc52cw242inxsmzl64msk2814s-nfs-utils-2.3.2-lib/lib
patching script interpreter paths in /nix/store/3mmplscc52cw242inxsmzl64msk2814s-nfs-utils-2.3.2-lib
checking for references to /build in /nix/store/3mmplscc52cw242inxsmzl64msk2814s-nfs-utils-2.3.2-lib...
shrinking RPATHs of ELF executables and libraries in /nix/store/q4yg2xc75fgp814c2njw40n0hagj7vzv-nfs-utils-2.3.2-man
gzipping man pages under /nix/store/q4yg2xc75fgp814c2njw40n0hagj7vzv-nfs-utils-2.3.2-man/share/man/
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/q4yg2xc75fgp814c2njw40n0hagj7vzv-nfs-utils-2.3.2-man
checking for references to /build in /nix/store/q4yg2xc75fgp814c2njw40n0hagj7vzv-nfs-utils-2.3.2-man...
/nix/store/q7da3d778prijkns7yzmdrjlf5np8ar6-nfs-utils-2.3.2

@xeji
Copy link
Contributor Author

xeji commented Aug 30, 2018

@GrahamcOfBorg test nfs3
@GrahamcOfBorg test nfs4

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: tests.nfs4

Partial log (click to expand)

Cannot nix-instantiate `tests.nfs4' because:
GC Warning: Failed to expand heap by 10737418240 bytes
Can't start up: not enough memory

@xeji
Copy link
Contributor Author

xeji commented Aug 30, 2018

That ofborg builder has memory issues today 😄 . Anyway, both tests succeed locally.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.nfs3

Partial log (click to expand)

syncing
client2: running command: sync
client2: exit status 0
test script finished in 973.76s
cleaning up
killing server (pid 695)
killing client2 (pid 627)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/fhb2aqpmdsdzv886g1wnnmr08vymyhdv-vm-test-run-nfs

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: tests.nfs3

Partial log (click to expand)

syncing
client2: running command: sync
client2: exit status 0
test script finished in 281.51s
cleaning up
killing server (pid 728)
killing client2 (pid 666)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/wcgdc9hlqyf1arj20aq4sxpnqgavv1m4-vm-test-run-nfs

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: tests.nfs4

Partial log (click to expand)

syncing
client2: running command: sync
client2: exit status 0
test script finished in 359.24s
cleaning up
killing client2 (pid 662)
killing server (pid 747)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/hlkx391808lzijg8rl17ajyzq7xs7c8d-vm-test-run-nfs

@xeji xeji changed the title [WIP]: nfs-utils: 2.1.1 -> 2.3.2, integrate libnfsidmap nfs-utils: 2.1.1 -> 2.3.2, integrate libnfsidmap Aug 30, 2018
@xeji xeji removed the 2.status: work-in-progress This PR isn't done label Aug 30, 2018
@xeji xeji mentioned this pull request Aug 30, 2018
Closed
@xeji xeji merged commit 4db15ba into NixOS:master Aug 31, 2018
@xeji xeji deleted the p/nfs-232 branch September 2, 2018 07:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@xeji @GrahamcOfBorg