summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Łobacz <p.lobacz@welotec.com>2025-01-24 11:49:40 +0100
committerKhem Raj <raj.khem@gmail.com>2025-01-30 12:30:08 -0800
commit89526d5d4cf9d9ebac0deed5ed62a1db48857ceb (patch)
tree6a8a153ab421e77de1287f317ee002c44d4b3431
parent6e352f7ab7b0b8ce74b1fdf45c1da37d7bdd85db (diff)
downloadmeta-openembedded-89526d5d4cf9d9ebac0deed5ed62a1db48857ceb.tar.gz
plymouth: remove patch causing issue with no login prompt
Setting `--retain-splash` isn't right, plymouth-quit gets used for instance when switching to a getty or something that isn't graphical [1]. [1] https://gitlab.freedesktop.org/plymouth/plymouth/-/merge_requests/157 Signed-off-by: Piotr Łobacz <p.lobacz@welotec.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch35
-rw-r--r--meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb1
2 files changed, 0 insertions, 36 deletions
diff --git a/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch b/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch
deleted file mode 100644
index 58838500bf..0000000000
--- a/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From f270f80d4c36a22a0f7b8de8fb6b1abef6f7b183 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Tue, 15 Feb 2022 16:23:10 +0800
4Subject: [PATCH] plymouth : Add the retain-splash option
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Adding the "retain-splash” option to tell plymouth to keep the boot
10splash’s contents on screen even after plymouth exits to make the
11splash screen show more friendly on the system which boots so fast.
12
13Upstream-Status: Inappropriate [embedded specific]
14
15Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
16---
17 systemd-units/plymouth-quit.service.in | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/systemd-units/plymouth-quit.service.in b/systemd-units/plymouth-quit.service.in
21index ed9f9b9..147e9ee 100644
22--- a/systemd-units/plymouth-quit.service.in
23+++ b/systemd-units/plymouth-quit.service.in
24@@ -3,7 +3,7 @@ Description=Terminate Plymouth Boot Screen
25 After=rc-local.service plymouth-start.service systemd-user-sessions.service
26
27 [Service]
28-ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit
29+ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit --retain-splash
30 Type=oneshot
31 RemainAfterExit=yes
32 TimeoutSec=20
33--
342.17.1
35
diff --git a/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb b/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb
index cdf24477a7..c161c20ee9 100644
--- a/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb
+++ b/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb
@@ -12,7 +12,6 @@ SRC_URI = " \
12 http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \ 12 http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \
13 file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ 13 file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \
14 file://0001-plymouth-start-service-in-add-related-kernel-paramet.patch \ 14 file://0001-plymouth-start-service-in-add-related-kernel-paramet.patch \
15 file://0001-plymouth-Add-the-retain-splash-option.patch \
16 file://0001-Drop-libdl-references.patch \ 15 file://0001-Drop-libdl-references.patch \
17 file://0001-Avoid-linking-to-plymouth_logo_file.patch \ 16 file://0001-Avoid-linking-to-plymouth_logo_file.patch \
18 file://0001-Make-themes-build-optional.patch \ 17 file://0001-Make-themes-build-optional.patch \