From 1d2411068a2c3d511b985caf354a5685e4648246 Mon Sep 17 00:00:00 2001 From: Derek Ross Date: Wed, 11 Nov 2026 16:46:40 -0500 Subject: [PATCH] packages.pinned: hold Omarchy at 4.5.0-3, the version the 4.5 series was checked against [omamobile] held omarchy and omarchy-settings at 4.0.6 while the patch series didn't apply to 4.5 (#433, #434). The 4.5 family, the update's stand-ins and the held migrations are in (#661, #662, #665, #482), a rehearsal image updated from 4.0.6 in one and in two steps, and the 7 Pro took the update through its Updates sheet on 2026-11-11: exit 0, 28 patches verified, 98 migrations with 24 held and none failed, phone-smoke passing after the restart. The pin moves rather than goes: a phone takes a newer Omarchy only after the series was checked against it. Phones on 4.0.6 move to 4.5.0-3 at their next omarchy update; legacy-4.0.6/ stays for them until then. Both files were checked against upstream's signatures. Co-Authored-By: Claude Fable 5.2 --- AGENTS.md | 4 ++-- README.md | 2 +- docs/RELEASES.md | 4 ++-- rootfs/packages.pinned | 14 +++++++++----- tools/build-packages | 4 ++-- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index e60b56d4f..92ee29bde 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -217,7 +217,7 @@ Each entry gives the gotcha, then the reason or the fix. Details are in the link - pointer handlers declared directly on a window get no events, so put them on an Item inside it; - Qt 6.12's `QtQuick/Color` shadows Omarchy's `Commons.Color`, so import `qs.Commons as Commons`. - **pacman.conf order on aarch64:** `[omamobile]`, then `[omarchy]`, then Arch Linux ARM's repositories, so our Mesa and Omarchy's builds win. Use `omarchy update`, not `pacman -Syu`: on the phone it hands over to `omamobile-update` (patch 0012), which refuses a wrong order, low battery, another kernel or a bootloader package (`linux-omamobile` passes only when `omamobile-boot-update preflight` does), skips Snapper, the AUR and gum prompts, and holds boot-related migrations ([RELEASES](docs/RELEASES.md) ยง5.4). -- **Omarchy upgrades overwrite our Omarchy patches;** `omamobile-omarchy`'s pacman hook puts them back (all or nothing, from Omarchy's own files). Two families are selected by the installed Omarchy version: today's 4.0.6 phones use `packages/omamobile-omarchy/legacy-4.0.6/`; 4.5 uses `packages/omamobile-omarchy/patches/` (`patches/omarchy` links only to that family). Fixes for today's phones go in `legacy-4.0.6/`, and in `patches/` too when applicable to 4.5. Bump the package version and make the selected family apply with `--fuzz=0` on the Omarchy the phone runs: `packages/omamobile-omarchy/test/all` applies it to the real aarch64 package. A patch Omarchy has absorbed is reported as upstream: drop it. +- **Omarchy upgrades overwrite our Omarchy patches;** `omamobile-omarchy`'s pacman hook puts them back (all or nothing, from Omarchy's own files). Two families are selected by the installed Omarchy version: 4.5, which `[omamobile]` holds phones at since 2026-11-11 (`rootfs/packages.pinned`), uses `packages/omamobile-omarchy/patches/` (`patches/omarchy` links only to that family); a phone still on 4.0.6 uses `packages/omamobile-omarchy/legacy-4.0.6/` until its next `omarchy update`. Fixes go in `patches/`; `legacy-4.0.6/` takes only what a phone needs to get through that update. Bump the package version and make the selected family apply with `--fuzz=0` on the Omarchy the phone runs: `packages/omamobile-omarchy/test/all` applies it to the real aarch64 package. A patch Omarchy has absorbed is reported as upstream: drop it. - **`environment.d` can't unset a variable:** `VAR=` with an empty value is a syntax error, and the generator skips the line silently, so the old value stays. Set an explicit value instead (`omamobile-shell` uses `none`). - **GeoClue answers no client until an authorization agent is registered for the caller's user,** and queues the call with no timeout, so every client just times out. `omamobile-gnss` runs GeoClue's demo agent as a user unit; app allow-list entries skip only the agent's question, not the agent. - **Firewall changes** (ufw is on): arm `systemd-run --on-active=90 /usr/bin/ufw disable` first, then check with a fresh SSH connection (`tools/phone-ssh --fresh`). @@ -233,7 +233,7 @@ Each entry gives the gotcha, then the reason or the fix. Details are in the link | `kernel/configs/omamobile.config` | Config fragment on top of arm64 `defconfig`, commented by plan | | `packages/omamobile-device-cheetah` | Boot-success marker, Wi-Fi and AoC start scripts, udev, modprobe and systemd policy | | `packages/omamobile-shell`, `-sensors`, `-gnss`, `-audio`, `-remote` (opt-in, with `wlrctl`), `-fingerprint`, `-modem` (chroot profile), `libfprint`, `neard`, `mesa`, `hyprland`, `omamobile-keyring` | Userspace packages | -| `packages/omamobile-omarchy/{legacy-4.0.6,patches}/` | Version-selected Omarchy families: current 4.0.6 phone fixes belong in `legacy-4.0.6/`, and also in the 4.5 `patches/` family when applicable; `patches/omarchy/` links only to 4.5 | +| `packages/omamobile-omarchy/{legacy-4.0.6,patches}/` | Version-selected Omarchy families: fixes belong in the 4.5 `patches/` family, which `patches/omarchy/` links to; `legacy-4.0.6/` serves phones that haven't updated to 4.5 yet | | `docs/DEVICES.md` | Supported-devices matrix | | `~/omamobile-kernel/linux`, `wt-*`, `out-*` | The kernel clone, its worktrees and build outputs (outside the repo; `~/android/mainline` on older setups) | | `~/android/reference/` | Stock captures and partition backups: private, never committed | diff --git a/README.md b/README.md index dbf77ca97..eed8beb71 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ The kernel and boot images come from `bin/omamobile kernel`, `modules`, `initram | `tools/build-packages`, `tools/build-rootfs`, `tools/install-phone`, `tools/phone-provision`, `tools/make-bundle` | The installer: aarch64 packages and the root image built on the laptop, the narrow fastboot installer, per-phone provisioning, release bundles (`rootfs/` holds the image's package lists; `tests/` their tests) | | `tools/` | Staged bring-up and capture tools, on-phone probes, firmware extraction from the user's factory image, package and repository helpers | | `packages/` | pacman packages: `omamobile-shell` (the phone profile for Omarchy's shell), `omamobile-apps` (the mobile apps desktop Omarchy lacks: Camera, Maps, NFC), `omacam` (the camera app, built from its own repository), `omamobile-device-cheetah` (Pixel 7 Pro support), `omamobile-device-felix` (Pixel Fold), `omamobile-sensors` (sensors and auto-rotate through the AoC), `omamobile-gnss` (location on demand), `omamobile-mirror` (the phone's screen and input on a computer over USB, VNC), `omamobile-remote` and a click-patched `wlrctl` (use the phone over ssh from a script or an agent; opt-in, [docs/REMOTE-TESTING.md](docs/REMOTE-TESTING.md)), `omamobile-audio` (PipeWire and speaker protection), `omamobile-speaker-tuning` (stock's speaker tuning, off by default), `omamobile-fingerprint` with a patched `libfprint`, `omamobile-modem` (the modem's vendor chroot profile), `omamobile-modem-sit` (the SIT client daemon; talks to the modem, registration untested), `omamobile-mmd` (ModemManager's D-Bus API in front of it, for GNOME Calls, Chatty and NetworkManager), `neard`, `omamobile-keyring` (the `[omamobile]` repository's signing key), patched `mesa` and `hyprland`. `tools/phone-install-package` builds one on the phone and installs it | -| `patches/omarchy/` | Changes to Omarchy for touch devices, to send upstream (`bridge-*` stopgaps are retained only in the legacy 4.0.6 family); a link to the 4.5 family in `packages/omamobile-omarchy/patches/`. The installed Omarchy version selects the family: today's 4.0.6 phones use `legacy-4.0.6/`, so fixes go there and also in `patches/` when applicable to 4.5; the pacman hook re-applies the selected family after upgrades | +| `patches/omarchy/` | Changes to Omarchy for touch devices, to send upstream (`bridge-*` stopgaps are retained only in the legacy 4.0.6 family); a link to the 4.5 family in `packages/omamobile-omarchy/patches/`. The installed Omarchy version selects the family: phones run 4.5 and `patches/`, where fixes go, and one still on 4.0.6 uses `legacy-4.0.6/` until its next update; the pacman hook re-applies the selected family after upgrades | | `bin/lineage-ref` | Builds LineageOS for the phone. Used as a rooted reference Android (M0) and, later, for Waydroid images | | `kernel/configs/` | Our kernel config fragment, merged on top of arm64 `defconfig` | | `device/cheetah/` | Pixel 7 Pro bring-up notes, one plan per subsystem, overlays, the initramfs and the device descriptor (`device.conf`) | diff --git a/docs/RELEASES.md b/docs/RELEASES.md index ca3239b46..873ee859c 100644 --- a/docs/RELEASES.md +++ b/docs/RELEASES.md @@ -206,7 +206,7 @@ The same Alpine-based initramfs, with release differences: `omamobile-omarchy` (in every image built from 2026-10-13 on, and a dependency of `omamobile-shell`, so `omarchy update` brings it to older phones) owns both halves; the details are in the headers of its `bin/omamobile-update` and `bin/omamobile-omarchy-patches`. -**The patches survive upgrades.** Two series families ship in the package, selected by the installed Omarchy version: `packages/omamobile-omarchy/legacy-4.0.6/` for today's 4.0.6 phones, and `packages/omamobile-omarchy/patches/` for 4.5 (`patches/omarchy` links only to the latter). Fixes for today's phones must go in `legacy-4.0.6/`, and also in `patches/` when applicable to 4.5. Its pacman hook (`95-omamobile-omarchy-patches.hook`, PostTransaction on `omarchy`, `omarchy-dev` and itself) re-applies it after every transaction that replaces Omarchy's files, and `rootfs/build-inside` runs the same tool, so image builds and upgrades take one code path. Every run starts from Omarchy's own files (checked against the package's mtree), applies the series in a scratch tree with `--fuzz=0`, verifies it by reversing it back to Omarchy's files, and only then swaps the files in. A patch whose reverse applies is already in Omarchy (a backport that landed): it is skipped and reported, and should be dropped from the series. Any other failure leaves Omarchy's files exactly as shipped, logs to `/var/log/omamobile/omarchy-patches.log` and notifies the user (the lock's PIN pad may be missing until a fixed series ships). A file that matches neither Omarchy's copy nor the last patched one was changed by something else and is never overwritten. +**The patches survive upgrades.** Two series families ship in the package, selected by the installed Omarchy version: `packages/omamobile-omarchy/patches/` for 4.5 (`patches/omarchy` links only to it), and `packages/omamobile-omarchy/legacy-4.0.6/` for a phone still on 4.0.6, until its next update. Fixes go in `patches/`. Its pacman hook (`95-omamobile-omarchy-patches.hook`, PostTransaction on `omarchy`, `omarchy-dev` and itself) re-applies it after every transaction that replaces Omarchy's files, and `rootfs/build-inside` runs the same tool, so image builds and upgrades take one code path. Every run starts from Omarchy's own files (checked against the package's mtree), applies the series in a scratch tree with `--fuzz=0`, verifies it by reversing it back to Omarchy's files, and only then swaps the files in. A patch whose reverse applies is already in Omarchy (a backport that landed): it is skipped and reported, and should be dropped from the series. Any other failure leaves Omarchy's files exactly as shipped, logs to `/var/log/omamobile/omarchy-patches.log` and notifies the user (the lock's PIN pad may be missing until a fixed series ships). A file that matches neither Omarchy's copy nor the last patched one was changed by something else and is never overwritten. **The update takes the phone's path.** Patch 0012 hands `omarchy update` to `omamobile-update`, which runs Omarchy's own `omarchy-update -y` unchanged, with stand-ins first on `PATH` for the steps that don't belong on a phone. Step by step: @@ -234,7 +234,7 @@ The same Alpine-based initramfs, with release differences: **The phone follows Omarchy's stable channel.** Phones installed before 2026-10-20 take `[omarchy]` from edge, which then carried 4.5.0rc1, a release candidate the phone's patches don't apply to. Switch before the next update, because the update would fetch the candidate in the same transaction as the fixed patches: `sudo sed -i 's|pkgs.omarchy.org/edge/|pkgs.omarchy.org/stable/|' /etc/pacman.conf && sudo rm -f /var/lib/pacman/sync/omarchy.db* /tmp/checkup-db-*/sync/omarchy.db*`. Removing edge's cached database matters: it is newer than stable's, so pacman's refresh keeps it and still offers the candidate. `omamobile-omarchy` 0.1.3's `omamobile-update` refuses an edge or rc `[omarchy]` and prints that line. Don't use Omarchy's own `omarchy-channel-set` or `omarchy-refresh-pacman` on the phone: they copy Omarchy's x86 `pacman.conf` and mirrorlist over the phone's (no `[omamobile]`, no Arch Linux ARM) and then upgrade everything. -**`[omamobile]` can hold Omarchy at a version the patches support.** `rootfs/packages.pinned` lists upstream package files by SHA-256 and URL (upstream's first, then our published copy, for when upstream prunes it); `tools/build-packages` adds them to `out/repo` unchanged, signed with the release key, so the daily publish carries them too; it refuses a pin with the name of a package we build, and `tools/release`'s packages stage refuses an index without every pin. `[omamobile]` comes first, so its copy wins over the newer one in `[omarchy]`: `omarchy update` (and `checkupdates`, behind the update toast) offers no newer Omarchy, and images install the pinned one. Since 2026-11-06 it holds `omarchy` and `omarchy-settings` at 4.0.6, while the 4.5 companion changes and update validation remain pending (#433, #434); 4.5's migrations can install packages that replace ours. Once the new series and its companions are accepted, the maintainer moves the pins to the reviewed package versions and phones move on at their next update. A phone that already took the newer Omarchy keeps it: pacman doesn't downgrade on `-Syu`. +**`[omamobile]` can hold Omarchy at a version the patches support.** `rootfs/packages.pinned` lists upstream package files by SHA-256 and URL (upstream's first, then our published copy, for when upstream prunes it); `tools/build-packages` adds them to `out/repo` unchanged, signed with the release key, so the daily publish carries them too; it refuses a pin with the name of a package we build, and `tools/release`'s packages stage refuses an index without every pin. `[omamobile]` comes first, so its copy wins over the newer one in `[omarchy]`: `omarchy update` (and `checkupdates`, behind the update toast) offers no newer Omarchy, and images install the pinned one. From 2026-11-06 it held `omarchy` and `omarchy-settings` at 4.0.6, because the series didn't apply to 4.5 and 4.5's migrations could install packages that replace ours (#433, #434). Since 2026-11-11 it holds them at 4.5.0-3, the version the 4.5 series, the update's stand-ins and the held migrations were checked against (a rehearsal image, then the 7 Pro's own update from 4.0.6); phones on 4.0.6 move to it at their next `omarchy update`. For a later Omarchy the maintainer moves the pins once the series is checked against it. A phone that already took the newer Omarchy keeps it: pacman doesn't downgrade on `-Syu`. **Recovering a phone that took Omarchy 4.0.6 with `omamobile-omarchy` 0.1.0.** Its migration 1791403252 ran: `[omarchy]` sits above `[omamobile]`, Omarchy's Hyprland replaced the phone's, and no phone patch applies (no PIN pad on the lock screen, `omarchy update` no longer handed over). `omamobile-update` then refuses on the repository order, so the fix goes in by hand, over SSH or in a terminal on the phone: diff --git a/rootfs/packages.pinned b/rootfs/packages.pinned index 2a79b8832..b4cb050c0 100644 --- a/rootfs/packages.pinned +++ b/rootfs/packages.pinned @@ -16,12 +16,16 @@ # # [...] -# Omarchy 4.0.6: the Omarchy patch series (packages/omamobile-omarchy/patches) -# doesn't apply to 4.5, and 4.5's migrations install packages that replace -# ours (#433, #434). Unpin when omamobile-omarchy ships a series for 4.5. +# Omarchy 4.5.0-3: the version the 4.5 patch family +# (packages/omamobile-omarchy/patches), the update stand-ins and the held +# migrations were checked against, on a rehearsal image and on the 7 Pro +# (2026-11-11; #433, #434). Held here, not left to [omarchy], so a phone +# takes a newer Omarchy only after the series was checked against it: move +# these lines to that version then. Phones on 4.0.6 move to this one at +# their next `omarchy update`. # omarchy-settings is pinned with it: omarchy depends on exactly its version. -27cd6d88fda0be6c269c14dd65dad6a014384fedc3ea4eb5c742b2b972b10494 https://pkgs.omarchy.org/stable/aarch64/omarchy-4.0.6-1-aarch64.pkg.tar.zst https://pkgs.omamobile.org/stable/aarch64/omarchy-4.0.6-1-aarch64.pkg.tar.zst -f653d97a7832eaa6b71dae1a6ce0480cb2631d6ca9a3350534a579cb08c6b309 https://pkgs.omarchy.org/stable/aarch64/omarchy-settings-4.0.6-1-aarch64.pkg.tar.zst https://pkgs.omamobile.org/stable/aarch64/omarchy-settings-4.0.6-1-aarch64.pkg.tar.zst +d367067c1e35d6e99f7cd921e0a55ec6e46cb0d2bc681b1a4b39254c8c0416e7 https://pkgs.omarchy.org/stable/aarch64/omarchy-4.5.0-3-aarch64.pkg.tar.zst https://pkgs.omamobile.org/stable/aarch64/omarchy-4.5.0-3-aarch64.pkg.tar.zst +2a81decbaeb873a354f2b9728cd0dfc8b633af101eed98e3945e2b6bf55c8c58 https://pkgs.omarchy.org/stable/aarch64/omarchy-settings-4.5.0-3-aarch64.pkg.tar.zst https://pkgs.omamobile.org/stable/aarch64/omarchy-settings-4.5.0-3-aarch64.pkg.tar.zst # aquamarine 0.16.0 (Arch Linux ARM's, signed by its build key 68B3537F...): # [omarchy] comes before Arch Linux ARM's repositories, and Omarchy's stable diff --git a/tools/build-packages b/tools/build-packages index 534d02035..e16e29702 100755 --- a/tools/build-packages +++ b/tools/build-packages @@ -34,8 +34,8 @@ # carries the local key. Never the maintainer's keys/ or # out/repo # -# Upstream packages pinned in rootfs/packages.pinned (Omarchy 4.0.6 while our -# patches don't apply to 4.5) are added by every maintainer's run: fetched +# Upstream packages pinned in rootfs/packages.pinned (the Omarchy version +# our patches were checked against) are added by every maintainer's run: fetched # once, checked against the SHA-256 listed there, and signed with the release # key like our own; out/repo keeps them, and a line removed there takes its # package out at the next run. A --local repository gets them from