Moved script files to its own directory. Added tizen systemd support. Fixed init script support.

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

2 files changed, 57 insertions, 50 deletions

diff --git a/rpm/SPECS/rvi-0.2.spec b/rpm/SPECS/rvi-0.2.spec
index 2e7d335..dcb17d6 100644
--- a/rpm/SPECS/rvi-0.2.spec
+++ b/rpm/SPECS/rvi-0.2.spec
@@ -1,4 +1,4 @@
-Summary: Remote Vehicle Interaction Node
+Summary: Remote Vehicle Interaction Noed
 Name: rvi
 Version: 0.2
 Release: 1
@@ -25,16 +25,68 @@ environment.
 %build
 make deps
 make compile
-./setup_rvi_node.sh -n rvi-$RPM_PACKAGE_VERSION -c rvi_sample.config
-
+# 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 * $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
+    /usrbin/systemctl daemon-reload
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f file_list.txt
 %defattr(-,root,root)
 /opt/rvi-0.2
diff --git a/rpm/rvi b/rpm/rvi
deleted file mode 100755
index 0a3ac05..0000000
--- a/rpm/rvi
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-#
-# Copyright (C) 2014, Jaguar Land Rover
-#
-# This program is licensed under the terms and conditions of the
-# Mozilla Public License, version 2.0.  The full text of the 
-# Mozilla Public License is at https://www.mozilla.org/MPL/2.0/
-#
-
-export PATH="/bin/:/usr/bin:/sbin:/usr/sbin"
-. /lib/lsb/init-functions
-
-set -e 
-
-case "$1" in
-  start)
-        log_daemon_msg "Starting Remote Vehicle Interaction Node..." "rvi"
-        if /opt/rvi-0.2/rvi/bin/rvi start; then
-            log_end_msg 0
-        else
-            log_end_msg 1
-        fi
-        ;;
-  stop)
-        log_daemon_msg "Stopping Remote Vehicle Interaction Node..." "rvi"
-        if /opt/rvi-0.2/rvi/bin/rvi stop; then
-            log_end_msg 0
-        else
-            log_end_msg 1
-        fi
-        ;;
-  restart)
-        log_daemon_msg "Restarting Remote Vehicle Interaction Node..." "rvi"
-        if /opt/rvi-0.2/rvi/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}"
-	exit 1
-esac
-
-exit 0