Fimeg/souveraine
Watch
1
0
Fork
You've already forked souveraine
 0
Code Releases Activity

packaging: sessiond ships on both arches, enabled on neither

Browse source 
CI already built the x86_64 daemon and then threw it away — the binary and
its user unit were copied into the package only under aarch64, so the
laptop could never receive the thing every lock, blank and button report
assumes is running.

Both now ship, and the package still neither enables nor starts the unit.
Phone-only reporters and surfaces stay aarch64.
This commit is contained in:
Fimeg 2026-08-09 19:31:33 -04:00
commit c802f7db48
3 changed files with 25 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.gitea/workflows/ci.yml
View file

@ -217,10 +217,9 @@ jobs:
# button reporting all assume the daemon is there — so no session
# authority on x86 means no viewtop on the laptop.
#
# Building is not enabling. The binary ships; the user unit is
# aarch64-only in PKGBUILD.prebuilt and stays that way until the
# laptop path is actually tested, so this cannot wedge a laptop by
# arriving on it.
# Building and packaging are not enabling. The package-owned user
# unit ships on both architectures, but package installation neither
# enables nor starts it; target activation remains separately tested.
cargo build --release --features sessiond --bin souveraine-sessiond
B="$CARGO_TARGET_DIR/release/souveraine-sessiond"
file "$B" | grep -q 'x86-64' || { echo "sessiond is not x86_64" >&2; exit 1; }
@ -377,13 +376,13 @@ jobs:
cp "souveraine-$ARCH" "$PKG_WORK/souveraine-binary"
cp "souveraine-secrets-$ARCH" "$PKG_WORK/souveraine-secrets-binary"
cp "souveraine-machined-$ARCH" "$PKG_WORK/souveraine-machined-binary"
cp "souveraine-sessiond-$ARCH" "$PKG_WORK/souveraine-sessiond-binary"
cp packaging/souveraine.service packaging/souveraine-secrets.service \
packaging/org.freedesktop.secrets.service \
packaging/souveraine-machined.service LICENSE "$PKG_WORK/"
# aarch64 only — see the sessiond note in the build step.
packaging/souveraine-machined.service \
packaging/souveraine-sessiond.service LICENSE "$PKG_WORK/"
# Phone-only reporters and surfaces remain aarch64-only.
if [ "$ARCH" = aarch64 ]; then
cp "souveraine-sessiond-$ARCH" "$PKG_WORK/souveraine-sessiond-binary"
cp packaging/souveraine-sessiond.service "$PKG_WORK/"
cp "souveraine-sensord-$ARCH" "$PKG_WORK/souveraine-sensord-binary"
cp packaging/souveraine-sensord.service "$PKG_WORK/"
cp "souveraine-usb-kvm-$ARCH" "$PKG_WORK/souveraine-usb-kvm-binary"
@ -408,8 +407,9 @@ jobs:
PKG=$(find "$PKG_WORK" -maxdepth 1 -name 'souveraine-*.pkg.tar.zst' -print -quit)
test -n "$PKG"
bsdtar -tf "$PKG" | grep -qx 'usr/bin/souveraine'
bsdtar -tf "$PKG" | grep -qx 'usr/bin/souveraine-sessiond'
bsdtar -tf "$PKG" | grep -qx 'usr/lib/systemd/user/souveraine-sessiond.service'
if [ "$ARCH" = aarch64 ]; then
bsdtar -tf "$PKG" | grep -qx 'usr/bin/souveraine-sessiond'
bsdtar -tf "$PKG" | grep -qx 'usr/bin/souveraine-usb-kvm'
fi
cp "$PKG" "$ARCH_REPO/"