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

ceph: Fix build with glibc 2.32 #101551

Merged
merged 1 commit into from Nov 3, 2020
Merged

ceph: Fix build with glibc 2.32 #101551

merged 1 commit into from Nov 3, 2020

Conversation

moben
Copy link
Contributor

@moben moben commented Oct 24, 2020

Motivation for this change

This adds a patch from upstream ceph to avoid using the deprecated
sys_siglist if sigdescr_np is available. This fixes the build with glibc 2.32

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notes

This is my first PR to nixpkgs, so please point out if I missed anything above. This does fix ceph builds and thus nixos-rebuild on my machine.

@moben
ceph: Fix build with glibc 2.32
26b7e79 
This adds a patch from upstream ceph to avoid using the deprecated
sys_siglist if sigdescr_np is available.
@ofborg ofborg bot requested review from adevress, krav and johanot October 24, 2020 13:46
@srhb
Copy link
Contributor

srhb commented Nov 3, 2020

@moben Hi! Welcome! And thank you for your contribution!

Your commit looks good to me, though I will just mention in passing that you could have used fetchpatch too, like:

  patches = [
      [...]
      (fetchpatch {
        url = "https://github.com/NixOS/nixpkgs/pull/101551.patch";
        sha256 = "0bnapsbzkxv28w9gbiyz06na34456sffrvar4xfch9giz38pcx3f";
      })
  ]

Sometimes this can make the provenance and reasoning of a patch more visible.
In lieu of that, or even in addition: It's often helpful to attach a comment near the patch with a very short description of why it's there.

This is fine though, and I'll just run through the tests before merging. Thanks again!

@srhb srhb self-assigned this Nov 3, 2020
@srhb
Copy link
Contributor

srhb commented Nov 3, 2020

On a merge-with-master:

❯ nix-build nixos/release.nix -A tests.ceph-multi-node -A tests.ceph-single-node --arg supportedSystems '["x86_64-linux"]'
/nix/store/d3s1ljq8v9ljf17pv0xbl1ka3kkaja57-vm-test-run-basic-single-node-ceph-cluster
/nix/store/pfq35r5axw07br6q5la737bd5608syis-vm-test-run-basic-multi-node-ceph-cluste

Thank you 😄

@srhb srhb merged commit 9d9235e into NixOS:master Nov 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adevress adevress Awaiting requested review from adevress

@krav krav Awaiting requested review from krav

@johanot johanot Awaiting requested review from johanot

Assignees

@srhb srhb

Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@moben @srhb @Janik-Haag