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.

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

systemd: fix RuntimeError issue when building for armv7l and riscv64 #258373

Merged
merged 1 commit into from
Oct 4, 2023

Conversation

misuzu
Copy link
Contributor

@misuzu misuzu commented Oct 1, 2023

Description of changes

Fix for systemd/systemd#29381

Things done

  • Built on platform(s)
    • armv7l-linux (cross, native)
    • riscv64-linux (cross)
    • 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.11 Release Notes (or backporting 23.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.

@misuzu misuzu requested a review from a team as a code owner October 1, 2023 11:12
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 1, 2023
@tpwrules
Copy link
Contributor

tpwrules commented Oct 1, 2023

Works for me cross-building a system from x86_64-linux to armv7l-linux. Thank you.

@flokli
Copy link
Contributor

flokli commented Oct 4, 2023

Generally we apply patches unconditionally, to ensure they still apply (and keep applying).

Can you draft, retarget staging, and unconditionally apply there?

@misuzu misuzu marked this pull request as draft October 4, 2023 08:39
@misuzu misuzu changed the base branch from master to staging October 4, 2023 08:40
@misuzu misuzu marked this pull request as ready for review October 4, 2023 08:41
@misuzu
Copy link
Contributor Author

misuzu commented Oct 4, 2023

Generally we apply patches unconditionally, to ensure they still apply (and keep applying).

Can you draft, retarget staging, and unconditionally apply there?

Done

Copy link
Contributor

@flokli flokli left a comment

Choose a reason for hiding this comment

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

LGTM! I kicked off some more builds.

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 4, 2023
@ofborg ofborg bot requested review from flokli, kloenk and Mic92 October 4, 2023 10:02
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 4, 2023
@flokli
Copy link
Contributor

flokli commented Oct 4, 2023

With this PR, systemd still builds on x86_64-linux native, and I can confirm aarch64-linux (cross, via x86_64-linux) also works.

I currently see a regression in staging for aarch64-linux native in gnutls, but this is unrelated to this PR:


FAIL: test-fcntl
================

test-fcntl.c:269: assertion 'fcntl (fd, F_DUPFD_CLOEXEC, -1) == -1' failed
FAIL test-fcntl (exit status: 134)

@flokli flokli merged commit 1550a58 into NixOS:staging Oct 4, 2023
26 checks passed
@misuzu misuzu deleted the systemd-fix branch October 4, 2023 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants