Skip to content

Reapply "systemd: enable debug info"#313897

Merged
flokli merged 1 commit intoNixOS:stagingfrom
alyssais:systemd-debug
May 23, 2024
Merged

Reapply "systemd: enable debug info"#313897
flokli merged 1 commit intoNixOS:stagingfrom
alyssais:systemd-debug

Conversation

@alyssais
Copy link
Member

Description of changes

This reverts commit 22b52d9.

Our bpftools package now contains the fix for 32-bit builds that caused this to be reverted before.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 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.

Add a 👍 reaction to pull requests you find important.

This reverts commit 22b52d9.

Our bpftools package now contains the fix[1] for 32-bit builds that
caused this to be reverted before.

[1]: https://git.kernel.org/linus/812d8bf87678f77055b575d20636fdbbbf15edaf
@alyssais alyssais requested a review from flokli May 23, 2024 07:16
@alyssais alyssais requested a review from a team as a code owner May 23, 2024 07:16
@github-actions github-actions bot added the 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. label May 23, 2024
@alyssais alyssais requested a review from ElvishJerricco May 23, 2024 07:16
@alyssais
Copy link
Member Author

@ofborg build pkgsi686Linux.systemd

@ofborg ofborg bot requested a review from kloenk May 23, 2024 08:11
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels May 23, 2024
@flokli
Copy link
Member

flokli commented May 23, 2024

I initially did a local cherry-pick to master, but bpftools doesn't seem to be fixed there yet:

[466/1864] Generating src/core/bpf/restrict_fs/restrict-fs.bpf.unstripped.o with a custom command
clang: warning: argument unused during compilation: '--gcc-toolchain=/nix/store/mn98jbwm09026dzh8vf8hn7hvm2iiqs4-gcc-13.2.0' [-Wunused-comma
nd-line-argument]
[467/1864] Generating src/core/bpf/restrict_fs/restrict-fs.bpf.o with a custom command
FAILED: src/core/bpf/restrict_fs/restrict-fs.bpf.o 
/nix/store/lvj61gdnla51sr84fjxvf2rnzya2400a-bpftools-6.7/bin/bpftool gen object src/core/bpf/restrict_fs/restrict-fs.bpf.o src/core/bpf/rest
rict_fs/restrict-fs.bpf.unstripped.o
Error: failed to link 'src/core/bpf/restrict_fs/restrict-fs.bpf.unstripped.o': Invalid argument (22)

A quick search on what to cherry-pick on the staging branch didn't find anything obvious (like a bpftools bump). Is there a commit you can point me at that I can cherry-pick to test this without rebuilding the world?

@alyssais
Copy link
Member Author

It was #311995, but that's a world rebuild if you just cherry-pick it.

inherit (linuxHeaders) version src;

@flokli
Copy link
Member

flokli commented May 23, 2024

Okay, the rebuild (on staging) is done here. Merging, thanks!

@flokli flokli merged commit 74a8103 into NixOS:staging May 23, 2024
@alyssais alyssais deleted the systemd-debug branch May 23, 2024 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants