Skip to content

linuxManualConfig: add pahole to moduleBuildDependencies#222337

Merged
alyssais merged 1 commit intoNixOS:masterfrom
alyssais:linuxManualConfig-moduleBuildDependencies-pahole
Mar 21, 2023
Merged

linuxManualConfig: add pahole to moduleBuildDependencies#222337
alyssais merged 1 commit intoNixOS:masterfrom
alyssais:linuxManualConfig-moduleBuildDependencies-pahole

Conversation

@alyssais
Copy link
Member

Description of changes

This seems to be needed for out-of-tree module builds since #221707. We do not yet understand why, but this will unblock the channels while we figure it out.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@alyssais alyssais added the 1.severity: channel blocker Blocks a channel label Mar 21, 2023
@alyssais alyssais requested review from K900 and vcunat March 21, 2023 11:22
@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Mar 21, 2023
@alyssais
Copy link
Member Author

@ofborg build linuxPackages.zfs

This seems to be needed for out-of-tree module builds since d57568f.
We do not yet understand why, but this will unblock the channels while
we figure it out.

Fixes: d57568f ("linuxManualConfig: install GDB scripts")
@alyssais alyssais force-pushed the linuxManualConfig-moduleBuildDependencies-pahole branch from f617be9 to 993e831 Compare March 21, 2023 11:32
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Mar 21, 2023
@alyssais
Copy link
Member Author

@ofborg build linuxPackages.zfs

@alyssais alyssais merged commit fedc983 into NixOS:master Mar 21, 2023
@alyssais alyssais deleted the linuxManualConfig-moduleBuildDependencies-pahole branch March 21, 2023 12:40
@alyssais
Copy link
Member Author

Before #221707, out of tree module builds had lines like this:

Skipping BTF generation for /build/source/kernel/linux/ena/ena.ko due to unavailability of vmlinux

And then, after #221707, those lines went away, and they started failing due to not having pahole.

So what happened here is that we had a bug, which was that vmlinux was not available where out-of-tree module builds expected it to be, and when I moved vmlinux so it was in the right place for the GDB scripts, I fixed that bug by accident. That introduced a new bug, which was that out-of-tree modules would try to generate BTF, but fail due to not having pahole. When I added pahole in this PR, that fixed that bug too. So I think everything is good now.

@Ma27
Copy link
Member

Ma27 commented Mar 22, 2023

Just want to state that I'm very grateful for your work on this!

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

Labels

1.severity: channel blocker Blocks a channel 6.topic: kernel The Linux kernel 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants