From 3850e79c641a8f942400a566c36f716fc7a542a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20=C5=81obacz?= <p.lobacz@welotec.com>
Date: Fri, 24 Jan 2025 11:54:22 +0100
Subject: [meta-oe][scarthgap][PATCH 2/2] plymouth: remove extra kernel
parameter
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.
---
...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 7ba1034e93..0000000000
--- 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 <mingli.yu@windriver.com>
-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 <mingli.yu@windriver.com>
----
- 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 c161c20ee9..05fe5c51e7 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 \
--
2.48.1