diff options
| author |   Ronan Le Martret <ronan.lemartret@iot.bzh> | 2017-02-27 16:52:44 +0100 |
|---|---|---|
| committer | Ronan Le Martret <ronan.lemartret@iot.bzh> | 2019-06-20 11:12:39 +0200 |
| commit | b1818c41b0151d9cf203073a5ef8ef4af311f384 (patch) | |
| tree | 1f2591543820cdab796f53b9c835c0b413997e57 | |
| parent | fe2510aa9492c14efef833f04f8b9033e8c57076 (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>
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 |