From 59655cc5f8ed4c95edd8ce46208f429188eb0852 Mon Sep 17 00:00:00 2001 From: Jason Reiss Date: Mon, 5 Nov 2018 13:54:57 -0600 Subject: add mtac-xdot-util package --- recipes-core/images/mlinux-factory-image.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb index 55fbc37..b9930d5 100644 --- a/recipes-core/images/mlinux-factory-image.bb +++ b/recipes-core/images/mlinux-factory-image.bb @@ -26,7 +26,7 @@ IMAGE_INSTALL += "autossh" IMAGE_INSTALL += "monit" # LoRa support (MTAC-LORA accessory card) -IMAGE_INSTALL += "lora-gateway-utils lora-network-server lora-query lora-packet-forwarder-usb lora-gateway-geolocation-utils lora-packet-forwarder-geolocation" +IMAGE_INSTALL += "lora-gateway-utils lora-network-server lora-query lora-packet-forwarder-usb lora-gateway-geolocation-utils lora-packet-forwarder-geolocation mtac-xdot-util" # MQTT server #IMAGE_INSTALL += "mosquitto" -- cgit v1.2.3 From f74209ba18fc80288ab07b7bc8be9431dfad60ee Mon Sep 17 00:00:00 2001 From: Jason Reiss Date: Tue, 6 Nov 2018 14:23:38 -0600 Subject: lora: turn-off default packet forwarder logging, does not work with logrotate --- recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf | 3 +++ recipes-connectivity/lora/lora-network-server/lora-network-server.init | 2 +- .../lora/lora-packet-forwarder/lora-packet-forwarder.init | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf b/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf index 01a1cc0..f425c00 100644 --- a/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf +++ b/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf @@ -4,4 +4,7 @@ compress copytruncate missingok + postrotate + killall -SIGHUP lora-network-server + endscript } 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 2009fd8..a55be0b 100755 --- a/recipes-connectivity/lora/lora-network-server/lora-network-server.init +++ b/recipes-connectivity/lora/lora-network-server/lora-network-server.init @@ -125,7 +125,7 @@ do_start() { # start packet forwarder /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \ - --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd &>$pkt_fwd_log" + --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd " renice -n -20 -p $(pgrep lora-network-se) renice -n -20 -p $(pgrep $(basename $pkt_fwd)) diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init index 4780da6..99463f6 100755 --- a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init +++ b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init @@ -195,7 +195,7 @@ do_start() { echo -n "Starting $NAME: " /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \ - --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd $pkt_fwd_options &>$pkt_fwd_log" + --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd $pkt_fwd_options" renice -n -20 -p $(pgrep $(basename $pkt_fwd)) -- cgit v1.2.3 From 0ad2309f349bbf7b989527faa319499778d77160 Mon Sep 17 00:00:00 2001 From: John Klug Date: Tue, 6 Nov 2018 17:48:22 -0600 Subject: Bump packet forwarder revision (beacon) --- recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb b/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb index c7644a9..9e0a5f8 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb +++ b/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb @@ -7,7 +7,7 @@ LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45" DEPENDS = "lora-gateway logrotate lora-logging" RDEPENDS_${PN} += "bash" -PR = "r13" +PR = "r14" SRCREV = "v${PV}" -- cgit v1.2.3 From ddafc891dcbf3327ed78c90659405c12e8c2c9ff Mon Sep 17 00:00:00 2001 From: John Klug Date: Tue, 6 Nov 2018 17:53:10 -0600 Subject: LoRa Logging changes (bump revision) --- recipes-connectivity/lora/lora-logging.bb | 2 +- recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-connectivity/lora/lora-logging.bb b/recipes-connectivity/lora/lora-logging.bb index 67b4099..201c0cc 100644 --- a/recipes-connectivity/lora/lora-logging.bb +++ b/recipes-connectivity/lora/lora-logging.bb @@ -4,7 +4,7 @@ SECTION = "console/utils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" DEPENDS = "" -PR = "r1" +PR = "r2" RDEPENDS_${PN} += "logrotate bash" SRC_URI = "file://lora-logging.logrotate.conf \ diff --git a/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb b/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb index 9e0a5f8..e3f59ef 100644 --- a/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb +++ b/recipes-connectivity/lora/lora-packet-forwarder_4.0.1.bb @@ -7,7 +7,7 @@ LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45" DEPENDS = "lora-gateway logrotate lora-logging" RDEPENDS_${PN} += "bash" -PR = "r14" +PR = "r15" SRCREV = "v${PV}" -- cgit v1.2.3 From 71111fd59d80abc8f7bcd81c8879e05fb1b8f72b Mon Sep 17 00:00:00 2001 From: John Klug Date: Tue, 6 Nov 2018 18:01:03 -0600 Subject: Split scripts from objects from kernel modules for possible updates --- recipes-core/images/mlinux-rs9113-base-image.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-core/images/mlinux-rs9113-base-image.bb b/recipes-core/images/mlinux-rs9113-base-image.bb index 8aab186..7890e04 100644 --- a/recipes-core/images/mlinux-rs9113-base-image.bb +++ b/recipes-core/images/mlinux-rs9113-base-image.bb @@ -2,4 +2,4 @@ require mlinux-base-image.bb DESCRIPTION = "mLinux base image with rs9113 drivers" # Extra stuff to install -IMAGE_INSTALL += " rs9113 " +IMAGE_INSTALL += "kernel-module-rs9113 rs9113-noarch rs9113-util" -- cgit v1.2.3 From 168786331f7512dad56c6a755295a3f4624a7fbb Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 7 Nov 2018 10:34:15 -0600 Subject: Bump the level to 4.1.0 for Sprint/XDOT/PULSE release --- conf/distro/mlinux.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf index 38288aa..33238b9 100644 --- a/conf/distro/mlinux.conf +++ b/conf/distro/mlinux.conf @@ -1,7 +1,7 @@ DISTRO = "mlinux" DISTRO_NAME = "mLinux" -DISTRO_BASE_VERSION = "4.0" -DISTRO_VERSION = "${DISTRO_BASE_VERSION}.5" +DISTRO_BASE_VERSION = "4.1" +DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0" DISTRO_CODENAME = "" SDK_VENDOR = "-mlinux" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" -- cgit v1.2.3