diff options
author | Mykyta Dorokhin <mykyta.dorokhin@globallogic.com> | 2020-02-25 11:50:46 +0200 |
---|---|---|
committer | Serhii Kostiuk <serhii.o.kostiuk@globallogic.com> | 2020-05-21 10:41:36 +0300 |
commit | 0eb641251e9b5e55da1728654f0938f329fa13dc (patch) | |
tree | aab48fa61626c5c08a330c3b15097d8b2a257814 | |
parent | 19ca401463153a7694a320f543852412d74cbd8f (diff) | |
parent | 6b45bc036080f4950d7e0b46a426667d68acda4a (diff) | |
download | meta-mlinux-0eb641251e9b5e55da1728654f0938f329fa13dc.tar.gz meta-mlinux-0eb641251e9b5e55da1728654f0938f329fa13dc.tar.bz2 meta-mlinux-0eb641251e9b5e55da1728654f0938f329fa13dc.zip |
mpower-dev-thud: sync up with master
-rw-r--r-- | recipes-connectivity/lora/lora-logging.bb | 2 | ||||
-rw-r--r-- | recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf | 1 | ||||
-rwxr-xr-x | recipes-connectivity/lora/lora-network-server/lora-network-server.init | 4 | ||||
-rw-r--r-- | recipes-connectivity/lora/lora-network-server_2.3.8.bb (renamed from recipes-connectivity/lora/lora-network-server_2.3.3.bb) | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/recipes-connectivity/lora/lora-logging.bb b/recipes-connectivity/lora/lora-logging.bb index 752b63b..4691458 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 = "r3" +PR = "r4" RDEPENDS_${PN} += "logrotate bash" SRC_URI = "file://lora-logging.logrotate.conf \ diff --git a/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf b/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf index 5f26561..6fc191c 100644 --- a/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf +++ b/recipes-connectivity/lora/lora-logging/lora-logging.logrotate.conf @@ -6,7 +6,6 @@ missingok postrotate set -e; - /usr/bin/killall -HUP lora_pkt_fwd || true; /usr/bin/killall -HUP lora-network-server || true; 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 88ea271..e226669 100755 --- a/recipes-connectivity/lora/lora-network-server/lora-network-server.init +++ b/recipes-connectivity/lora/lora-network-server/lora-network-server.init @@ -208,12 +208,12 @@ do_start() { sleep 2 /usr/sbin/start-stop-daemon --chdir $run_dir/1 --start --background --make-pidfile \ --pidfile $pkt_fwd_pidfile --startas /bin/bash \ - -- -c "exec $angel $pkt_fwd $pkt_fwd_options 2>&1 >> $pkt_fwd_log" + -- -c "exec $angel $pkt_fwd $pkt_fwd_options 2>&1" if [ "$dual_cards_installed" == "true" ]; then /usr/sbin/start-stop-daemon --chdir $run_dir/2 --start --background --make-pidfile \ --pidfile $pkt_fwd_2_pidfile --startas /bin/bash \ - -- -c "exec $angel $pkt_fwd_2 $pkt_fwd_options 2>&1 >> $pkt_fwd_2_log" + -- -c "exec $angel $pkt_fwd_2 $pkt_fwd_options 2>&1" fi fi diff --git a/recipes-connectivity/lora/lora-network-server_2.3.3.bb b/recipes-connectivity/lora/lora-network-server_2.3.8.bb index 8b75ea6..61d87cf 100644 --- a/recipes-connectivity/lora/lora-network-server_2.3.3.bb +++ b/recipes-connectivity/lora/lora-network-server_2.3.8.bb @@ -13,8 +13,8 @@ SRC_URI = "http://multitech.net/downloads/lora-network-server_${PV}.tar.gz \ file://lora-network-server.default \ " -SRC_URI[md5sum] = "b0bc859e1f60b1a92b06c4bb97f70109" -SRC_URI[sha256sum] = "f8ba944a024531dbf58f2de462cb7ccfb5e3cb8d8dedb51077e7719f32f9adc4" +SRC_URI[md5sum] = "9e3c8e9fb1cbe3352758bd2ac197cacc" +SRC_URI[sha256sum] = "a9430ee966d28b24d3a9108a1111fce67c32fb088e92830414f82721cab1913b" # binaries are already stripped, so suppress warning INSANE_SKIP_${PN} = "already-stripped" |