summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonan Le Martret <ronan.lemartret@iot.bzh>2017-02-27 16:52:44 +0100
committerRonan Le Martret <ronan.lemartret@iot.bzh>2018-08-30 08:35:56 +0000
commit2281ecfcc65a69c3e1a24fd88230b9ec78865270 (patch)
treeaef1dea6860efe02051bc425eef563e71a9d2bbf
parent929b9ef35d6149d411a660ca754f07df0a9a3859 (diff)
[COMMUNITY] Fix rc.pvr systemd service
* rc.pvr.service should depend on weston.service not the opposite Change-Id: Ib0516772da08a77504ae4fe98ea3c27aa9b6048a Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
-rw-r--r--meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module/rc.pvr.service2
-rw-r--r--meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend4
-rw-r--r--meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module/rc.pvr.service b/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module/rc.pvr.service
index f940776..da7fc30 100644
--- a/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module/rc.pvr.service
+++ b/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module/rc.pvr.service
@@ -1,5 +1,6 @@
[Unit]
Description=PowerVR consumer services
+Before=weston.service
[Service]
ExecStart=/usr/bin/pvrinit start
@@ -9,3 +10,4 @@ RemainAfterExit=yes
[Install]
WantedBy=multi-user.target
+RequiredBy=weston.service
diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend b/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend
index 07dab05..ea35d02 100644
--- a/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend
@@ -15,9 +15,7 @@ do_install_append() {
sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start
if [ "X${USE_GLES}" = "X1" ]; then
- sed -e "/RequiresMountsFor=\/run/a Wants=rc.pvr.service" \
- -e "/RequiresMountsFor=\/run/a After=rc.pvr.service" \
- -e "s/\$OPTARGS/--idle-time=0 \$OPTARGS/" \
+ sed -e "s/\$OPTARGS/--idle-time=0 \$OPTARGS/" \
-i ${D}/${systemd_system_unitdir}/weston.service
fi
diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service b/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service
index cc47419..3d9edd5 100644
--- a/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service
+++ b/meta-rcar-gen3/recipes-graphics/wayland/weston-init/weston.service
@@ -1,6 +1,6 @@
[Unit]
Description=Weston Wayland compositor
-After=dbus.service rc.pvr.service multi-user.target
+After=dbus.service multi-user.target
[Service]
ExecStart=/usr/bin/weston-launch -u root -- $OPTARGS