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

lockdep: 4.1.2 -> 5.0.21, fix build, enable tests #98184

Merged
merged 1 commit into from Sep 23, 2020
Merged

lockdep: 4.1.2 -> 5.0.21, fix build, enable tests #98184

merged 1 commit into from Sep 23, 2020

Conversation

risicle
Copy link
Contributor

@risicle risicle commented Sep 17, 2020

Motivation for this change

ZHF: #97479

This required a bit of an overhaul to ensure we're compiling against this kernel's headers, not those in glibc which are presumably from some other random kernel version. I looked at using the makeKernelHeaders function used to build linuxHeaders, but it's really designed to work with just our current main kernel version. So I just provided flex and bison and let make headers_install do its thing.

While it would be nice to use a kernel version we already ship elsewhere or update to a more recent kernel version, the userspace lockdep tool is apparently not very heavily maintained and the build of this tool reportedly got broken soon after the release chosen here.

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.

@risicle
lockdep: 4.1.2 -> 5.0.21, fix build, enable tests
759e5e5 
required a bit of an overhaul to ensure we're compiling against *this*
kernel's headers, not those in glibc which are presumably from some other
random kernel version.

would be nice to update to a more recent version, the build of this tool
reportedly got broken soon after this release.
@ofborg ofborg bot requested a review from thoughtpolice September 17, 2020 23:14
@risicle
Copy link
Contributor Author

risicle commented Sep 17, 2020

@ofborg build lockdep

@jorsn jorsn mentioned this pull request Sep 18, 2020
Merged
10 tasks
@wkral
Copy link
Contributor

wkral commented Sep 18, 2020

Result of nixpkgs-review pr 98184 1

1 package built:
  • lockdep

jonringer
jonringer approved these changes Sep 23, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 98184 1

1 package built:
  • lockdep

@jonringer jonringer merged commit b3951d1 into NixOS:master Sep 23, 2020
@risicle risicle mentioned this pull request Sep 23, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@risicle @wkral @jonringer