mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 06:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

psplash: start via udev if framebuffer device detected

Browse Source 
psplash-start.service expected to find /dev/fb0 and failed
if device was not found. This failure breaks systemd
oeqa runtime test with "runqemu nographic". Starting
psplash based on detected framebuffer device fixes systemd
boot status and systemd oeqa runtime tests for qemu
boots with and without graphics support.

Note that psplash-systemd.service still depends on /dev/fb0
so startup with multiple framebuffer devices may not work
correctly. I don't have devices with multiple framebuffer
devices to test with.

On qemu machine with graphics, psplash displays yocto
logo correctly and boot progress bar as well. Once boot completes
to systemd "running" state, the logo is replaced by login prompt.
On qemu machine without graphics, boot completes without psplash
or failures and login over serial console works normally.
Tested with genericarm64 machine poky-altcfg distro and core-image-base
image on qemu. AMD kv260 tested as well but graphics stack is not yet
working there so boot is similar to qemu without graphics.

(From OE-Core rev: 3820f6f342c2309ba7d51d3c08b3a951c2c17781)

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mikko Rapeli
2025-02-06 16:44:06 +02:00
committed by Richard Purdie
parent 6dd4120d62
commit af38235305
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-core/psplash/files/fb.rules Normal file
View File

@@ -0,0 +1 @@
SUBSYSTEM=="graphics", KERNEL=="fb[0-9]*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="psplash-start@%k.service psplash-systemd.service"

5
meta/recipes-core/psplash/files/psplash-start.service → meta/recipes-core/psplash/files/psplash-start@.service
View File

@@ -3,11 +3,10 @@ Description=Start psplash boot splash screen
DefaultDependencies=no
RequiresMountsFor=/run
ConditionFileIsExecutable=/usr/bin/psplash
After=dev-%i.device
Wants=dev-%i.device
[Service]
Type=notify
ExecStart=/usr/bin/psplash
RemainAfterExit=yes
[Install]
WantedBy=sysinit.target

8
meta/recipes-core/psplash/files/psplash-systemd.service
View File

@@ -1,14 +1,12 @@
[Unit]
Description=Start psplash-systemd progress communication helper
DefaultDependencies=no
After=psplash-start.service
Requires=psplash-start.service
After=psplash-start@fb0.service
Requires=psplash-start@fb0.service
RequiresMountsFor=/run
ConditionFileIsExecutable=/usr/bin/psplash
ConditionFileExists=/run/psplash_fifo
[Service]
ExecStart=/usr/bin/psplash-systemd
RemainAfterExit=yes
[Install]
WantedBy=sysinit.target

9
meta/recipes-core/psplash/psplash_git.bb
View File

@@ -11,8 +11,9 @@ PV = "0.1+git"
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https \
file://psplash-init \
file://psplash-start.service \
file://psplash-start@.service \
file://psplash-systemd.service \
file://fb.rules \
${SPLASH_IMAGES}"
UPSTREAM_CHECK_COMMITS = "1"
@@ -112,8 +113,10 @@ do_install:append() {
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
install -d ${D}${systemd_system_unitdir}
install -m 644 ${UNPACKDIR}/psplash-start.service ${D}/${systemd_system_unitdir}
install -m 644 ${UNPACKDIR}/psplash-start@.service ${D}/${systemd_system_unitdir}
install -m 644 ${UNPACKDIR}/psplash-systemd.service ${D}/${systemd_system_unitdir}
install -d ${D}${sysconfdir}/udev/rules.d
install -m 0644 ${UNPACKDIR}/fb.rules ${D}${sysconfdir}/udev/rules.d/
fi
install -d ${D}${bindir}
@@ -124,7 +127,7 @@ do_install:append() {
}
SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"
SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'psplash-start.service psplash-systemd.service', '', d)}"
SYSTEMD_SERVICE:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'psplash-start@.service psplash-systemd.service', '', d)}"
INITSCRIPT_NAME = "psplash.sh"
INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ."