From 75b842c3341dfd6bb697a6e245ae68ea556888c2 Mon Sep 17 00:00:00 2001 From: Renaud Barrau Date: Tue, 20 May 2025 12:11:36 +0200 Subject: [PATCH 1/2] Revert "psplash: Make psplash wait for the framebuffer to be ready" This reverts commit 98349bb367418866e008ba22ca75f4ab2984561a. Signed-off-by: Renaud Barrau --- recipes-core/psplash/files/framebuf.conf | 4 ---- recipes-core/psplash/psplash_%.bbappend | 10 ---------- 2 files changed, 14 deletions(-) delete mode 100644 recipes-core/psplash/files/framebuf.conf diff --git a/recipes-core/psplash/files/framebuf.conf b/recipes-core/psplash/files/framebuf.conf deleted file mode 100644 index 44e1dedd6..000000000 --- a/recipes-core/psplash/files/framebuf.conf +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Requires=sys-devices-platform-gpu-graphics-fb0.device -After=sys-devices-platform-gpu-graphics-fb0.device - diff --git a/recipes-core/psplash/psplash_%.bbappend b/recipes-core/psplash/psplash_%.bbappend index 57cade8ff..bf99b2bff 100644 --- a/recipes-core/psplash/psplash_%.bbappend +++ b/recipes-core/psplash/psplash_%.bbappend @@ -1,12 +1,2 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SPLASH_IMAGES:rpi = "file://psplash-raspberrypi-img.h;outsuffix=raspberrypi" - -SRC_URI:append:rpi = " file://framebuf.conf" - -do_install:append:rpi() { - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then - install -Dm 0644 ${WORKDIR}/framebuf.conf ${D}${systemd_system_unitdir}/psplash-start.service.d/framebuf.conf - fi -} - -FILES:${PN}:append:rpi = " ${systemd_system_unitdir}/psplash-start.service.d" From 76ed02ef7367f9890463ec22efcfe1ab94e47857 Mon Sep 17 00:00:00 2001 From: Bastian Wanner Date: Fri, 9 Feb 2024 10:40:33 +0100 Subject: [PATCH 2/2] udev-rules-rpi.bb: Fix psplash systemd connection Add udev rule to notify systemd of available framebuffer Using psplash in combination with systemd the splash screen is not shown. The dependency to sys-devices-platform-gpu-graphics-fb0.device will terminate psplash-start.service because systemd is not aware of the existing framebuffer device node. See https://lists.yoctoproject.org/g/yocto/topic/91286438#57156 Signed-off-by: Bastian Wanner udev-rules-rpi: fix transition WORKDIR -> UNPACKDIR This transition is only valid from 'styhead' not from 'scarthgap' see [0] [0] - https://docs.yoctoproject.org/next/migration-guides/migration-5.1.html#migration-notes-for-5-1-styhead --- recipes-core/udev/udev-rules-rpi.bb | 2 ++ recipes-core/udev/udev-rules-rpi/fb.rules | 1 + 2 files changed, 3 insertions(+) create mode 100644 recipes-core/udev/udev-rules-rpi/fb.rules diff --git a/recipes-core/udev/udev-rules-rpi.bb b/recipes-core/udev/udev-rules-rpi.bb index 3ae43856f..67ead13bb 100644 --- a/recipes-core/udev/udev-rules-rpi.bb +++ b/recipes-core/udev/udev-rules-rpi.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = " \ git://github.com/RPi-Distro/raspberrypi-sys-mods;protocol=https;branch=master \ file://can.rules \ + file://fb.rules \ " SRCREV = "5ce3ef2b7f377c23fea440ca9df0e30f3f8447cf" @@ -16,4 +17,5 @@ do_install () { install -d ${D}${sysconfdir}/udev/rules.d install -m 0644 ${S}/etc.armhf/udev/rules.d/99-com.rules ${D}${sysconfdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/can.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/fb.rules ${D}${sysconfdir}/udev/rules.d/ } diff --git a/recipes-core/udev/udev-rules-rpi/fb.rules b/recipes-core/udev/udev-rules-rpi/fb.rules new file mode 100644 index 000000000..dcaa129c9 --- /dev/null +++ b/recipes-core/udev/udev-rules-rpi/fb.rules @@ -0,0 +1 @@ +SUBSYSTEM=="graphics", KERNEL=="fb[0-9]*", TAG+="systemd"