summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMykola Salomatin <mykola.salomatin@globallogic.com>2023-02-06 11:55:27 +0200
committerMykola Salomatin <mykola.salomatin@globallogic.com>2023-02-06 11:55:27 +0200
commitdea41e6ad307bb9498e50d35c5b17f3c98a8c5e1 (patch)
tree203852dc50299bd7a423a57eea8ede598a34bc8d
parent8b2c5033c01df17ce1bed9489570a5e56e3be862 (diff)
parent3aa3bbc2c5358ac44cee9aa96b8ca19f3377f52a (diff)
downloadmeta-mlinux-dea41e6ad307bb9498e50d35c5b17f3c98a8c5e1.tar.gz
meta-mlinux-dea41e6ad307bb9498e50d35c5b17f3c98a8c5e1.tar.bz2
meta-mlinux-dea41e6ad307bb9498e50d35c5b17f3c98a8c5e1.zip
Merge remote-tracking branch 'origin/6' into mpower-dev-l6g1
-rw-r--r--conf/distro/mlinux.conf2
-rw-r--r--recipes-connectivity/lora/lora-network-server_2.6.21.bb (renamed from recipes-connectivity/lora/lora-network-server_2.6.12.bb)4
-rw-r--r--recipes-core/multitech/commissioning_1.0.2.bb (renamed from recipes-core/multitech/commissioning_1.0.1.bb)0
3 files changed, 3 insertions, 3 deletions
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index a05b19b..27e97fc 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,7 +1,7 @@
DISTRO = "mlinux"
DISTRO_NAME = "mLinux"
DISTRO_BASE_VERSION = "6.3"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev2"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev3"
DISTRO_CODENAME = ""
SDK_VENDOR = "-mlinux"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
diff --git a/recipes-connectivity/lora/lora-network-server_2.6.12.bb b/recipes-connectivity/lora/lora-network-server_2.6.21.bb
index de3b950..c7d043b 100644
--- a/recipes-connectivity/lora/lora-network-server_2.6.12.bb
+++ b/recipes-connectivity/lora/lora-network-server_2.6.21.bb
@@ -13,8 +13,8 @@ SRC_URI = "https://multitech.net/downloads/lora-network-server_${PV}.tar.gz \
file://lora-network-server.default \
"
-SRC_URI[md5sum] = "279c3c52cd05d2894946c0a458d6a391"
-SRC_URI[sha256sum] = "19a2d07afbc580c7c202a29b68b969951929de8eea099fd9918c1435883bf82a"
+SRC_URI[md5sum] = "592fb4e735cb3926dad9f6c989399eb5"
+SRC_URI[sha256sum] = "715d477155acd76218d09236837ccf4cf83a4ef3981c079ce032ea05418fe7f6"
# binaries are already stripped, so suppress warning
INSANE_SKIP_${PN} = "already-stripped"
diff --git a/recipes-core/multitech/commissioning_1.0.1.bb b/recipes-core/multitech/commissioning_1.0.2.bb
index 6083cb1..6083cb1 100644
--- a/recipes-core/multitech/commissioning_1.0.1.bb
+++ b/recipes-core/multitech/commissioning_1.0.2.bb