From 891540676720f4af95dec79a75884af914700909 Mon Sep 17 00:00:00 2001
From: Jason Reiss <jreiss@multitech.com>
Date: Thu, 4 Jan 2018 14:48:39 -0600
Subject: lora: update network server to 2.0.13

---
 .../lora-network-server.init                       | 21 ++++++++-
 .../lora/lora-network-server-mtcap_1.0.16.bb       | 49 ---------------------
 .../lora/lora-network-server-mtcap_2.0.13.bb       | 49 +++++++++++++++++++++
 .../lora-network-server/lora-network-server.init   |  3 +-
 .../lora/lora-network-server_2.0.13.bb             | 50 ++++++++++++++++++++++
 .../lora/lora-network-server_2.0.9.bb              | 50 ----------------------
 6 files changed, 119 insertions(+), 103 deletions(-)
 delete mode 100644 recipes-connectivity/lora/lora-network-server-mtcap_1.0.16.bb
 create mode 100644 recipes-connectivity/lora/lora-network-server-mtcap_2.0.13.bb
 create mode 100644 recipes-connectivity/lora/lora-network-server_2.0.13.bb
 delete mode 100644 recipes-connectivity/lora/lora-network-server_2.0.9.bb

diff --git a/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.init b/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.init
index 86d731b..9357030 100755
--- a/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.init
+++ b/recipes-connectivity/lora/lora-network-server-mtcap/lora-network-server.init
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 NAME="lora-network-server"
+LOCK="/var/lock/$NAME"
 ENABLED="yes"
 
 START_STOP_DAEMON="/usr/sbin/start-stop-daemon"
@@ -10,7 +11,6 @@ START_STOP_DAEMON="/usr/sbin/start-stop-daemon"
 run_dir=/var/run/lora
 conf_dir=/var/config/lora
 conf_file=/opt/lora/lora-network-server.conf
-conf_db=$conf_dir/lora-network-server.db
 
 net_server=/opt/lora/lora-network-server
 net_server_log=/var/log/lora-network-server.log
@@ -57,16 +57,33 @@ if [ "$ENABLED" != "yes" ]; then
     exit
 fi
 
+force_stop() {
+    do_stop
+    rm -fr $LOCK
+}
+
+function try_lock() {
+    if mkdir $LOCK; then
+        trap "rm -fr $LOCK" EXIT
+    else
+        echo "Lora Network Server lock not acquired, resource in use"
+        exit 1
+    fi
+}
+
+
 case "$1" in
     "start")
+	try_lock
         do_start
         ;;
     "stop")
-        do_stop
+	force_stop
         ;;
     "restart")
         ## Stop the service and regardless of whether it was
         ## running or not, start it again.
+	try_lock
         do_stop
         do_start
         ;;
diff --git a/recipes-connectivity/lora/lora-network-server-mtcap_1.0.16.bb b/recipes-connectivity/lora/lora-network-server-mtcap_1.0.16.bb
deleted file mode 100644
index d23d823..0000000
--- a/recipes-connectivity/lora/lora-network-server-mtcap_1.0.16.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-# THIS RECIPE FOR PICOCELL USES PATCHED LORA NETWORK SERVER THAT SUPPORTS
-# MTCAP HARDWARE AND V2 PACKET FORWARDER PROTOCOL
-DESCRIPTION = "MultiTech LoRa Network Server"
-PRIORITY = "optional"
-SECTION = "console/utils"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7ffae4666a986c4ccf45e99e464f8402"
-DEPENDS = "jsoncpp libmts mosquitto sqlite3"
-RDEPENDS_${PN} += "lora-packet-forwarder logrotate"
-PR = "r3"
-
-SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \
-           file://lora-network-server.conf \
-           file://lora-network-server.init \
-           file://lora-network-server.default \
-           file://lora-network-server.logrotate.conf \
-           file://local_conf.json \
-          "
-
-SRC_URI[md5sum] = "3169970ea9b96656847d7472a2cf1f0f"
-SRC_URI[sha256sum] = "81b3c348911464fccbb70e3ff0c60dbcf77af69c2205aec3591fc2ceff7a5c52"
-
-# binaries are already stripped, so suppress warning
-INSANE_SKIP_${PN} = "already-stripped"
-
-S = "${WORKDIR}"
-
-LORA_DIR = "/opt/lora"
-
-do_compile() {
-}
-
-do_install() {
-    install -d ${D}${LORA_DIR}
-    install -m 0755 lora-network-server ${D}${LORA_DIR}/
-    install -m 0644 ${WORKDIR}/lora-network-server.conf ${D}${LORA_DIR}/
-    install -m 0755 ${WORKDIR}/local_conf.json ${D}${LORA_DIR}/
-
-    install -d ${D}${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/lora-network-server.default ${D}${sysconfdir}/default/lora-network-server
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/lora-network-server.init ${D}${sysconfdir}/init.d/lora-network-server
-    install -d ${D}${sysconfdir}/logrotate.d
-    install -m 0644 ${WORKDIR}/lora-network-server.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-network-server.conf
-}
-
-CONFFILES_${PN} = "${sysconfdir}/default/lora-network-server"
-FILES_${PN} += "${LORA_DIR}"
-FILES_${PN}-dbg += "${LORA_DIR}/.debug"
diff --git a/recipes-connectivity/lora/lora-network-server-mtcap_2.0.13.bb b/recipes-connectivity/lora/lora-network-server-mtcap_2.0.13.bb
new file mode 100644
index 0000000..7523cbf
--- /dev/null
+++ b/recipes-connectivity/lora/lora-network-server-mtcap_2.0.13.bb
@@ -0,0 +1,49 @@
+# THIS RECIPE FOR PICOCELL USES PATCHED LORA NETWORK SERVER THAT SUPPORTS
+# MTCAP HARDWARE AND V2 PACKET FORWARDER PROTOCOL
+DESCRIPTION = "MultiTech LoRa Network Server"
+PRIORITY = "optional"
+SECTION = "console/utils"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7ffae4666a986c4ccf45e99e464f8402"
+DEPENDS = "jsoncpp libmts mosquitto sqlite3 curl gnutls"
+RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash"
+PR = "r3"
+
+SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \
+           file://lora-network-server.conf \
+           file://lora-network-server.init \
+           file://lora-network-server.default \
+           file://lora-network-server.logrotate.conf \
+           file://local_conf.json \
+          "
+
+SRC_URI[md5sum] = "3c9c62d0e721a4b588d602cc36052798"
+SRC_URI[sha256sum] = "3499b14fc84c241401cf13089298192e1e3c4df2b977381f823b4aa82263b781"
+
+# binaries are already stripped, so suppress warning
+INSANE_SKIP_${PN} = "already-stripped"
+
+S = "${WORKDIR}"
+
+LORA_DIR = "/opt/lora"
+
+do_compile() {
+}
+
+do_install() {
+    install -d ${D}${LORA_DIR}
+    install -m 0755 lora-network-server ${D}${LORA_DIR}/
+    install -m 0644 ${WORKDIR}/lora-network-server.conf ${D}${LORA_DIR}/
+    install -m 0755 ${WORKDIR}/local_conf.json ${D}${LORA_DIR}/
+
+    install -d ${D}${sysconfdir}/default
+    install -m 0644 ${WORKDIR}/lora-network-server.default ${D}${sysconfdir}/default/lora-network-server
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/lora-network-server.init ${D}${sysconfdir}/init.d/lora-network-server
+    install -d ${D}${sysconfdir}/logrotate.d
+    install -m 0644 ${WORKDIR}/lora-network-server.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-network-server.conf
+}
+
+CONFFILES_${PN} = "${sysconfdir}/default/lora-network-server"
+FILES_${PN} += "${LORA_DIR}"
+FILES_${PN}-dbg += "${LORA_DIR}/.debug"
diff --git a/recipes-connectivity/lora/lora-network-server/lora-network-server.init b/recipes-connectivity/lora/lora-network-server/lora-network-server.init
index 032a0f7..dec846f 100755
--- a/recipes-connectivity/lora/lora-network-server/lora-network-server.init
+++ b/recipes-connectivity/lora/lora-network-server/lora-network-server.init
@@ -12,7 +12,6 @@ ENABLED="yes"
 run_dir=/var/run/lora
 conf_dir=/var/config/lora
 conf_file=$conf_dir/lora-network-server.conf
-conf_db=$conf_dir/lora-network-server.db
 
 
 net_server=/opt/lora/lora-network-server
@@ -119,7 +118,7 @@ do_start() {
      start-stop-daemon --start --background --make-pidfile \
         --pidfile $net_server_pidfile --startas /bin/bash -- -c "exec $net_server \
         -c $conf_file --lora-eui $lora_eui --lora-prod-1 $lora_id --lora-hw-1 $lora_hw \
-        --lora-path $run_dir --db $conf_db \
+        --lora-path $run_dir \
         --noconsole -l $net_server_log  >> $net_server_log 2>&1"
     sleep 2
     # start packet forwarder
diff --git a/recipes-connectivity/lora/lora-network-server_2.0.13.bb b/recipes-connectivity/lora/lora-network-server_2.0.13.bb
new file mode 100644
index 0000000..2fc1f38
--- /dev/null
+++ b/recipes-connectivity/lora/lora-network-server_2.0.13.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "MultiTech LoRa Network Server"
+PRIORITY = "optional"
+SECTION = "console/utils"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ae2ad602b723a163cd33ca5ee991fbcd"
+DEPENDS = "jsoncpp libmts mosquitto sqlite3"
+RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash"
+PR = "r2"
+CONFFILES_${PN} += "${sysconfdir}/default/lora-network-server ${sysconfdir}/init.d/lora-network-server"
+
+SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \
+           file://lora-network-server.init \
+           file://lora-network-server.default \
+           file://lora-network-server.logrotate.conf \
+          "
+
+SRC_URI[md5sum] = "3c9c62d0e721a4b588d602cc36052798"
+SRC_URI[sha256sum] = "3499b14fc84c241401cf13089298192e1e3c4df2b977381f823b4aa82263b781"
+
+# binaries are already stripped, so suppress warning
+INSANE_SKIP_${PN} = "already-stripped"
+
+S = "${WORKDIR}"
+
+LORA_DIR = "/opt/lora"
+
+do_compile() {
+}
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "lora-network-server"
+INITSCRIPT_PARAMS = "defaults 80 30"
+
+do_install() {
+    install -d ${D}${LORA_DIR}
+    install -m 0755 lora-network-server-mlinux-3 ${D}${LORA_DIR}/lora-network-server
+    install -m 0644 config/lora-network-server.conf.sample ${D}${LORA_DIR}/lora-network-server.conf.sample
+    install -m 0644 config/lora-network-server.conf.full ${D}${LORA_DIR}/lora-network-server.conf.full
+
+    install -d ${D}${sysconfdir}/default
+    install -m 0644 ${WORKDIR}/lora-network-server.default ${D}${sysconfdir}/default/lora-network-server
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/lora-network-server.init ${D}${sysconfdir}/init.d/lora-network-server
+    install -d ${D}${sysconfdir}/logrotate.d
+    install -m 0644 ${WORKDIR}/lora-network-server.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-network-server.conf
+}
+
+FILES_${PN} += "${LORA_DIR}"
+FILES_${PN}-dbg += "${LORA_DIR}/.debug"
diff --git a/recipes-connectivity/lora/lora-network-server_2.0.9.bb b/recipes-connectivity/lora/lora-network-server_2.0.9.bb
deleted file mode 100644
index ca2eea8..0000000
--- a/recipes-connectivity/lora/lora-network-server_2.0.9.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION = "MultiTech LoRa Network Server"
-PRIORITY = "optional"
-SECTION = "console/utils"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ae2ad602b723a163cd33ca5ee991fbcd"
-DEPENDS = "jsoncpp libmts mosquitto sqlite3"
-RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash"
-PR = "r2"
-CONFFILES_${PN} += "${sysconfdir}/default/lora-network-server ${sysconfdir}/init.d/lora-network-server"
-
-SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \
-           file://lora-network-server.init \
-           file://lora-network-server.default \
-           file://lora-network-server.logrotate.conf \
-          "
-
-SRC_URI[md5sum] = "1ff17152fec87a38d21edf6f0a037deb"
-SRC_URI[sha256sum] = "ba21d1afab6882341abf245d899631a6ba752fbd055a731f9cc195796b2f4e48"
-
-# binaries are already stripped, so suppress warning
-INSANE_SKIP_${PN} = "already-stripped"
-
-S = "${WORKDIR}"
-
-LORA_DIR = "/opt/lora"
-
-do_compile() {
-}
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "lora-network-server"
-INITSCRIPT_PARAMS = "defaults 80 30"
-
-do_install() {
-    install -d ${D}${LORA_DIR}
-    install -m 0755 lora-network-server-mlinux-3 ${D}${LORA_DIR}/lora-network-server
-    install -m 0644 config/lora-network-server.conf.sample ${D}${LORA_DIR}/lora-network-server.conf.sample
-    install -m 0644 config/lora-network-server.conf.full ${D}${LORA_DIR}/lora-network-server.conf.full
-
-    install -d ${D}${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/lora-network-server.default ${D}${sysconfdir}/default/lora-network-server
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/lora-network-server.init ${D}${sysconfdir}/init.d/lora-network-server
-    install -d ${D}${sysconfdir}/logrotate.d
-    install -m 0644 ${WORKDIR}/lora-network-server.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-network-server.conf
-}
-
-FILES_${PN} += "${LORA_DIR}"
-FILES_${PN}-dbg += "${LORA_DIR}/.debug"
-- 
cgit v1.2.3