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

don't claim gnome-keyring's dbus file; version upower from upstream

Browse source 
Two install blockers found on the phone:
- the package shipped org.freedesktop.secrets.service, which gnome-keyring
  owns. souveraine-secrets holds the bus name at runtime already.
- upower reused souveraine's 0.1.rN version, which sorts below the
  hand-built 1.91.3+sha, so -Syu saw a downgrade and skipped it. Now
  built from upstream version + fork sha (verified vercmp = 1).
This commit is contained in:
Fimeg 2026-07-24 21:56:43 -04:00
commit 62a3f0b0a8
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.gitea/workflows/ci.yml
View file

@ -290,6 +290,14 @@ jobs:
# upower-tree-$ARCH.tar, then folded into the SAME per-arch pacman
# database so the phone installs upower-souveraine from the same
# edge archive it already uses for souveraine.
# Version from UPSTREAM upower + the fork commit, NOT souveraine's
# r-count. The hand-built package on the phone was 1.91.3+<sha>;
# reusing souveraine's 0.1.rN here sorts LOWER, so pacman treats
# the repo copy as a downgrade and -Syu silently skips it.
UPOWER_VER=$(sed -nE "s/^ *version *: *'([^']+)'.*/\1/p" \
"$GITHUB_WORKSPACE/src/upower/meson.build" | head -1)
UPOWER_PKGVER="${UPOWER_VER}+$(git -C "$GITHUB_WORKSPACE/src/upower" rev-parse --short HEAD)"
UPOWER_WORK="$WORK/upower-$ARCH"
mkdir -p "$UPOWER_WORK"
cp "upower-tree-$ARCH.tar" "$UPOWER_WORK/upower-tree.tar"
@ -300,7 +308,7 @@ jobs:
cp packaging/arch/PKGBUILD.upower.prebuilt "$UPOWER_WORK/PKGBUILD"
(
cd "$UPOWER_WORK"
export SOUVERAINE_PKGVER="$PKGVER"
export SOUVERAINE_PKGVER="$UPOWER_PKGVER"
export SOUVERAINE_PKGARCH="$ARCH"
CARCH="$ARCH" makepkg --nodeps --noconfirm --cleanbuild
)

10
packaging/arch/PKGBUILD.prebuilt
View file

@ -14,10 +14,9 @@ depends=('gcc-libs' 'alsa-lib')
options=('!strip')
source=('souveraine-binary' 'souveraine.service'
'souveraine-secrets-binary' 'souveraine-secrets.service'
'org.freedesktop.secrets.service'
'souveraine-machined-binary' 'souveraine-machined.service'
'LICENSE')
sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
sha256sums=('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
@ -47,8 +46,11 @@ package() {
install -Dm755 "$srcdir/souveraine-secrets-binary" "$pkgdir/usr/bin/souveraine-secrets"
install -Dm644 "$srcdir/souveraine-secrets.service" \
"$pkgdir/usr/lib/systemd/user/souveraine-secrets.service"
install -Dm644 "$srcdir/org.freedesktop.secrets.service" \
"$pkgdir/usr/share/dbus-1/services/org.freedesktop.secrets.service"
# NOT shipping /usr/share/dbus-1/services/org.freedesktop.secrets.service:
# gnome-keyring owns that path, and two packages claiming the secrets
# provider is the collision the session-authority doctrine warns about.
# souveraine-secrets.service already owns the bus name at runtime, so the
# rail works without stealing the D-Bus activation file.
install -Dm755 "$srcdir/souveraine-machined-binary" "$pkgdir/usr/bin/souveraine-machined"
install -Dm644 "$srcdir/souveraine-machined.service" \