Skip to content

fix(cli): swap libdbus-backed keyring for pure-Rust zbus #3326

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

Merged
hubcio merged 2 commits into from
May 28, 2026
Merged

fix(cli): swap libdbus-backed keyring for pure-Rust zbus #3326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9ce11a
fix(cli): swap libdbus-backed keyring for pure-Rust zbus (#1710)
hubcio May 27, 2026
73eb973
Merge branch 'master' into drop-libdbus-sys
hubcio May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/actions/rust/pre-merge/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,9 +342,6 @@ runs:
--exclude bench-dashboard-frontend
shell: bash
env:
# Disable GCC outline atomics to avoid undefined __aarch64_ldadd4_sync
# references when linking dbus-sys (required by keyring crate)
CFLAGS: "-mno-outline-atomics"
PKG_CONFIG_ALLOW_CROSS: "1"
PKG_CONFIG_ALL_STATIC: "1"

Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/_build_rust_artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,6 @@ jobs:
export PKG_CONFIG_ALL_STATIC=1
fi

# aarch64 musl: disable GCC outline atomics to avoid undefined __aarch64_ldadd4_sync
# references when linking dbus-sys (required by keyring crate)
if [[ "${{ matrix.target }}" == "aarch64-unknown-linux-musl" ]]; then
export CFLAGS="-mno-outline-atomics"
fi

# musl builds: use musl-gcc as linker to ensure proper linking against musl libc
if [[ "${{ matrix.libc }}" == "musl" ]]; then
export CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc
Expand Down
Loading
Loading