Skip to content

[Backport staging-24.05] systemd: re-enable bpf-framework#328905

Merged
nikstur merged 1 commit intostaging-24.05from
backport-328648-to-staging-24.05
Jul 24, 2024
Merged

[Backport staging-24.05] systemd: re-enable bpf-framework#328905
nikstur merged 1 commit intostaging-24.05from
backport-328648-to-staging-24.05

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

Bot-based backport to staging-24.05, triggered by a label in #328648.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

systemd meson.build apparently didn't check properly that the option was
enabled in all code paths, so it was possible to build systemd such as
--version would have -BPF_FRAMEWORK (properly disabled in config.h) with
-Dbpf-framework=enabled.

Fix the failing check, which was `clang -target bpf` breaking with
zerocallusedregs hardening -- this is apparently a known problem as it's
disabled in quite a few other packages that mention bpf in comment above
the exception...

Link: systemd/systemd#33793
(cherry picked from commit ef593db)
@github-actions github-actions bot requested a review from a team as a code owner July 21, 2024 13:07
@github-actions github-actions bot mentioned this pull request Jul 21, 2024
13 tasks
@ofborg ofborg bot requested review from flokli and kloenk July 21, 2024 14:25
@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 Jul 21, 2024
@flokli flokli requested a review from nikstur July 23, 2024 12:56
@nikstur nikstur requested a review from Mic92 July 23, 2024 13:57
@nikstur nikstur merged commit f997721 into staging-24.05 Jul 24, 2024
@pbsds pbsds deleted the backport-328648-to-staging-24.05 branch July 25, 2024 01:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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