Bumped version ref 0.2 -> 0.2.0

Signed-off-by: Magnus <mfeuer@jaguarlandrover.com>

3 files changed, 8 insertions, 100 deletions

diff --git a/rpm/SPECS/rvi-0.2.spec b/rpm/SPECS/rvi-0.2.spec
deleted file mode 100644
index e46fb1f..0000000
--- a/rpm/SPECS/rvi-0.2.spec
+++ /dev/null
@@ -1,92 +0,0 @@
-Summary: Remote Vehicle Interaction Noed
-Name: rvi
-Version: 0.2
-Release: 1
-# Copyright: Jaguar Land Rover -
-License: Mozilla Public License v2
-Vendor: Jaguar Land Rover
-Group: Applications/System
-Source: http://content.linuxfoundation.org/auto/downloads/rvi/rvi-0.2.tgz
-Buildroot: /var/tmp/%{name}-buildroot
-
-# Requires: 
-
-%description
-The RVI project sets up a P2P network allowing services on multiple
-nodes to access each other through a number of different protocols
-and data channels. The entire system is designed to be adapted
-and rewritten to fullfil the requirements of the target production
-environment.
-
-# 
-%prep
-%setup -c rvi-$RPM_PACKAGE_VERSION
-
-%build
-make deps
-make compile
-# Create a tizen node if that is what we have.
-if dmesg | grep -q Tizen; then
-    ./scripts/setup_rvi_node.sh -n rvi-$RPM_PACKAGE_VERSION -c tizen.config
-else
-    ./scripts/setup_rvi_node.sh -n rvi-$RPM_PACKAGE_VERSION -c rvi_sample.config
-fi
-%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION
-cp -ar rel/rvi-$RPM_PACKAGE_VERSION $RPM_BUILD_ROOT/opt/
-
-# If we are installing on Tizen, use the systemd setup
-# If not on Tizen, assume std debian setup
-if dmesg | grep -q Tizen; then
-    mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system/
-    mkdir -p $RPM_BUILD_ROOT/etc/systemd/system/multi-user.target.wants/
-    install ./scripts/rvi.service $RPM_BUILD_ROOT/usr/lib/systemd/system/rvi.service 
-    ln -fsr $RPM_BUILD_ROOT/usr/lib/systemd/system/rvi.service \
-	    $RPM_BUILD_ROOT/etc/systemd/system/multi-user.target.wants/rvi.service
-    echo "/usr/lib/systemd/system/rvi.service 
-          /etc/systemd/system/multi-user.target.wants/rvi.service" > file_list.txt
-else
-    mkdir -p $RPM_BUILD_ROOT/etc/init.d
-    mkdir -p $RPM_BUILD_ROOT/etc/rc0.d
-    mkdir -p $RPM_BUILD_ROOT/etc/rc1.d
-    mkdir -p $RPM_BUILD_ROOT/etc/rc2.d
-    mkdir -p $RPM_BUILD_ROOT/etc/rc3.d
-    mkdir -p $RPM_BUILD_ROOT/etc/rc4.d
-    mkdir -p $RPM_BUILD_ROOT/etc/rc5.d
-    mkdir -p $RPM_BUILD_ROOT/etc/rc6.d
-    install ./scripts/rvi $RPM_BUILD_ROOT/etc/init.d
-    ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc0.d/K20-rvi
-    ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc1.d/K20-rvi
-    ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc2.d/S50-rvi
-    ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc3.d/S50-rvi
-    ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc4.d/S50-rvi
-    ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc5.d/S50-rvi
-    ln -fsr $RPM_BUILD_ROOT/etc/init.d/rvi $RPM_BUILD_ROOT/etc/rc6.d/K20-rvi
-    
-    echo "/etc/init.d
-    /etc/rc0.d
-    /etc/rc1.d
-    /etc/rc2.d
-    /etc/rc3.d
-    /etc/rc4.d
-    /etc/rc5.d
-    /etc/rc6.d" > file_list.txt
-
-fi
-
-
-# Make global config file easier to access.
-ln -fsr $RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION/releases/1/sys.config \
-       $RPM_BUILD_ROOT/opt/rvi-$RPM_PACKAGE_VERSION/sys.config 
-%post
-if dmesg | grep -q Tizen; then
-    /usr/bin/systemctl daemon-reload
-fi
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f file_list.txt
-%defattr(-,root,root)
-/opt/rvi-0.2
diff --git a/scripts/rvi b/scripts/rvi
index 6074d19..0b6e4fe 100755
--- a/scripts/rvi
+++ b/scripts/rvi
@@ -18,7 +18,7 @@ set -e
 case "$1" in
   start)
         log_daemon_msg "Starting Remote Vehicle Interaction Node..." "rvi"
-        if /opt/rvi-0.2/bin/rvi start; then
+        if /opt/rvi-0.2.0/bin/rvi start; then
             log_end_msg 0
         else
             log_end_msg 1
@@ -26,7 +26,7 @@ case "$1" in
         ;;
   stop)
         log_daemon_msg "Stopping Remote Vehicle Interaction Node..." "rvi"
-        if /opt/rvi-0.2/bin/rvi stop; then
+        if /opt/rvi-0.2.0/bin/rvi stop; then
             log_end_msg 0
         else
             log_end_msg 1
@@ -34,14 +34,14 @@ case "$1" in
         ;;
   restart)
         log_daemon_msg "Restarting Remote Vehicle Interaction Node..." "rvi"
-        if /opt/rvi-0.2/bin/rvi restart; then
+        if /opt/rvi-0.2.0/bin/rvi restart; then
             log_end_msg 0
         else
             log_end_msg 1
         fi
         ;;
   *)
-	log_action_msg "Usage: /etc/init.d/sdbd {start|stop|restart}"
+	log_action_msg "Usage: /etc/init.d/rvi {start|stop|restart}"
 	exit 1
 esac
 
diff --git a/scripts/rvi.service b/scripts/rvi.service
index a085cdf..d68362c 100644
--- a/scripts/rvi.service
+++ b/scripts/rvi.service
@@ -8,10 +8,10 @@ Environment="HOME=/opt/rvi-2.0"
 Type=forking
 StandardOutput=journal
 StandardError=journal
-ExecStartPre=/opt/rvi-0.2/erts-5.10.3/bin/epmd -daemon
-ExecStart=/bin/sh /opt/rvi-0.2/bin/rvi start
-ExecStop=/bin/sh /opt/rvi-0.2/bin/rvi stop
-ExecStopPost=/opt/rvi-0.2/erts-5.10.3/bin/epmd -kill
+ExecStartPre=/opt/rvi-0.2.0/erts-5.10.4/bin/epmd -daemon
+ExecStart=/bin/sh /opt/rvi-0.2.0/bin/rvi start
+ExecStop=/bin/sh /opt/rvi-0.2.0/bin/rvi stop
+ExecStopPost=/opt/rvi-0.2.0/erts-5.10.4/bin/epmd -kill
 GuessMainPID=yes
 
 [Install]