From 5220405fcd3cf5a105014ec585d1a9d610187308 Mon Sep 17 00:00:00 2001 From: Jason Reiss Date: Fri, 30 Oct 2015 09:31:11 -0500 Subject: lora: update lora-network-server to 0.0.9 --- .../lora-network-server/lora-network-server.init | 10 ++--- .../lora/lora-network-server_0.0.8.bb | 49 ---------------------- .../lora/lora-network-server_0.0.9.bb | 49 ++++++++++++++++++++++ 3 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 recipes-connectivity/lora/lora-network-server_0.0.8.bb create mode 100644 recipes-connectivity/lora/lora-network-server_0.0.9.bb 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 099da38..0262aba 100755 --- a/recipes-connectivity/lora/lora-network-server/lora-network-server.init +++ b/recipes-connectivity/lora/lora-network-server/lora-network-server.init @@ -15,8 +15,8 @@ net_server_log=/var/log/lora-network-server.log net_server_pidfile=$run_dir/$NAME.pid pkt_fwd=/opt/lora/basic_pkt_fwd -pkt_fwd_log=/var/log/lora-pkt-fwd.log -pkt_fwd_pidfile=$run_dir/lora-pkt-fwd.pid +pkt_fwd_log=/var/log/lora-pkt-fwd-1.log +pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid lora_us_id="MTAC-LORA-915" lora_eu_id="MTAC-LORA-868" @@ -52,17 +52,17 @@ do_start() { fi echo -n "Starting $NAME: " - mkdir -p $run_dir + mkdir -p $run_dir/1 # start network server start-stop-daemon --start --background --make-pidfile \ --pidfile $net_server_pidfile --exec $net_server -- \ -c $conf_file --lora-eui $lora_eui --lora-path $run_dir --db $conf_db \ --noconsole -l $net_server_log - sleep 1 + sleep 2 # start packet forwarder start-stop-daemon --start --background --make-pidfile \ --pidfile $pkt_fwd_pidfile --exec $pkt_fwd -- \ - -c $run_dir -l $pkt_fwd_log + -c $run_dir/1 -l $pkt_fwd_log echo "OK" } diff --git a/recipes-connectivity/lora/lora-network-server_0.0.8.bb b/recipes-connectivity/lora/lora-network-server_0.0.8.bb deleted file mode 100644 index d2f55e8..0000000 --- a/recipes-connectivity/lora/lora-network-server_0.0.8.bb +++ /dev/null @@ -1,49 +0,0 @@ -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 = "r0" - -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] = "8cb2686b427a32d53e301e87870b49cf" -SRC_URI[sha256sum] = "be7de4463f17645882ed6194d9af2bc9a4608005635c8d31d5c5ec8bf552c73f" - -# 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 ${D}${LORA_DIR}/ - install -m 0644 lora-network-server.conf.sample ${D}${LORA_DIR}/lora-network-server.conf.sample - - 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_0.0.9.bb b/recipes-connectivity/lora/lora-network-server_0.0.9.bb new file mode 100644 index 0000000..feb7904 --- /dev/null +++ b/recipes-connectivity/lora/lora-network-server_0.0.9.bb @@ -0,0 +1,49 @@ +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 = "r0" + +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] = "24d80fefcb44083be4432834de6c5b6c" +SRC_URI[sha256sum] = "3b290737b6cf38584d2c517dd4462cef9bea4cb729b64d0c9f133dc27bf51931" + +# 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 ${D}${LORA_DIR}/ + install -m 0644 lora-network-server.conf.sample ${D}${LORA_DIR}/lora-network-server.conf.sample + + 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" -- cgit v1.2.3