Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 enricobuehler
|
ac706ba839 | ||
|
enricobuehler
|
94b5f48d0b | ||
|
enricobuehler
|
139d032e55 |
Generated
+9
-9
@@ -2119,7 +2119,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "latency-probe"
|
||||
version = "0.7.1"
|
||||
version = "0.7.2"
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
@@ -2251,7 +2251,7 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
|
||||
|
||||
[[package]]
|
||||
name = "loss-harness"
|
||||
version = "0.7.1"
|
||||
version = "0.7.2"
|
||||
dependencies = [
|
||||
"punktfunk-core",
|
||||
]
|
||||
@@ -2875,7 +2875,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "punktfunk-client-android"
|
||||
version = "0.7.1"
|
||||
version = "0.7.2"
|
||||
dependencies = [
|
||||
"android_logger",
|
||||
"jni",
|
||||
@@ -2889,7 +2889,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "punktfunk-client-linux"
|
||||
version = "0.7.1"
|
||||
version = "0.7.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-channel",
|
||||
@@ -2911,7 +2911,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "punktfunk-client-windows"
|
||||
version = "0.7.1"
|
||||
version = "0.7.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-channel",
|
||||
@@ -2934,7 +2934,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "punktfunk-core"
|
||||
version = "0.7.1"
|
||||
version = "0.7.2"
|
||||
dependencies = [
|
||||
"aes-gcm",
|
||||
"bytes",
|
||||
@@ -2964,7 +2964,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "punktfunk-host"
|
||||
version = "0.7.1"
|
||||
version = "0.7.2"
|
||||
dependencies = [
|
||||
"aes",
|
||||
"aes-gcm",
|
||||
@@ -3034,7 +3034,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "punktfunk-probe"
|
||||
version = "0.7.1"
|
||||
version = "0.7.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"mdns-sd",
|
||||
@@ -3048,7 +3048,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "punktfunk-tray"
|
||||
version = "0.7.1"
|
||||
version = "0.7.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"ksni",
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ members = [
|
||||
exclude = ["packaging/linux/steam-deck-gadget/usbip-poc"]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.7.1"
|
||||
version = "0.7.2"
|
||||
edition = "2021"
|
||||
rust-version = "1.82"
|
||||
license = "MIT OR Apache-2.0"
|
||||
|
||||
@@ -62,6 +62,38 @@ systemctl reboot
|
||||
> The **reboot is mandatory** — `rpm-ostree install` stages a new deployment that only takes
|
||||
> effect on the next boot. This is normal atomic-distro behavior, not a punktfunk quirk.
|
||||
|
||||
#### Updating a Path-A host — `rpm-ostree upgrade` is NOT enough
|
||||
|
||||
> ⚠️ **`rpm-ostree upgrade` will not update punktfunk on its own.** `upgrade` bumps the **base
|
||||
> image** and only re-resolves *layered* packages **when the base changes**. A Bazzite base can
|
||||
> sit frozen for months (a pinned `:stable` tag, a paused rebase), so `rpm-ostree upgrade` keeps
|
||||
> reporting *"No updates available"* and your layered `punktfunk` stays put even after new RPMs
|
||||
> land in the repo. (Diagnose: `rpm-ostree status` shows the base `Version:` unchanged, while
|
||||
> `dnf -q repoquery --upgrades punktfunk` lists newer builds.)
|
||||
|
||||
To actually pull a newer host on a static base, force rpm-ostree to re-resolve just the punktfunk
|
||||
layer — remove + re-add the same names in one transaction:
|
||||
|
||||
```sh
|
||||
sudo rpm-ostree refresh-md --force
|
||||
sudo rpm-ostree update \
|
||||
--uninstall punktfunk --uninstall punktfunk-web \
|
||||
--install punktfunk --install punktfunk-web
|
||||
systemctl reboot
|
||||
```
|
||||
|
||||
Or just run the helper, which detects what's layered and does the above:
|
||||
|
||||
```sh
|
||||
sudo bash packaging/bazzite/update-punktfunk.sh # stage; reboot when ready
|
||||
sudo bash packaging/bazzite/update-punktfunk.sh --reboot # stage + reboot now
|
||||
```
|
||||
|
||||
> **Channel gotcha:** the re-resolve picks the highest version across **every enabled**
|
||||
> `/etc/yum.repos.d/punktfunk*.repo`. If `punktfunk-canary.repo` is enabled alongside the stable
|
||||
> `punktfunk.repo`, canary's `<next-minor>.0-0.ciN` **outranks** the stable `X.Y.Z-1` and the box
|
||||
> silently tracks canary. Enable exactly one channel — set `enabled=0` in the other repo file.
|
||||
|
||||
### Path B — bootc image (`FROM bazzite-nvidia`)
|
||||
|
||||
The image is built **off-host** (on any machine with `podman`) from
|
||||
|
||||
Executable
+57
@@ -0,0 +1,57 @@
|
||||
#!/usr/bin/env bash
|
||||
# Update the layered punktfunk packages on a Bazzite / Fedora-Atomic host.
|
||||
#
|
||||
# Why this exists: `rpm-ostree upgrade` upgrades the *base image* and only re-resolves
|
||||
# layered packages WHEN THE BASE CHANGES. Bazzite bases can sit frozen for months (a pinned
|
||||
# `:stable` tag, a paused rebase), so `rpm-ostree upgrade` keeps reporting "No updates
|
||||
# available" and your layered punktfunk never moves even though newer RPMs are in the repo.
|
||||
# The fix is to force rpm-ostree to re-resolve just the punktfunk layer against the latest
|
||||
# repo metadata — an `--uninstall … --install …` of the same package names in one
|
||||
# transaction. This script does that for whichever of punktfunk / punktfunk-web are layered.
|
||||
#
|
||||
# Usage: sudo bash update-punktfunk.sh # stage the newest; you reboot when ready
|
||||
# sudo bash update-punktfunk.sh --reboot # stage, then reboot immediately
|
||||
#
|
||||
# Channel note: it re-resolves against every ENABLED punktfunk repo. If both
|
||||
# `punktfunk.repo` (stable) and `punktfunk-canary.repo` are enabled, canary's version sorts
|
||||
# higher and WINS — the box silently tracks canary. Enable exactly the channel you want
|
||||
# (set `enabled=0` in the other `/etc/yum.repos.d/punktfunk*.repo`).
|
||||
set -euo pipefail
|
||||
|
||||
if [[ $EUID -ne 0 ]]; then
|
||||
echo "run as root: sudo bash $0 ${*:-}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Which punktfunk packages are actually layered right now (host, web, or both).
|
||||
mapfile -t layered < <(rpm-ostree status --json 2>/dev/null \
|
||||
| grep -oE '"punktfunk(-web)?"' | tr -d '"' | sort -u)
|
||||
if [[ ${#layered[@]} -eq 0 ]]; then
|
||||
# Fall back to the rpm db if the JSON shape ever changes.
|
||||
mapfile -t layered < <(rpm -qa --qf '%{NAME}\n' 'punktfunk' 'punktfunk-web' 2>/dev/null | sort -u)
|
||||
fi
|
||||
if [[ ${#layered[@]} -eq 0 ]]; then
|
||||
echo "no punktfunk packages are layered — install first (see packaging/bazzite/README.md)" >&2
|
||||
exit 1
|
||||
fi
|
||||
echo "layered punktfunk packages: ${layered[*]}"
|
||||
|
||||
# Fresh repo metadata, else the re-resolve can pick a stale 'newest'.
|
||||
rpm-ostree refresh-md --force >/dev/null
|
||||
|
||||
# Force the re-resolve: remove + re-add the same names in ONE transaction so the box is never
|
||||
# left without the host, and rpm-ostree picks the newest available version.
|
||||
args=()
|
||||
for p in "${layered[@]}"; do args+=(--uninstall "$p"); done
|
||||
for p in "${layered[@]}"; do args+=(--install "$p"); done
|
||||
echo "+ rpm-ostree update ${args[*]}"
|
||||
rpm-ostree update "${args[@]}"
|
||||
|
||||
echo
|
||||
echo "Staged. The new version activates on the next boot."
|
||||
if [[ "${1:-}" == "--reboot" ]]; then
|
||||
echo "rebooting now…"
|
||||
systemctl reboot
|
||||
else
|
||||
echo "Reboot when ready: systemctl reboot"
|
||||
fi
|
||||
@@ -64,10 +64,17 @@ finish-args:
|
||||
# does not apply.
|
||||
- --device=all
|
||||
- --filesystem=/run/udev:ro # SDL/HIDAPI enumerates devices via udev
|
||||
# --- audio: PipeWire via its PulseAudio shim — covers playback AND mic uplink. SteamOS
|
||||
# exposes PipeWire-pulse here; --socket=pulseaudio is the portable arg Moonlight/chiaki
|
||||
# also use on the Deck (a bare --socket=pipewire would also need the camera/portal dance
|
||||
# for capture; the pulse shim gives mic + speaker in one grant). ---
|
||||
# --- audio: the client speaks the NATIVE PipeWire protocol (audio.rs `pw connect`), NOT the
|
||||
# PulseAudio shim — so it needs the real `pipewire-0` socket in the sandbox. With only
|
||||
# --socket=pulseaudio the sandbox has just `pulse/native`, no `pipewire-0`, and playback +
|
||||
# mic both die with "pw connect (is PipeWire running in this session?)" (observed live on the
|
||||
# Deck in Gaming Mode). --socket=pipewire is the canonical grant; --filesystem=xdg-run/
|
||||
# pipewire-0 binds the same socket portably (validated on-Deck: it makes pipewire-0 appear in
|
||||
# the sandbox where --socket=pipewire's CLI validation was flaky). Neither needs the
|
||||
# camera/portal dance (that's only for camera nodes). --socket=pulseaudio stays as a fallback
|
||||
# for any pulse-only path. ---
|
||||
- --socket=pipewire
|
||||
- --filesystem=xdg-run/pipewire-0
|
||||
- --socket=pulseaudio
|
||||
# --- network: QUIC control + UDP data plane + mDNS discovery (_punktfunk._udp) ---
|
||||
- --share=network
|
||||
|
||||
Reference in New Issue
Block a user