From c4c440ac53c69df3d7f75dcadc040cea89ff340c Mon Sep 17 00:00:00 2001
From: Jason Reiss <jreiss@multitech.com>
Date: Tue, 20 Dec 2016 08:47:27 -0600
Subject: lora: move packet forwarder init and default scripts into machine
 specific folders

---
 .../lora-packet-forwarder.default                  |   2 -
 .../lora-packet-forwarder.default.mtcdt            |   2 -
 .../lora-packet-forwarder.init                     |  69 -------------
 .../lora-packet-forwarder.init.mtcdt               | 115 ---------------------
 .../mtcap/lora-packet-forwarder.default            |   2 +
 .../mtcap/lora-packet-forwarder.init               |  69 +++++++++++++
 .../mtcdt/lora-packet-forwarder.default            |   2 +
 .../mtcdt/lora-packet-forwarder.init               | 115 +++++++++++++++++++++
 .../lora/lora-packet-forwarder_3.0.0.bb            |   9 +-
 9 files changed, 192 insertions(+), 193 deletions(-)
 delete mode 100644 recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.default
 delete mode 100644 recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.default.mtcdt
 delete mode 100755 recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init
 delete mode 100755 recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init.mtcdt
 create mode 100644 recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.default
 create mode 100755 recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.init
 create mode 100644 recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.default
 create mode 100755 recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init

diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.default b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.default
deleted file mode 100644
index be7dcd5..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# set to "yes" or "no" to control starting on boot
-ENABLED="yes"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.default.mtcdt b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.default.mtcdt
deleted file mode 100644
index 0f92640..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.default.mtcdt
+++ /dev/null
@@ -1,2 +0,0 @@
-# set to "yes" or "no" to control starting on boot
-ENABLED="no"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init
deleted file mode 100755
index 9ffaf6d..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-NAME="lora-packet-forwarder"
-ENABLED="yes"
-
-START_STOP_DAEMON="/usr/sbin/start-stop-daemon"
-
-[ -f /etc/default/$NAME ] && source /etc/default/$NAME
-
-run_dir=/var/run/lora
-pkt_fwd=/opt/lora/lora_pkt_fwd
-pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid
-log_file=/var/log/lora-pkt-fwd.log
-cfg_file=/opt/lora/global_conf.json
-
-do_start() {
-    echo "Starting $NAME: "
-
-    eui=$(mts-io-sysfs show lora/eui)
-    # Remove colons
-    clean_eui="${eui//:/}"
-    echo "Setting gateway_id in $cfg_file to $clean_eui"
-    sed -i "s/\"gateway_ID\": \".*\"/\"gateway_ID\": \"$clean_eui\"/" $cfg_file
-
-    mkdir -p $run_dir
-
-    # start packet forwarder
-    $START_STOP_DAEMON --start --background --make-pidfile \
-        --pidfile $pkt_fwd_pidfile --startas /bin/bash --chdir "/opt/lora/" \
-        -- -c "exec $pkt_fwd > $log_file 2>&1"
-
-    renice -n -20 -p $(pgrep $(basename $pkt_fwd))
-
-    echo "OK"
-}
-
-do_stop() {
-    echo -n "Stopping $NAME: "
-    $START_STOP_DAEMON --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5
-    rm -f $pkt_fwd_pidfile
-    echo "OK"
-}
-
-if [ "$ENABLED" != "yes" ]; then
-    echo "$NAME: disabled in /etc/default/$NAME"
-    exit
-fi
-
-case "$1" in
-    "start")
-        do_start
-        ;;
-    "stop")
-        do_stop
-        ;;
-    "restart")
-        ## Stop the service and regardless of whether it was
-        ## running or not, start it again.
-        do_stop
-        do_start
-        ;;
-    *)
-        ## If no parameters are given, print which are avaiable.
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-        ;;
-esac
-
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init.mtcdt b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init.mtcdt
deleted file mode 100755
index 510f171..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init.mtcdt
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/bash
-
-
-NAME="lora-packet-forwarder"
-ENABLED="yes"
-
-
-[ -f /etc/default/$NAME ] && source /etc/default/$NAME
-
-run_dir=/var/run/lora
-conf_dir=/var/config/lora
-
-pkt_fwd=$run_dir/1/lora_pkt_fwd
-pkt_fwd_log=/var/log/lora-pkt-fwd-1.log
-pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid
-
-
-port1=/sys/devices/platform/mts-io/ap1
-port2=/sys/devices/platform/mts-io/ap2
-
-
-lora_mtac_id="MTAC-LORA"
-lora_1_0_hw="MTAC-LORA-1.0"
-lora_1_5_h_hw="MTAC-LORA-1.5"
-
-
-read_card_info() {
-    # product-id of first lora card
-    lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null)
-    lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null)
-    # remove all colons
-    lora_eui_raw=${lora_eui//:/}
-    lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null)
-}
-
-
-card_found() {
-    if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then
-        ln -sf /dev/spidev32766.2 /dev/spidev0.0
-    elif [ -d $port2 ] && [[ $(cat $port2/hw-version) = $lora_hw ]]; then
-        ln -sf /dev/spidev32765.2 /dev/spidev0.0
-    fi
-    
-    if [[ "$lora_id" =~ "$lora_mtac_id" ]]; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-
-do_start() {
-
-    mkdir -p $run_dir/1
-    read_card_info
-
-    if ! [ -f $conf_file ]; then
-        echo "$0: $conf_file missing"
-        exit 1
-    fi
-
-
-    if card_found; then
-        echo "Found $lora_id with $lora_hw hardware"
-    else
-        echo "$0: MTAC-LORA not detected"
-        exit 1
-    fi
-    echo -n "Starting $NAME: "
-    # start packet forwarder
-    cp $conf_dir/global_conf.json $run_dir/1/global_conf.json
-    /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \
-        --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd"
-
-    renice -n -20 -p $(pgrep $(basename $pkt_fwd))
-
-
-    echo "OK"
-}
-
-
-do_stop() {
-    echo -n "Stopping $NAME: "
-    start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5
-    rm -f $pkt_fwd_pidfile
-    echo "OK"
-}
-
-
-if [ "$ENABLED" != "yes" ]; then
-    echo "$NAME: disabled in /etc/default"
-    exit
-fi
-
-
-case "$1" in
-    "start")
-    do_start
-        ;;
-    "stop")
-    do_stop
-        ;;
-    "restart")
-    ## Stop the service and regardless of whether it was
-        ## running or not, start it again.
-        do_stop
-        do_start
-        ;;
-    *)
-        ## If no parameters are given, print which are avaiable.
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-    ;;
-esac
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.default b/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.default
new file mode 100644
index 0000000..be7dcd5
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.default
@@ -0,0 +1,2 @@
+# set to "yes" or "no" to control starting on boot
+ENABLED="yes"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.init
new file mode 100755
index 0000000..9ffaf6d
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.init
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+NAME="lora-packet-forwarder"
+ENABLED="yes"
+
+START_STOP_DAEMON="/usr/sbin/start-stop-daemon"
+
+[ -f /etc/default/$NAME ] && source /etc/default/$NAME
+
+run_dir=/var/run/lora
+pkt_fwd=/opt/lora/lora_pkt_fwd
+pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid
+log_file=/var/log/lora-pkt-fwd.log
+cfg_file=/opt/lora/global_conf.json
+
+do_start() {
+    echo "Starting $NAME: "
+
+    eui=$(mts-io-sysfs show lora/eui)
+    # Remove colons
+    clean_eui="${eui//:/}"
+    echo "Setting gateway_id in $cfg_file to $clean_eui"
+    sed -i "s/\"gateway_ID\": \".*\"/\"gateway_ID\": \"$clean_eui\"/" $cfg_file
+
+    mkdir -p $run_dir
+
+    # start packet forwarder
+    $START_STOP_DAEMON --start --background --make-pidfile \
+        --pidfile $pkt_fwd_pidfile --startas /bin/bash --chdir "/opt/lora/" \
+        -- -c "exec $pkt_fwd > $log_file 2>&1"
+
+    renice -n -20 -p $(pgrep $(basename $pkt_fwd))
+
+    echo "OK"
+}
+
+do_stop() {
+    echo -n "Stopping $NAME: "
+    $START_STOP_DAEMON --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5
+    rm -f $pkt_fwd_pidfile
+    echo "OK"
+}
+
+if [ "$ENABLED" != "yes" ]; then
+    echo "$NAME: disabled in /etc/default/$NAME"
+    exit
+fi
+
+case "$1" in
+    "start")
+        do_start
+        ;;
+    "stop")
+        do_stop
+        ;;
+    "restart")
+        ## Stop the service and regardless of whether it was
+        ## running or not, start it again.
+        do_stop
+        do_start
+        ;;
+    *)
+        ## If no parameters are given, print which are avaiable.
+        echo "Usage: $0 {start|stop|restart}"
+        exit 1
+        ;;
+esac
+
+
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.default b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.default
new file mode 100644
index 0000000..0f92640
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.default
@@ -0,0 +1,2 @@
+# set to "yes" or "no" to control starting on boot
+ENABLED="no"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init
new file mode 100755
index 0000000..510f171
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+
+NAME="lora-packet-forwarder"
+ENABLED="yes"
+
+
+[ -f /etc/default/$NAME ] && source /etc/default/$NAME
+
+run_dir=/var/run/lora
+conf_dir=/var/config/lora
+
+pkt_fwd=$run_dir/1/lora_pkt_fwd
+pkt_fwd_log=/var/log/lora-pkt-fwd-1.log
+pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid
+
+
+port1=/sys/devices/platform/mts-io/ap1
+port2=/sys/devices/platform/mts-io/ap2
+
+
+lora_mtac_id="MTAC-LORA"
+lora_1_0_hw="MTAC-LORA-1.0"
+lora_1_5_h_hw="MTAC-LORA-1.5"
+
+
+read_card_info() {
+    # product-id of first lora card
+    lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null)
+    lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null)
+    # remove all colons
+    lora_eui_raw=${lora_eui//:/}
+    lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null)
+}
+
+
+card_found() {
+    if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then
+        ln -sf /dev/spidev32766.2 /dev/spidev0.0
+    elif [ -d $port2 ] && [[ $(cat $port2/hw-version) = $lora_hw ]]; then
+        ln -sf /dev/spidev32765.2 /dev/spidev0.0
+    fi
+    
+    if [[ "$lora_id" =~ "$lora_mtac_id" ]]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+
+do_start() {
+
+    mkdir -p $run_dir/1
+    read_card_info
+
+    if ! [ -f $conf_file ]; then
+        echo "$0: $conf_file missing"
+        exit 1
+    fi
+
+
+    if card_found; then
+        echo "Found $lora_id with $lora_hw hardware"
+    else
+        echo "$0: MTAC-LORA not detected"
+        exit 1
+    fi
+    echo -n "Starting $NAME: "
+    # start packet forwarder
+    cp $conf_dir/global_conf.json $run_dir/1/global_conf.json
+    /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \
+        --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd"
+
+    renice -n -20 -p $(pgrep $(basename $pkt_fwd))
+
+
+    echo "OK"
+}
+
+
+do_stop() {
+    echo -n "Stopping $NAME: "
+    start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5
+    rm -f $pkt_fwd_pidfile
+    echo "OK"
+}
+
+
+if [ "$ENABLED" != "yes" ]; then
+    echo "$NAME: disabled in /etc/default"
+    exit
+fi
+
+
+case "$1" in
+    "start")
+    do_start
+        ;;
+    "stop")
+    do_stop
+        ;;
+    "restart")
+    ## Stop the service and regardless of whether it was
+        ## running or not, start it again.
+        do_stop
+        do_start
+        ;;
+    *)
+        ## If no parameters are given, print which are avaiable.
+        echo "Usage: $0 {start|stop|restart}"
+        exit 1
+    ;;
+esac
+
diff --git a/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb
index d3c3e15..ada0493 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_3.0.0.bb
@@ -6,16 +6,14 @@ SECTION = "console/utils"
 LICENSE = "SEMTECH"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45"
 DEPENDS = "lora-gateway"
-PR = "r8"
+PR = "r9"
 
 SRCREV = "v${PV}"
 
 SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
            file://README.md \
            file://lora-packet-forwarder.init \
-           file://lora-packet-forwarder.init.mtcdt \
            file://lora-packet-forwarder.default \
-           file://lora-packet-forwarder.default.mtcdt \
            file://global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc0 \
            file://global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 \
            file://global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 \
@@ -25,6 +23,7 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
            file://lora-packet-forwarder-remove-jit-power-check.patch \
 "
 
+
 S = "${WORKDIR}/git"
 
 LORA_DIR = "/opt/lora"
@@ -56,9 +55,9 @@ do_install_append_mtcdt() {
   install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5
 
   install -d ${D}${sysconfdir}/default
-  install -m 0644 ${WORKDIR}/lora-packet-forwarder.default.mtcdt ${D}${sysconfdir}/default/lora-packet-forwarder
+  install -m 0644 ${WORKDIR}/lora-packet-forwarder.default ${D}${sysconfdir}/default/lora-packet-forwarder
   install -d ${D}${sysconfdir}/init.d
-  install -m 0755 ${WORKDIR}/lora-packet-forwarder.init.mtcdt ${D}${sysconfdir}/init.d/lora-packet-forwarder
+  install -m 0755 ${WORKDIR}/lora-packet-forwarder.init ${D}${sysconfdir}/init.d/lora-packet-forwarder
 }
 
 do_install_append_mtcap() {
-- 
cgit v1.2.3