diff --git a/packages/omamobile-device-cheetah/README.md b/packages/omamobile-device-cheetah/README.md index ed7c5a811..0321e6d25 100644 --- a/packages/omamobile-device-cheetah/README.md +++ b/packages/omamobile-device-cheetah/README.md @@ -12,7 +12,6 @@ Omarchy Mobile's system support for the Google Pixel 7 Pro (codename cheetah, Te | `bin/omamobile-setup-system` | `/usr/bin` | System setup: UTF-8 locale, timezone, NTP (Omarchy lifecycle `setup-system`) | | `vendor/udev/rules.d/10-omamobile-storage.rules` | `/usr/lib/udev/rules.d` | Continues the initramfs storage guard: Android partitions stay hidden and the whole-disk node unusable | | `vendor/omamobile/modem-sit.conf.d/50-cheetah.conf` | `/usr/lib/omamobile/modem-sit.conf.d` | omamobile-modem-sit's defaults for this phone: call audio through the AoC card in the protection service's earpiece mode (`card = auto`), and the screen state told to the modem (`[control] follow_screen = yes`, MODEM-PLAN M6); a value in `/etc/omamobile/modem-sit.conf` wins | -| `vendor/omamobile-modem/suspend-verified` | `/usr/lib/omamobile-modem` | This phone's declaration that suspend with the modem up is verified (MODEM-PLAN M6, 2026-11-14): `omamobile-modem`'s sleep policy then skips the modem's sleep inhibitor, on a kernel with linux-omarchy-mobile#232's early sleep refusal (kernel-2026.11.15 and later) only. The owner opts out with `sudo touch /etc/omamobile/modem-suspend-disable` (from the next boot); `omamobile-modem-sleep-policy check` (in `/usr/lib/omamobile-vendor/`) says which way this boot went | | `vendor/systemd/network/20-usb-gadget.network` | `/usr/lib/systemd/network` | USB networking to a host (172.16.42.1) | | `bin/omamobile-usb-mac`, `vendor/systemd/system/omamobile-usb-mac.service` | `/usr/bin`, `/usr/lib/systemd/system` | The USB gadget's two MAC addresses, made once from `/dev/urandom` and kept in `/var/lib/omamobile/usb-gadget-mac`, put back on the gadget at every boot (the kernel makes new random ones each time); the host sees one unplug and plug early in the boot, and the first appearance, from the initramfs, still has a random address for a few seconds; a hang marker (`/var/lib/omamobile/usb-mac-cycle-started`) is written before the unbind and removed after the rebind, and a boot that finds it leaves the gadget alone | | `vendor/NetworkManager/conf.d/10-omamobile-usb.conf` | `/usr/lib/NetworkManager/conf.d` | Keeps NetworkManager off the USB link | diff --git a/packages/omamobile-device-cheetah/test/all b/packages/omamobile-device-cheetah/test/all index 06dee8edb..8e1998a94 100755 --- a/packages/omamobile-device-cheetah/test/all +++ b/packages/omamobile-device-cheetah/test/all @@ -212,19 +212,13 @@ pass "sitd waits for the CP; the modem stack is on by default through the target grep -q 'omamobile-sitd-policy' PKGBUILD || fail "the package provides its sitd policy capability" pass "the device sitd policy is staged and provided" -# MODEM-PLAN M6, on by default on this phone: the device's declaration that -# suspend with the modem up is verified, which omamobile-modem's sleep -# policy reads (beside the owner's opt-out and the kernel's early refusal); -# a plain, comment-only data file, never a script. The attended runbook's -# marker from before is no longer shipped: the declaration replaces it. -verified=$tmp/root/usr/lib/omamobile-modem/suspend-verified -[[ -f $verified && ! -x $verified ]] || fail "the suspend-verified declaration is staged as a plain file" -[[ $(grep -cv '^#' "$verified") == 0 ]] || fail "the suspend-verified declaration holds comments only" +# MODEM-PLAN M6 is held back on this phone again (0.1.59): the twenty +# auto-sleep check on kernel-2026.11.15 lost mobile data from the first +# timer wake on (SUSPEND-PLAN, 2026-11-14), so the device no longer +# declares suspend with the modem up verified, and omamobile-modem's +# inhibitor keeps the phone awake while the modem is up. +[[ ! -e $tmp/root/usr/lib/omamobile-modem/suspend-verified ]] || fail "the suspend-verified declaration is not shipped while M6 is held" [[ ! -e $tmp/root/usr/lib/omamobile-modem/suspend-runbook ]] || fail "the old runbook marker is no longer shipped" -if [[ -f ../omamobile-modem/lib/omamobile-modem-sleep-policy ]]; then - grep -q 'VERIFIED=\${OMAMOBILE_MODEM_SUSPEND_VERIFIED:-/usr/lib/omamobile-modem/suspend-verified}' ../omamobile-modem/lib/omamobile-modem-sleep-policy || - fail "the declaration is at the path omamobile-modem's sleep policy reads" -fi # follow_screen = yes is this phone's default (a [control] drop-in that sitd # reads: an /etc value wins). python3 -I -c 'import configparser,sys; p=configparser.ConfigParser(interpolation=None); p.read(sys.argv[1]); sys.exit(not p.getboolean("control","follow_screen"))' "$d" \ diff --git a/packages/omamobile-device-cheetah/vendor/omamobile-modem/suspend-verified b/packages/omamobile-device-cheetah/vendor/omamobile-modem/suspend-verified deleted file mode 100644 index 26ac79e47..000000000 --- a/packages/omamobile-device-cheetah/vendor/omamobile-modem/suspend-verified +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: MIT -# The Pixel 7 Pro's declaration that suspend with the modem up is verified: -# MODEM-PLAN M6 passed on the reference phone on 2026-11-14 (sleeps, sleeps -# refused early with data busy, a text and a call each waking the phone; -# device/cheetah/SUSPEND-PLAN.md). With this file omamobile-modem's sleep -# policy skips the modem's sleep inhibitor at boot, but only on a kernel -# whose modem link refuses a sleep early while the link is up -# (linux-omarchy-mobile#232, kernel-2026.11.15 and later), and not where the -# owner has opted out (/etc/omamobile/modem-suspend-disable). No other -# device package ships it. diff --git a/packages/omamobile-device-cheetah/version b/packages/omamobile-device-cheetah/version index 61671068e..09d8256ac 100644 --- a/packages/omamobile-device-cheetah/version +++ b/packages/omamobile-device-cheetah/version @@ -1 +1 @@ -0.1.58 +0.1.59