Merged from release-0.4.0-yocto_makefile

6 files changed, 340 insertions, 174 deletions

diff --git a/scripts/rvi b/scripts/rvi
index 337432e..6683c52 100755..100644
--- a/scripts/rvi
+++ b/scripts/rvi
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 #
 # Copyright (C) 2014, Jaguar Land Rover
 #
@@ -6,43 +6,66 @@
 # Mozilla Public License, version 2.0.  The full text of the 
 # Mozilla Public License is at https://www.mozilla.org/MPL/2.0/
 #
+
 #
-# Init.d script to start and stop an RVI system installed
-# through an RPM.
+# Setup a correct configuration and launch an RVI release node.
+# If a UUID file has not been created, it will be done at this time.
 #
-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.4.0/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.4.0/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.4.0/bin/rvi restart; then
-            log_end_msg 0
-        else
-            log_end_msg 1
-        fi
-        ;;
-  *)
-	log_action_msg "Usage: /etc/init.d/rvi {start|stop|restart}"
-	exit 1
-esac
-
-exit 0
+
+SELF_DIR=$(dirname $(readlink -f "$0"))
+CONFIG_DIR=/etc/opt/rvi
+BIN_DIR=/opt/rvi
+
+usage() {
+    echo "Usage: $0 -c config_file"
+    echo "  -c config_file        Specify the configuration "
+    echo "Configuration data is read from the configuration file."
+    exit 1
+}
+
+while getopts "c:" o; do
+    case "${o}" in
+        c)
+            CONFIG_FILE=${OPTARG}
+            ;;
+        *)
+            usage
+            ;;
+    esac
+done
+
+if [ -z "${CONFIG_FILE}" ] ; then
+    echo "Missing -c flag"
+    usage
+fi
+
+# Check if we have a uuid file.
+if [ ! -f ${CONFIG_DIR}/device_id ]
+then
+    echo "Creating device ID in ${CONFIG_DIR}/device_id"
+    cat /proc/sys/kernel/random/uuid > ${CONFIG_DIR}/device_id
+fi
+
+# 
+# Generate a config file that will end up as
+# /tmp/rvi/sys.config
+#
+(
+    cd /tmp/
+    rm -rf rvi
+    export ERL_LIBS=${BIN_DIR}/setup:${BIN_DIR}/lib/
+    ${BIN_DIR}/setup_gen rvi $CONFIG_FILE rvi
+)
+
+# Did we succeed with config generation?
+if [ "$?" != "0" ]
+then
+    # Nope
+    exit "$?"
+fi   
+
+# Copy created config file to /etc/opt/rvi/sys.config,
+# which is symlinked to by /opt/rvi/sys.config
+cp /tmp/rvi/sys.config /etc/opt/rvi/sys.config
+
+exec /opt/rvi/bin/rvi start
diff --git a/scripts/rvi.service.tizen b/scripts/rvi.service.tizen
new file mode 100644
index 0000000..1220eb9
--- /dev/null
+++ b/scripts/rvi.service.tizen
@@ -0,0 +1,19 @@
+# systemd(8) setup usde by Tizen and others.
+[Unit]
+Description=Remote Vehicle Interaction Service
+Wants=network-online.target
+
+[Service]
+Environment="HOME=/opt/rvi-0.4.0"
+Type=forking
+StandardOutput=journal
+StandardError=journal
+ExecStartPre=/usr/bin/chsmack --access User /home/app/content/Documents/vin
+ExecStartPre=/opt/rvi-0.4.0/erts-5.10.4/bin/epmd -daemon
+ExecStart=/bin/sh /opt/rvi-0.4.0/bin/rvi start
+ExecStop=/bin/sh /opt/rvi-0.4.0/bin/rvi stop
+ExecStopPost=/opt/rvi-0.4.0/erts-5.10.4/bin/epmd -kill
+GuessMainPID=yes
+
+[Install]
+WantedBy=graphical.target multi-user.target
diff --git a/scripts/rvi.service.yocto b/scripts/rvi.service.yocto
new file mode 100644
index 0000000..1ddae5d
--- /dev/null
+++ b/scripts/rvi.service.yocto
@@ -0,0 +1,18 @@
+# systemd(8) setup usde by Tizen and others.
+[Unit]
+Description=Remote Vehicle Interaction Service
+Wants=network-online.target
+
+[Service]
+Environment="HOME=/opt/rvi"
+Type=forking
+StandardOutput=journal
+StandardError=journal
+ExecStartPre=epmd -daemon
+ExecStart=/bin/sh /opt/rvi/rvi.sh -d /etc/opt/rvi -c /etc/opt/rvi/rvi_yocto.config start
+ExecStop=/bin/sh /opt/rvi/rvi stop
+ExecStopPost=epmd -kill
+GuessMainPID=yes
+
+[Install]
+# WantedBy=graphical.target multi-user.target
diff --git a/scripts/rvi.sh b/scripts/rvi.sh
new file mode 100644
index 0000000..e713784
--- /dev/null
+++ b/scripts/rvi.sh
@@ -0,0 +1,168 @@
+#!/bin/sh
+#
+# Copyright (C) 2014, Jaguar Land Rover
+#
+# Mozilla Public License, version 2.0.  The full text of the 
+# Mozilla Public License is at https://www.mozilla.org/MPL/2.0/
+#
+#
+# Setup a correct configuration and launch an RVI release node.
+# If a UUID file has not been created, it will be done at this time.
+# Init.d script to start and stop an RVI system installed
+# through an RPM.
+#
+
+SELF_DIR=$(dirname $(readlink -f "$0"))
+
+ERL=${ERL:=erl}
+
+usage() {
+    echo "Usage: $0 -d config_dir -c config_file -l log_dir \\" 
+    echo "       start|stop|console|attach|ping"
+    echo
+    echo "  -c config_file  Configuration file to launch rvi node with. "
+    echo "                  If omitted the rvi.config in the configuration "
+    echo "                  directory will be used."
+    echo
+    echo "  -d config_dir   Directory to put generated uuid 'device_id' file and"
+    echo "                  processed config files."
+    echo "                  Defauts to the 'config' directory under the directory"
+    echo "                  that rvi.sh resides in."
+    echo
+    echo "  -l log_dir      The directory to store log files in."
+    echo "                  Defaults to '/tmp/rvi/[config]/log' where [config]"
+    echo "                  is the base name of the configuration file."
+    echo
+    echo "  start           Start an rvi node with the given configuration file."
+    echo
+    echo "  stop            Stop an rvi node previously started with 'start'."
+    echo
+    echo "  console         Start an rvi in foreground mode."
+    echo 
+    echo "  attach          Attach to an rvi node previously started with 'start'."
+    echo
+    echo "  ping            Ping to check if an rvi node is up. Returns 0 if up."
+    exit 1
+}
+
+CONFIG_FILE=""
+
+SNAME=rvi
+COOKIE=rvi_cookie
+unset CONFIG_DIR
+unset LOG_DIR
+while getopts "c:d:" o; do
+    case "${o}" in
+        c)
+            CONFIG_FILE=${OPTARG}
+            ;;
+        d)
+            CONFIG_DIR=${OPTARG}
+            ;;
+        l)
+            LOG_DIR=${OPTARG}
+            ;;
+        *)
+            usage
+            ;;
+    esac
+done
+
+CONFIG_DIR=${CONFIG_DIR:=${SELF_DIR}/config}
+
+shift $((${OPTIND}-1))
+CMD=$1
+
+if [ "${CMD}" != "start" -a "${CMD}" != "stop" -a  "${CMD}" != "console" -a  "${CMD}" != "ping" ]
+then
+    usage
+fi
+
+export ERL_LIBS=${SELF_DIR}/rvi:${SELF_DIR}/rvi/deps:${SELF_DIR}/rvi/components
+TMP_DIR=/tmp/rvi/$(basename ${CONFIG_FILE} .config)
+LOG_DIR=${LOG_DIR:=${TMP_DIR}/log}
+
+
+# Check that we have a config dir
+if [ ! -d ${CONFIG_DIR} ]
+then
+    install -d --mode=0755 ${CONFIG_DIR}
+fi
+
+# Check if we have a uuid file.
+if [ ! -f ${CONFIG_DIR}/device_id ]
+then
+    echo "Creating device ID in ${CONFIG_DIR}/device_id"
+    cat /proc/sys/kernel/random/uuid > ${CONFIG_DIR}/device_id
+fi
+
+
+
+#
+# See if we need to process a config file
+#
+if [ ${CMD} = "start" -o ${CMD} = "console" ]
+then
+    # Default to rvi.config
+    CONFIG_FILE=${CONFIG_FILE:=${CONFIG_DIR}/rvi.config}
+    #
+    # Check if we need to prepend current dir
+    # to relative config file path
+    #
+    if [ $(echo ${CONFIG_FILE} | cut -c 1,1) != "/" ]
+    then
+	CONFIG_FILE=${PWD}/${CONFIG_FILE}
+    fi
+
+    # Check that config file can be read.
+    if [ ! -r "${CONFIG_FILE}" ]
+    then
+	echo "${CONFIG_FILE} cannot be opened for reading."
+	usage
+    fi
+    # 
+    # Generate a config file that will end up as
+    # /tmp/rvi/sys.config
+    #
+    (
+	cd ${CONFIG_DIR}
+	${SELF_DIR}/setup_gen rvi ${CONFIG_FILE} rvi
+    )
+
+    # Did we succeed with config generation?
+    if [ "$?" != "0" ]
+    then
+	# Nope
+	echo "Failed to process configuration file."
+	exit "$?"
+    fi
+fi
+   
+
+LAUNCH="${ERL} -boot ${CONFIG_DIR}/rvi/start -sname ${SNAME} -config ${CONFIG_DIR}/rvi/sys -setcookie ${COOKIE}"
+
+case "${CMD}" in
+   start)
+	 install -d --mode 0755  ${TMP_DIR}
+	 install -d --mode 0755  ${LOG_DIR}
+	 exec run_erl -daemon ${TMP_DIR}/ ${LOG_DIR} "exec ${LAUNCH}"
+	 ;;
+
+   console)
+       exec ${LAUNCH}
+       ;;
+
+   stop)
+       exec ${SELF_DIR}/nodetool -sname ${SNAME} -setcookie ${COOKIE} stop
+       ;;
+
+   ping)
+       exec ${SELF_DIR}/nodetool -sname ${SNAME} -setcookie ${COOKIE} ping
+       ;;
+
+   attach) 
+       exec to_erl ${TMP_DIR}
+       ;;
+
+esac 
+
diff --git a/scripts/rvi_install.sh b/scripts/rvi_install.sh
new file mode 100755
index 0000000..7572aa9
--- /dev/null
+++ b/scripts/rvi_install.sh
@@ -0,0 +1,73 @@
+#!/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/
+#
+
+#
+# Setup an RVI release with a configuration file.
+#
+# This script will setup a directory with with the same name
+# as the release name. The script uses Ulf Wiger's setup application 
+# (github.com/Feuerlabs/setup) to generate the release.
+# 
+# With the -d argument, a developer release will be built with
+# only
+#
+#  Once setup, the RVI node can be started with ./rvi_node <release_na,e?
+#
+#  Please note that the generated release will depend on the built
+#
+#  In order to create a standalone release, use create_rvi_release.sh
+#
+
+SELF_DIR=$(dirname $(readlink -f "$0"))
+SETUP_GEN=$SELF_DIR/setup_gen  # Ulf's kitchen sink setup utility
+
+usage() {
+    echo "Usage: $0 binary_dir"
+    echo 
+    echo "RVI will be installed in 'target_dir'."
+    echo 
+    echo "The created node can be started with: 'target_dir'/rvi.sh"
+    echo "RVI in 'target_dir' will rely on a native erlang to function"
+    exit 1
+}
+
+cd ${SELF_DIR}/..
+
+shift $((${OPTIND}-1))
+
+if [ "${#}" != "1" ]
+then
+    echo "Target directory not specifiied."
+    usagee
+fi
+
+TARGET_DIR=$1
+
+rm -rf ${TARGET_DIR} > /dev/null 2>&1 
+
+install --mode=0755 -d ${TARGET_DIR}/rvi
+
+FILE_SET=$(find ebin components deps -name ebin -o -name priv)
+
+echo "Installing rvi at ${TARGET_DIR}."
+
+tar cf - ${FILE_SET} | (cd ${TARGET_DIR}/rvi ; tar xf - )
+
+install --mode=0755 scripts/rvi.sh ${TARGET_DIR}
+install --mode=0755 scripts/setup_gen ${TARGET_DIR}
+install --mode=0755 rel/files/nodetool ${TARGET_DIR}
+
+echo "RVI installed under ${TARGET_DIR}"
+echo "Start:              ${TARGET_DIR}/rvi.sh -c <config_file> start"
+echo "Attach started RVI: ${TARGET_DIR}/rvi.sh attach"
+echo "Stop:               ${TARGET_DIR}/rvi.sh stop"
+echo "Start console mode: ${TARGET_DIR}/rvi.sh -c <config_file> console"
+
+exit 0
+
diff --git a/scripts/setup_rvi_node.sh b/scripts/setup_rvi_node.sh
deleted file mode 100755
index 92b9fe3..0000000
--- a/scripts/setup_rvi_node.sh
+++ /dev/null
@@ -1,135 +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/
-#
-
-#
-# Setup an RVI release with a configuration file.
-#
-# This script will setup a directory with with the same name
-# as the release name. The script uses Ulf Wiger's setup application 
-# (github.com/Feuerlabs/setup) to generate the release.
-# 
-# With the -d argument, a developer release will be built with
-# only
-#
-#  Once setup, the RVI node can be started with ./rvi_node <release_na,e?
-#
-#  Please note that the generated release will depend on the built
-#
-#  In order to create a standalone release, use create_rvi_release.sh
-#
-
-alias realpath="python -c 'import os, sys; print os.path.realpath(sys.argv[1])'"
-SELF_DIR=$(dirname $(realpath "$0"))
-TOP_DIR=$(dirname $SELF_DIR)
-
-SETUP_GEN=$SELF_DIR/setup_gen  # Ulf's kitchen sink setup utility
-
-usage() {
-    echo "Usage: $0 [-d] -n node_name -c config_file"
-    echo "  -n node_name     Specify the name of the rvi node to setup"
-    echo 
-    echo "  -c config_file   Specifies the setup config file to use when setting "
-    echo "                   up the node"
-    echo 
-    echo "  -d               Create a development release. See below."
-    echo 
-    echo "The generated node will be created in a subdirectory with the same"
-    echo "name as the node name."
-    echo 
-    echo "The created node can be started with: $SELF_DIR/rvi_node -n node_name"
-    echo 
-    echo "If the node was created with the -d flag, you need to start"
-    echo "the node with $SELF_DIR/rvi_node -d -n node_name"
-    echo
-    echo "Configuration file examples can be found in hvac_demo/vehicle.config"
-    echo 
-    echo "The -d flag creates a development release that uses the erlang "
-    echo "binaries found in ebin/ and deps/*/ebin. This means that new builds,"
-    echo "created by make, can be run directly through "
-    echo "$SELF_DIR/rvi_node -n node_name without having to run ./setup_rvi_node.sh ."
-    echo
-    echo "If the -d flag is omitted, the release will be self-contained in the "
-    echo "newly created subdirectory rel/[node_name]."
-    echo "This directory, containing a standard erlang reltool release, "
-    echo "including the erlang runtime system, can be copied as a stand alone"
-    echo "system to a destination node."
-    echo 
-    echo "Configuration file examples can be found in hvac_demo/vehicle.config"
-    exit 1
-}
-
-
-build_type=rel
-while getopts "dn:c:" o; do
-    case "${o}" in
-        n)
-            NODE_NAME=${OPTARG}
-            ;;
-        c)
-            CONFIG_NAME=${OPTARG}
-            ;;
-        d)
-            build_type=dev
-            ;;
-
-        *)
-            usage
-            ;;
-    esac
-done
-
-if [ -z "${NODE_NAME}" ] ; then
-    echo "Missing -n flag"
-    usage
-fi
-if [ -z "${CONFIG_NAME}" ] ; then
-    echo "Missing -c flag"
-    usage
-fi
-
-export ERL_LIBS=$TOP_DIR/components:$TOP_DIR/deps:$ERL_LIBS:$TOP_DIR 
-echo "ERL_LIBS=$ERL_LIBS"
-echo  "Setting up node $NODE_NAME."
-rm -rf $NODE_NAME
-setupres=$( $SETUP_GEN $NODE_NAME $CONFIG_NAME $NODE_NAME -pa $TOP_DIR/ebin )
-if [ -z "${setupres}" ]
-then
-
-    if [ "${build_type}" = "dev" ]
-    then
-	echo "RVI Node $NODE_NAME has been setup."
-	echo "Launch with $SELF_DIR/rvi_node.sh -n $NODE_NAME"
-	exit
-    else
-	echo "Building stand alone release for $NODE_NAME"
-	# Copy the newly created config file.
-	rm -rf rel/$NODE_NAME
-	cp $NODE_NAME/sys.config rel/files/sys.config
-	./rebar generate 
-	# Rename the release after the node name
-	mv rel/rvi rel/$NODE_NAME
-	echo "Stand alone release for $NODE_NAME created under project "
-	echo "root directory's ./rel/$NODE_NAME."
-	echo
-	echo "Start:              ./rel/$NODE_NAME/bin/rvi start"
-	echo "Attach console:     ./rel/$NODE_NAME/bin/rvi attach"
-	echo "Stop:               ./rel/$NODE_NAME/bin/rvi stop"
-	echo "Start console mode: ./rel/$NODE_NAME/bin/rvi console"
-	echo 
-	echo "Start dev mode:     ./rvi_node.sh -n $NODE_NAME"
-	echo 
-	echo "./rel/$NODE_NAME can be copied and installed on its destination host."
-    fi
-else
-    >&2 echo $setupres
-    exit 1
-fi
-
-exit 0
-