main/postmarketos-bootsplash: fix pwr button toggle and dev. scale

Apparently plymouth's config parser can't handle in-line comments. This
also fixes an issue I just noticed where the scale wasn't being parsed
correctly either because 1.0 is not a uint.

../src/libply/ply-key-file.c:427:ply_key_file_get_ulong       : group 'Daemon' key 'DeviceScale' val '1.0' is not a valid unsigned number
../src/libply/ply-key-file.c:427:ply_key_file_get_ulong       : group 'Daemon' key 'XkbExtraEscButton' val '0x1008ff2a  # Power button (XKB_KEY_XF86PowerOff)' is not a valid unsigned number

The additional xkb config is necessary for plymouth to detect the pwr
key press, or else it isn't initialized.

Fixes #4548

Signed-off-by: Clayton Craft <craftyguy@postmarketos.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8561>
This commit is contained in:
Clayton Craft 2026-05-25 17:13:57 -07:00 committed by The Friendly Meow (merge) Bot
parent 4257f74e62
commit 77c05f0443
No known key found for this signature in database
3 changed files with 18 additions and 5 deletions

View file

@ -1,7 +1,7 @@
# Co-Maintainer: Ferass El Hafidi <funderscore@postmarketos.org>
maintainer="Clayton Craft <clayton@craftyguy.net>"
pkgname=postmarketos-bootsplash
pkgver=0.5.1
pkgver=1
pkgrel=0
pkgdesc="pmOS integration components for boot/shutdown splash screen"
url="https://postmarketos.org"
@ -13,6 +13,7 @@ depends="
plymouth
plymouth-drm
postmarketos-plymouth-themes
xkeyboard-config
"
options="!check" # no testsuite
subpackages="$pkgname-openrc"
@ -57,6 +58,6 @@ sha512sums="
dc6d38d3048ee3be47871cb9f4909cc7572f57be792c1cf39688abfd9659e5149699308ead35fe7fd37b87fbac5668cbf03d3b6acd74ec05c8c4b39735e9e8df 20-plymouth.conf
94a75f556c048296ee80fe61f7f9a68e408102eab00d12916cdc2f9ad860e2d449e0d86ef014caea43361621ed2cbb9d61cb21a8f573b4e93fc9f6052459e4c6 60-seat-id-path.rules
5d11ab555600606f5f27146aa982075d622068bb82b34144459c174da9e22c19b3adcd076d780885cd97313f1e3aee87052769e32d8b1332e4516abd0c9dda0d kill-plymouth
d4cab2578116afa4ca33ca94671191d44e71d4c46cfb11248c42f6bd1e49714eae56339330f483b247a3da0865892a100dc6f33e378a9cbfaea2f56e9616fcd8 plymouthd.conf
c2bad06ed32f9a84dc111e32dcb938fa6309617a33431102de898b8e2d4088d6af82718b3fca91b1271f9d14f2af7ec9ed1de0a17ce8870baa2b80276269e440 postmarketos-bootsplash.files
50a94758b46c9a2ef05845779237ef47db106741b5a31c9a6db2cc36ed9a8afd7e736d2628f050a15724b8ebaaef8e8d57145ad02c247ecee83191ee14a107ae plymouthd.conf
7333c5f5d77a573bd9c8014f4509d9aae544a467b5bd462ac449f25a8b465a4425149e1f977d81ba3603805c4eeac07c5947da3258a4537f421fd64a959f50b0 postmarketos-bootsplash.files
"

View file

@ -1,5 +1,6 @@
[Daemon]
Theme=pmos-spin
DeviceScale=1.0
DeviceScale=1
DeviceTimeout=5.0
XkbExtraEscButton=0x1008ff2a # Power button (XKB_KEY_XF86PowerOff)
# Power button (XKB_KEY_XF86PowerOff)
XkbExtraEscButton=0x1008ff2a

View file

@ -16,3 +16,14 @@
/usr/sbin/plymouthd
/usr/share/fonts/droid/DroidSans.ttf
/usr/share/plymouth
# required xkb config for plymouth keys
/usr/share/X11/xkb/compat/
/usr/share/X11/xkb/keycodes/
/usr/share/X11/xkb/types/
/usr/share/X11/xkb/rules/evdev
/usr/share/X11/xkb/symbols/inet
/usr/share/X11/xkb/symbols/keypad
/usr/share/X11/xkb/symbols/pc
/usr/share/X11/xkb/symbols/srvr_ctrl
/usr/share/X11/xkb/symbols/us