summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2022-11-30 21:00:50 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-12-05 22:28:13 +0000
commit1ba76de20bca63cec4ccaf04766dfd994a728c75 (patch)
tree529ccf7356e79b14ee9cfe489e9e15d342a1cfb5 /meta
parentf735cd76e050740d64a0cbd2cf3fa8f67cec892e (diff)
downloadpoky-1ba76de20bca63cec4ccaf04766dfd994a728c75.tar.gz
psplash: consider the situation of psplash not exist for systemd
In current psplash framework, the psplash might not exist at all. For example, in case DSITRO is set to nodistro, the psplash does not exist. In our psplash recipe, we have: SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default" This variable is parsed to if psplash-poky-img.h exists, a package named psplash-default is created and is added to RDEPENDS:${PN}. We can see that the psplash-poky-img.h resides in meta-poky, and in psplash_git.bbappend file in meta-poky, we have: FILESEXTRAPATHS:prepend:poky := "${THISDIR}/files:" So this file is only available in case poky distro is used. To fix this issue, add condition check in the corresponding systemd services. (From OE-Core rev: 7a62ff9ed39c179d2b9b0c40f4f8423ced413063) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/psplash/files/psplash-start.service1
-rw-r--r--meta/recipes-core/psplash/files/psplash-systemd.service1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service
index 36c2bb38e0..bec9368427 100644
--- a/meta/recipes-core/psplash/files/psplash-start.service
+++ b/meta/recipes-core/psplash/files/psplash-start.service
@@ -2,6 +2,7 @@
2Description=Start psplash boot splash screen 2Description=Start psplash boot splash screen
3DefaultDependencies=no 3DefaultDependencies=no
4RequiresMountsFor=/run 4RequiresMountsFor=/run
5ConditionFileIsExecutable=/usr/bin/psplash
5 6
6[Service] 7[Service]
7Type=notify 8Type=notify
diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service
index 082207f232..e93e3deb35 100644
--- a/meta/recipes-core/psplash/files/psplash-systemd.service
+++ b/meta/recipes-core/psplash/files/psplash-systemd.service
@@ -4,6 +4,7 @@ DefaultDependencies=no
4After=psplash-start.service 4After=psplash-start.service
5Requires=psplash-start.service 5Requires=psplash-start.service
6RequiresMountsFor=/run 6RequiresMountsFor=/run
7ConditionFileIsExecutable=/usr/bin/psplash
7 8
8[Service] 9[Service]
9ExecStart=/usr/bin/psplash-systemd 10ExecStart=/usr/bin/psplash-systemd