From d554de8dbbbcc173ef96ab08f0813a8f96f86a73 Mon Sep 17 00:00:00 2001 From: Lef Date: Mon, 2 Nov 2026 00:52:44 +0200 Subject: [PATCH] omamobile-device-husky 0.1.5: quit Plymouth with --retain-splash Ship the plymouth-quit drop-in that cheetah and raven already have, so Plymouth leaves its last frame on screen until Hyprland draws instead of a black screen. gs-decon has no fbdev console to hand back, and on raven a plain "plymouth quit" hung for 27 s and held the session back (2026-10-17). The drop-in only does anything with "splash" on the kernel command line, which husky's descriptor gets from #278; this package leaves device.conf alone. Also wrap omamobile-usb-rescue's header comment at 80 columns, as asked in #250. No behaviour change. test/all passes (the installed drop-in matches raven's, comments aside). Booted from the package on a Pixel 8 Pro (2026-11-02): Plymouth started at 3.30 s and its quit, with --retain-splash, finished at 4.94 s, no hang. --- packages/omamobile-device-husky/README.md | 1 + .../bin/omamobile-usb-rescue | 18 +++++++++--------- packages/omamobile-device-husky/install | 2 ++ packages/omamobile-device-husky/test/all | 11 +++++++++++ .../10-omamobile-retain-splash.conf | 9 +++++++++ packages/omamobile-device-husky/version | 2 +- 6 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 packages/omamobile-device-husky/vendor/systemd/system/plymouth-quit.service.d/10-omamobile-retain-splash.conf diff --git a/packages/omamobile-device-husky/README.md b/packages/omamobile-device-husky/README.md index 813fe3277..40c7ed219 100644 --- a/packages/omamobile-device-husky/README.md +++ b/packages/omamobile-device-husky/README.md @@ -13,6 +13,7 @@ Omarchy Mobile's first userspace package for the Google Pixel 8 Pro (codename hu | `vendor/modprobe.d/omamobile-husky-clk-acpm.conf` | `/usr/lib/modprobe.d` | Lets the GPU's ACPM clock move up to 890 MHz, stock's top (`zuma_gpu_max_khz`, kernel #157). The GPU thermal zone throttles it from 85 C. Without it the GPU stays at the bootloader's 150 MHz | | `bin/omamobile-usb-rescue` + `vendor/systemd/system/omamobile-usb-rescue.service` | `/usr/bin`, `/usr/lib/systemd/system` (enabled by a vendor wants link) | Keeps the USB link across an unplug. The MAX77759's Type-C side opens its USB2 data switch (TCPC 0x25, register 0x93) on unplug and, with no Type-C driver, nothing closes it again until the bootloader runs: the phone stays off the bus after a replug. While VBUS is valid the script writes 0x09 back (the only register it writes) and logs every change of the switch, VBUS and the UDC state to the journal. It stands aside once a Type-C driver owns 0x25. It needs the hsi2c_11 bus (kernel #163, enabled by a bring-up overlay): without it the script says so and exits. Tested on a Pixel 8 Pro: unplug, replug, the link was back in two seconds with no reboot. Same logic as the Pixel 7 Pro's, on husky's bus | | `vendor/modprobe.d/omamobile-max77759.conf` | `/usr/lib/modprobe.d` | Keeps max77759_charger, gpio_max77759, nvmem_max77759 and tcpci_maxim from autoloading: binding the PMIC creates the charger cell, which programs charge limits from the battery node. Blacklist only, so a runbook can still load them by hand. The fuel gauge and the MFD core are not blacklisted | +| `vendor/systemd/system/plymouth-quit.service.d/10-omamobile-retain-splash.conf` | `/usr/lib/systemd/system/plymouth-quit.service.d` | Makes `plymouth quit` keep its last frame on screen (`--retain-splash`) until Hyprland draws, instead of a black screen. The same three unit lines as cheetah and raven (the comments differ): gs-decon has no fbdev console to hand back, and on raven a plain quit hung for 27 s and held the session back. It only does anything with `splash` on the kernel command line, which husky's descriptor gets from #278; without it Plymouth never runs and the drop-in is inert. Booted from the package on a Pixel 8 Pro (2026-11-02, kernel 7.3.0-rc6-omamobile-push1-g5899fec2bd28): Plymouth started at 3.30 s and its quit, with --retain-splash, finished at 4.94 s without a hang | | `etc/omamobile-mirrorlist` | `/etc/pacman.d/omamobile-mirrorlist` | Where pacman finds the `[omamobile]` repository. Same file as the Pixel 7 Pro package | | `omamobile-device-husky.install` | pacman hook | Adds `[omamobile]` to `pacman.conf` before `[omarchy]`, once. Same script as the Pixel 7 Pro package | | `src/reboot-to.c` | `/usr/bin/reboot-to` | Reboot with a reason the bootloader understands. Same bytes as the Pixel 7 Pro package; the test checks | diff --git a/packages/omamobile-device-husky/bin/omamobile-usb-rescue b/packages/omamobile-device-husky/bin/omamobile-usb-rescue index c1706ffe9..0be80ae5a 100755 --- a/packages/omamobile-device-husky/bin/omamobile-usb-rescue +++ b/packages/omamobile-device-husky/bin/omamobile-usb-rescue @@ -1,15 +1,15 @@ #!/bin/bash # SPDX-License-Identifier: MIT # Keep the USB link working across unplugs on the Pixel 8 Pro. Ported from the -# Pixel 7 Pro's omamobile-usb-rescue; the bus here is 10cb0000.i2c (hsi2c_11). The MAX77759's Type-C side opens -# its USB2 data switch (TCPC vendor register USBSW_CTRL, 0x93) on unplug, and -# with no Type-C driver yet nothing closes it again, so the phone stays off -# the bus after a replug until the bootloader runs at the next boot. While -# VBUS is valid, put the switch back to 0x09 (D+/D- connected), as the -# bootloader leaves it. Stands aside once a Type-C driver owns the chip. -# Only reads 0x25:0x93 and 0x69:0xb5 and writes 0x25:0x93. It also logs every -# change of the switch, VBUS and the UDC state to the journal (to explain the -# next loss). +# Pixel 7 Pro's omamobile-usb-rescue; the bus here is 10cb0000.i2c (hsi2c_11). +# The MAX77759's Type-C side opens its USB2 data switch (TCPC vendor register +# USBSW_CTRL, 0x93) on unplug, and with no Type-C driver yet nothing closes it +# again, so the phone stays off the bus after a replug until the bootloader +# runs at the next boot. While VBUS is valid, put the switch back to 0x09 +# (D+/D- connected), as the bootloader leaves it. Stands aside once a Type-C +# driver owns the chip. Only reads 0x25:0x93 and 0x69:0xb5 and writes +# 0x25:0x93. It also logs every change of the switch, VBUS and the UDC state +# to the journal (to explain the next loss). set -uo pipefail chg=0x69 tcpc=0x25 diff --git a/packages/omamobile-device-husky/install b/packages/omamobile-device-husky/install index d67fc2c96..a7d75504d 100755 --- a/packages/omamobile-device-husky/install +++ b/packages/omamobile-device-husky/install @@ -37,6 +37,8 @@ install -Dm644 vendor/systemd/system/omamobile-usb-rescue.service \ "$destination/usr/lib/systemd/system/omamobile-usb-rescue.service" ln -sfn ../omamobile-usb-rescue.service \ "$destination/usr/lib/systemd/system/multi-user.target.wants/omamobile-usb-rescue.service" +install -Dm644 vendor/systemd/system/plymouth-quit.service.d/10-omamobile-retain-splash.conf \ + "$destination/usr/lib/systemd/system/plymouth-quit.service.d/10-omamobile-retain-splash.conf" install -Dm644 device.conf \ "$destination/usr/share/omamobile/device.conf" install -Dm644 etc/omamobile-mirrorlist \ diff --git a/packages/omamobile-device-husky/test/all b/packages/omamobile-device-husky/test/all index efb4bf73e..7af7ab80c 100755 --- a/packages/omamobile-device-husky/test/all +++ b/packages/omamobile-device-husky/test/all @@ -66,6 +66,7 @@ for f in usr/bin/reboot-to \ usr/lib/modprobe.d/omamobile-max77759.conf \ usr/bin/omamobile-usb-rescue \ usr/lib/systemd/system/omamobile-usb-rescue.service \ + usr/lib/systemd/system/plymouth-quit.service.d/10-omamobile-retain-splash.conf \ usr/share/omamobile/device.conf \ usr/share/omamobile/device-husky/version \ usr/share/licenses/omamobile-device-husky/LICENSE \ @@ -126,6 +127,16 @@ grep -q '^ExecStart=/usr/bin/omamobile-usb-rescue$' vendor/systemd/system/omamob || fail "the USB rescue is enabled by a vendor wants link" grep -q 'i2c-tools' PKGBUILD || fail "the USB rescue needs i2cget and i2cset" pass "the USB replug rescue is installed, enabled by a wants link, and writes one register" +splash=vendor/systemd/system/plymouth-quit.service.d/10-omamobile-retain-splash.conf +if [[ -f ../omamobile-device-raven/$splash ]]; then + [[ $(grep -v '^#' "$splash") == "$(grep -v '^#' "../omamobile-device-raven/$splash")" ]] \ + || fail "the retain-splash drop-in drifted from the raven package" +fi +grep -qx 'ExecStart=' "$tmp/root/usr/lib/${splash#vendor/}" \ + || fail "the drop-in must reset ExecStart= first, or the plain plymouth quit runs too" +grep -qx 'ExecStart=-/usr/bin/plymouth quit --retain-splash' "$tmp/root/usr/lib/${splash#vendor/}" \ + || fail "plymouth quit without --retain-splash hangs on gs-decon" +pass "Plymouth quits with --retain-splash, as on raven" grep -q '^PACKAGE=omamobile-device-husky$' "$tmp/root/usr/share/omamobile/device.conf" \ || fail "the installed descriptor is husky" for absent in usr/bin/omamobile-boot-success usr/bin/omamobile-bootctl \ diff --git a/packages/omamobile-device-husky/vendor/systemd/system/plymouth-quit.service.d/10-omamobile-retain-splash.conf b/packages/omamobile-device-husky/vendor/systemd/system/plymouth-quit.service.d/10-omamobile-retain-splash.conf new file mode 100644 index 000000000..353bae5b8 --- /dev/null +++ b/packages/omamobile-device-husky/vendor/systemd/system/plymouth-quit.service.d/10-omamobile-retain-splash.conf @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: MIT +# Leave Plymouth's last frame on screen until Hyprland draws its first one, +# as on cheetah and raven. gs-decon has no fbdev console to hand the screen +# back to, and on raven a plain "plymouth quit" hung until systemd killed it +# at 27 s, holding graphical.target (and so the session) back until 97 s +# (2026-10-17). Only matters once "splash" is on husky's command line. +[Service] +ExecStart= +ExecStart=-/usr/bin/plymouth quit --retain-splash diff --git a/packages/omamobile-device-husky/version b/packages/omamobile-device-husky/version index 845639eef..9faa1b7a7 100644 --- a/packages/omamobile-device-husky/version +++ b/packages/omamobile-device-husky/version @@ -1 +1 @@ -0.1.4 +0.1.5