From 785389c78eb0975a11ad02abd032889e22300703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=81obacz?= Date: Fri, 24 Jan 2025 11:49:40 +0100 Subject: [PATCH 1/2] plymouth: remove patch causing issue with no login prompt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- ...lymouth-Add-the-retain-splash-option.patch | 35 ------------------- .../plymouth/plymouth_24.004.60.bb | 1 - 2 files changed, 36 deletions(-) delete mode 100644 meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch 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 58838500bfa..00000000000 --- a/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-Add-the-retain-splash-option.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f270f80d4c36a22a0f7b8de8fb6b1abef6f7b183 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Tue, 15 Feb 2022 16:23:10 +0800 -Subject: [PATCH] plymouth : Add the retain-splash option -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Adding the "retain-splash” option to tell plymouth to keep the boot -splash’s contents on screen even after plymouth exits to make the -splash screen show more friendly on the system which boots so fast. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Mingli Yu ---- - systemd-units/plymouth-quit.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/systemd-units/plymouth-quit.service.in b/systemd-units/plymouth-quit.service.in -index ed9f9b9..147e9ee 100644 ---- a/systemd-units/plymouth-quit.service.in -+++ b/systemd-units/plymouth-quit.service.in -@@ -3,7 +3,7 @@ Description=Terminate Plymouth Boot Screen - After=rc-local.service plymouth-start.service systemd-user-sessions.service - - [Service] --ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit -+ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit --retain-splash - Type=oneshot - RemainAfterExit=yes - TimeoutSec=20 --- -2.17.1 - 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 cdf24477a75..c161c20ee97 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 = " \ http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \ file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ file://0001-plymouth-start-service-in-add-related-kernel-paramet.patch \ - file://0001-plymouth-Add-the-retain-splash-option.patch \ file://0001-Drop-libdl-references.patch \ file://0001-Avoid-linking-to-plymouth_logo_file.patch \ file://0001-Make-themes-build-optional.patch \ From 96f1dea28098b5ec3c9e90ec0477f8522fe41255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=81obacz?= Date: Fri, 24 Jan 2025 11:54:22 +0100 Subject: [PATCH 2/2] plymouth: remove extra kernel parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Setting `--kernel-command-line` in systemd service is unmodifiable from the bootloader kernel parameters. `splash` together with `plymouth.ignore-serial-consoles` should be added by the user to e.g. bootloader configuration file instead. Signed-off-by: Piotr Łobacz --- ...ervice-in-add-related-kernel-paramet.patch | 31 ------------------- .../plymouth/plymouth_24.004.60.bb | 1 - 2 files changed, 32 deletions(-) delete mode 100644 meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch diff --git a/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch b/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch deleted file mode 100644 index 7ba1034e932..00000000000 --- a/meta-oe/recipes-core/plymouth/plymouth/0001-plymouth-start-service-in-add-related-kernel-paramet.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 658eac007d14d836cb002a5675487bac63d50324 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Mon, 7 Feb 2022 03:22:12 +0000 -Subject: [PATCH] plymouth-start.service.in: add related kernel parameter - -Add extra kernel parameter to make the plymouth splash screen -display during boot. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/plymouth/plymouth/-/merge_requests/156] - -Signed-off-by: Mingli Yu ---- - systemd-units/plymouth-start.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in -index 830a62d..c20aabe 100644 ---- a/systemd-units/plymouth-start.service.in -+++ b/systemd-units/plymouth-start.service.in -@@ -9,7 +9,7 @@ ConditionVirtualization=!container - IgnoreOnIsolate=true - - [Service] --ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session -+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --kernel-command-line="splash plymouth.ignore-serial-consoles" --pid-file=@plymouthruntimedir@/pid --attach-to-session - ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash - Type=forking - RemainAfterExit=yes --- -2.31.1 - 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 c161c20ee97..05fe5c51e7c 100644 --- a/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb +++ b/meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb @@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = " \ http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.tar.xz \ file://0001-Make-full-path-to-systemd-tty-ask-password-agent-con.patch \ - file://0001-plymouth-start-service-in-add-related-kernel-paramet.patch \ file://0001-Drop-libdl-references.patch \ file://0001-Avoid-linking-to-plymouth_logo_file.patch \ file://0001-Make-themes-build-optional.patch \