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

33
packaging/arch/PKGBUILD.prebuilt
View file

@ -1,4 +1,4 @@
# CI package recipe for a prebuilt Souveraine aarch64 binary.
# CI package recipe for prebuilt Souveraine binaries.
#
# The runner cross-compiles first, then makepkg assembles this package. This
# deliberately avoids compiling on the phone and keeps its agent data outside
@ -15,18 +15,17 @@ options=('!strip')
source=('souveraine-binary' 'souveraine.service'
'souveraine-secrets-binary' 'souveraine-secrets.service'
'souveraine-machined-binary' 'souveraine-machined.service'
'souveraine-sessiond-binary' 'souveraine-sessiond.service'
'souveraine-verify-trail' 'souveraine-button'
'LICENSE')
sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
# sessiond ships on aarch64 only (the phone is its target; the laptop hit
# lock-screen errors with it). CI drops the two files into the build dir for
# that arch and omits them otherwise, so package() picks them up conditionally
# rather than declaring them as sources for every arch.
sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
'SKIP' 'SKIP' 'SKIP')
# sessiond is built and packaged for both supported architectures. Installing
# its user unit does not enable or start it; activation remains target-owned.
if [ "$CARCH" = aarch64 ]; then
source+=('souveraine-sessiond-binary' 'souveraine-sessiond.service'
'souveraine-sensord-binary' 'souveraine-sensord.service'
source+=('souveraine-sensord-binary' 'souveraine-sensord.service'
'souveraine-usb-kvm-binary')
sha256sums+=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
sha256sums+=('SKIP' 'SKIP' 'SKIP')
depends+=('wayland' 'libx11' 'libxcursor' 'libxi' 'libxkbcommon' 'libxrandr')
# The wry host links the system webview, so it only cross-builds once
# webkit2gtk is in the aarch64 sysroot. Declared only when CI actually
@ -43,16 +42,12 @@ package() {
install -Dm755 "$srcdir/souveraine-binary" "$pkgdir/usr/bin/souveraine"
sed 's|%h/.local/bin/souveraine|/usr/bin/souveraine|' "$srcdir/souveraine.service" \
| install -Dm644 /dev/stdin "$pkgdir/usr/lib/systemd/user/souveraine.service"
# Session authority daemon, aarch64 only. Was hand-copied to
# /usr/local/bin and owned by no package, so it never received updates.
# The unit points at /usr/bin: the stale /usr/local/bin copy must be
# removed after installing or the old binary keeps running.
if [ -f "$srcdir/souveraine-sessiond-binary" ]; then
install -Dm755 "$srcdir/souveraine-sessiond-binary" \
"$pkgdir/usr/bin/souveraine-sessiond"
install -Dm644 "$srcdir/souveraine-sessiond.service" \
"$pkgdir/usr/lib/systemd/user/souveraine-sessiond.service"
fi
# Session authority daemon, package-owned on both architectures. The unit
# points at /usr/bin and package installation does not enable or start it.
install -Dm755 "$srcdir/souveraine-sessiond-binary" \
"$pkgdir/usr/bin/souveraine-sessiond"
install -Dm644 "$srcdir/souveraine-sessiond.service" \
"$pkgdir/usr/lib/systemd/user/souveraine-sessiond.service"
# Sensor reporter, aarch64 only — the laptop has no iio-sensor-proxy
# sources worth reporting and no device state machine listening.
if [ -f "$srcdir/souveraine-web-binary" ]; then