summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Łobacz <p.lobacz@welotec.com>2025-01-24 11:54:22 +0100
committerKhem Raj <raj.khem@gmail.com>2025-01-30 12:30:08 -0800
commiteca7d51ec492e908e2b57eb3581f6334c42734de (patch)
tree08879a4a07c09d7ccc5622f49f2d05cc9cb8209e
parent89526d5d4cf9d9ebac0deed5ed62a1db48857ceb (diff)
downloadmeta-openembedded-eca7d51ec492e908e2b57eb3581f6334c42734de.tar.gz
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. 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-start-service-in-add-related-kernel-paramet.patch31
-rw-r--r--meta-oe/recipes-core/plymouth/plymouth_24.004.60.bb1
2 files changed, 0 insertions, 32 deletions
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 @@
1From 658eac007d14d836cb002a5675487bac63d50324 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Mon, 7 Feb 2022 03:22:12 +0000
4Subject: [PATCH] plymouth-start.service.in: add related kernel parameter
5
6Add extra kernel parameter to make the plymouth splash screen
7display during boot.
8
9Upstream-Status: Submitted [https://gitlab.freedesktop.org/plymouth/plymouth/-/merge_requests/156]
10
11Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
12---
13 systemd-units/plymouth-start.service.in | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/systemd-units/plymouth-start.service.in b/systemd-units/plymouth-start.service.in
17index 830a62d..c20aabe 100644
18--- a/systemd-units/plymouth-start.service.in
19+++ b/systemd-units/plymouth-start.service.in
20@@ -9,7 +9,7 @@ ConditionVirtualization=!container
21 IgnoreOnIsolate=true
22
23 [Service]
24-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session
25+ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --kernel-command-line="splash plymouth.ignore-serial-consoles" --pid-file=@plymouthruntimedir@/pid --attach-to-session
26 ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash
27 Type=forking
28 RemainAfterExit=yes
29--
302.31.1
31
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"
11SRC_URI = " \ 11SRC_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 \
15 file://0001-Drop-libdl-references.patch \ 14 file://0001-Drop-libdl-references.patch \
16 file://0001-Avoid-linking-to-plymouth_logo_file.patch \ 15 file://0001-Avoid-linking-to-plymouth_logo_file.patch \
17 file://0001-Make-themes-build-optional.patch \ 16 file://0001-Make-themes-build-optional.patch \