rvi: change install path from /opt to /usr/share

We updated the branch we fetch from "develop" to "install_to_usr"
because there where a lot of hardcoded paths pointing to /opt.

Once this is merged upstream we drop the SRC_URI change.

Also adjust install paths (/etc/opt/rvi -> /etc/rvi), which was
changed on "install_to_usr" branch

[GDP-611] Prepare system for libostree

Signed-off-by: Mirza Krak <mirza.krak@endian.se>

(amended) Align .service file and installation steps to put rvi.config
in /etc/rvi.config (one of them was set to /etc/rvi/rvi.config)

Signed-off-by: Gunnar Andersson <gandersson@genivi.org>

Author: mirzak

meta-genivi-dev/meta-rvi/recipes-connectivity/rvi/files/rvi.service

@@ -7,13 +7,13 @@ After=getty@tty2.service
 [Service]
 Environment="HOME=/opt/rvi_core"
 Environment="RVI_PORT=8900"
-Environment="CONFIG=/etc/opt/rvi/rvi.config"
+Environment="CONFIG=/etc/rvi.config"
 Environment="RVI_BACKEND=38.101.164.230"
 
 StandardOutput=journal
 StandardError=journal
-ExecStart=/bin/sh -c "RVI_MYIP=$(/sbin/ip route | /usr/bin/awk '/default/ { print $3 }') CONFIG=/etc/opt/rvi/rvi.config RVI_BACKEND=38.101.164.230 /opt/rvi_core/rvi_ctl -c /etc/opt/rvi/rvi.config console"
-ExecStop=/opt/rvi_core/rvi_ctl stop
+ExecStart=/bin/sh -c "RVI_MYIP=$(/sbin/ip route | /usr/bin/awk '/default/ { print $3 }') CONFIG=/etc/rvi.config RVI_BACKEND=38.101.164.230 /usr/share/rvi_core/rvi_ctl -c /etc/rvi.config console"
+ExecStop=/usr/share/rvi_core/rvi_ctl stop
 GuessMainPID=yes
 RemainAfterExit=yes
 

meta-genivi-dev/meta-rvi/recipes-connectivity/rvi/rvi_git.bbappend

@@ -1,15 +1,28 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += "\
+
+# NOTE! install_to_usr branch might be temporary.
+# When updating next time, consider changing to master or develop
+# (assuming that installing to /usr has been merged, that is)
+SRC_URI = "\
+    git://github.com/GENIVI/rvi_core;branch=install_to_usr;name=rvi;protocol=https \
     file://rvi.service \
     file://device_id \
     file://0001-rvi_ctl.template-get-rid-of-dependecy-on-install.patch \
     "
 
+RVI_DIR = "${datadir}/rvi_core"
+
 do_install_append () {
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${WORKDIR}/rvi.service ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/device_id ${D}${sysconfdir}/opt/rvi/device_id
+
+    # install RVI default configuration file
+    install -d ${D}${sysconfdir}/rvi/
+    install -m 0644 ${WORKDIR}/device_id ${D}${sysconfdir}/rvi/device_id
+    install -m 0644 ./priv/config/rvi_yocto.config ${D}${sysconfdir}/rvi.config
+
     rm ${D}${sysconfdir}/init.d/rvi
+    rm -r ${D}${sysconfdir}/opt
 }
 
 inherit systemd
@@ -21,3 +34,5 @@ pkg_postinst_${PN} () {
     #!/bin/sh -e
     true
 }
+
+FILES_${PN} += "${datadir}/rvi_core"