[COMMUNITY] Fix rc.pvr systemd service

 * If rc.pvr is install into /etc/init.d,
   it will be remove by "rm_systemd_unitdir".

 * If you have systemd in your DISTRO_FEATURES and no sysvinit in DISTRO_FEATURES
   /etc/init.d is remove (by fct "rm_systemd_unitdir").

Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>

3 files changed, 9 insertions, 3 deletions

diff --git a/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb b/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb
index 939c61b..7f262e6 100644
--- a/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb
+++ b/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bb
@@ -74,6 +74,9 @@ do_install() {
 
     # Install systemd service
     if [ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} ]; then
+        # if we do not move rc.pvr, it will be remove by "rm_systemd_unitdir"
+        install -d ${D}${localedir}/bin/
+        mv ${D}/etc/init.d/rc.pvr ${D}${localedir}/bin/
         install -d ${D}/${systemd_system_unitdir}/
         install -m 644 ${WORKDIR}/rc.pvr.service ${D}/${systemd_system_unitdir}/
     fi
@@ -89,6 +92,7 @@ FILES_${PN} = " \
     ${libdir}/* \
     /lib/firmware/rgx.fw \
     /usr/local/bin/* \
+    ${localedir}/bin/* \
 "
 
 FILES_${PN}-dev = " \
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 fa7ad7b..ac4a0ec 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,11 +1,13 @@
 [Unit]
 Description=PowerVR consumer services
+Before=weston.service
 
 [Service]
-ExecStart=/etc/init.d/rc.pvr start
-ExecStop=/etc/init.d/rc.pvr stop
+ExecStart=/usr/lib/locale/bin/rc.pvr start
+ExecStop=/usr/lib/locale/bin/rc.pvr stop
 Type=oneshot
 RemainAfterExit=yes
 
 [Install]
 WantedBy=multi-user.target
+RequiredBy=weston.service
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 295ffd7..37b1816 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
+After=dbus.service
 
 [Service]
 ExecStart=/usr/bin/weston-launch -u root -- $OPTARGS