From ab0a86fc76dfce860076de1af3483eca7f19c810 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 30 Jan 2023 14:10:30 -0600
Subject: Bump LNS to 2.6.21

---
 .../lora/lora-network-server_2.6.12.bb             | 48 ----------------------
 .../lora/lora-network-server_2.6.21.bb             | 48 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 recipes-connectivity/lora/lora-network-server_2.6.12.bb
 create mode 100644 recipes-connectivity/lora/lora-network-server_2.6.21.bb

diff --git a/recipes-connectivity/lora/lora-network-server_2.6.12.bb b/recipes-connectivity/lora/lora-network-server_2.6.12.bb
deleted file mode 100644
index de3b950..0000000
--- a/recipes-connectivity/lora/lora-network-server_2.6.12.bb
+++ /dev/null
@@ -1,48 +0,0 @@
-DESCRIPTION = "MultiTech LoRa Network Server"
-PRIORITY = "optional"
-SECTION = "console/utils"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2b9a30a3082ddccd2c695a4dbeeab80d"
-DEPENDS = "jsoncpp libmts mosquitto sqlite3 curl gnutls"
-RDEPENDS_${PN} += "logrotate bash lora-logging jsoncpp"
-PR = "r0"
-CONFFILES_${PN} += "${sysconfdir}/default/lora-network-server ${sysconfdir}/init.d/lora-network-server"
-
-SRC_URI = "https://multitech.net/downloads/lora-network-server_${PV}.tar.gz \
-           file://lora-network-server.init \
-           file://lora-network-server.default \
-          "
-
-SRC_URI[md5sum] = "279c3c52cd05d2894946c0a458d6a391"
-SRC_URI[sha256sum] = "19a2d07afbc580c7c202a29b68b969951929de8eea099fd9918c1435883bf82a"
-
-# 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-arm926ejste-mlinux-6 ${D}${LORA_DIR}/lora-network-server
-    install -m 0755 lora-v21-keygen-arm926ejste-mlinux-6 ${D}${LORA_DIR}/lora-v21-keygen
-    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
-}
-
-FILES_${PN} += "${LORA_DIR}"
-FILES_${PN}-dbg += "${LORA_DIR}/.debug"
diff --git a/recipes-connectivity/lora/lora-network-server_2.6.21.bb b/recipes-connectivity/lora/lora-network-server_2.6.21.bb
new file mode 100644
index 0000000..de3b950
--- /dev/null
+++ b/recipes-connectivity/lora/lora-network-server_2.6.21.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "MultiTech LoRa Network Server"
+PRIORITY = "optional"
+SECTION = "console/utils"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=2b9a30a3082ddccd2c695a4dbeeab80d"
+DEPENDS = "jsoncpp libmts mosquitto sqlite3 curl gnutls"
+RDEPENDS_${PN} += "logrotate bash lora-logging jsoncpp"
+PR = "r0"
+CONFFILES_${PN} += "${sysconfdir}/default/lora-network-server ${sysconfdir}/init.d/lora-network-server"
+
+SRC_URI = "https://multitech.net/downloads/lora-network-server_${PV}.tar.gz \
+           file://lora-network-server.init \
+           file://lora-network-server.default \
+          "
+
+SRC_URI[md5sum] = "279c3c52cd05d2894946c0a458d6a391"
+SRC_URI[sha256sum] = "19a2d07afbc580c7c202a29b68b969951929de8eea099fd9918c1435883bf82a"
+
+# 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-arm926ejste-mlinux-6 ${D}${LORA_DIR}/lora-network-server
+    install -m 0755 lora-v21-keygen-arm926ejste-mlinux-6 ${D}${LORA_DIR}/lora-v21-keygen
+    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
+}
+
+FILES_${PN} += "${LORA_DIR}"
+FILES_${PN}-dbg += "${LORA_DIR}/.debug"
-- 
cgit v1.2.3


From b2cb0defdda09c4ea0ae4d5e6ecf9055cef4d07c Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 30 Jan 2023 15:11:38 -0600
Subject: Fix LoRa checksums

---
 recipes-connectivity/lora/lora-network-server_2.6.21.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-connectivity/lora/lora-network-server_2.6.21.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.21.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"
-- 
cgit v1.2.3


From 184d6ca477d677c82add38a2c49322fbf0908610 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 2 Feb 2023 13:28:52 -0600
Subject: Print mts-ubpasswd errors if all else is clean

---
 recipes-core/multitech/commissioning_1.0.1.bb | 44 ---------------------------
 recipes-core/multitech/commissioning_1.0.2.bb | 44 +++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 recipes-core/multitech/commissioning_1.0.1.bb
 create mode 100644 recipes-core/multitech/commissioning_1.0.2.bb

diff --git a/recipes-core/multitech/commissioning_1.0.1.bb b/recipes-core/multitech/commissioning_1.0.1.bb
deleted file mode 100644
index 6083cb1..0000000
--- a/recipes-core/multitech/commissioning_1.0.1.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-inherit update-rc.d
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=593c81e8a2bd8b4c4e310d8792372b13"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS = "fcgi jsoncpp16 shadow"
-RDEPENDS_${PN} += "jsoncpp16 lighttpd lighttpd-module-fastcgi lighttpd-module-openssl lighttpd-module-redirect bash openssl-bin"
-RDEPENDS_${PN}-php-fpm += "php-fpm ${PN}"
-PACKAGES =+ "${PN}-php-fpm"
-
-INITSCRIPT_PACKAGES = "${PN} ${PN}-php-fpm"
-INITSCRIPT_NAME_${PN} = "commission "
-INITSCRIPT_PARAMS_${PN} = "start 09 2 3 4 5 ."
-INITSCRIPT_NAME_${PN}-php-fpm = "commission-php-fpm"
-INITSCRIPT_PARAMS_${PN}-php-fpm = "start 09 2 3 4 5 ."
-
-PR = "r2"
-SRCREV = "${PV}"
-
-FILES_${PN}-php-fpm = "/etc/init.d/commission-php-fpm"
-FILES_${PN} += "/www/"
-
-SRC_URI = "git://git.multitech.net/cgit/commissioning.git;protocol=https;branch=master"
-
-S = "${WORKDIR}/git"
-do_compile() {
-    oe_runmake all
-}
-do_install() {
-
-    cp -a ${S}/${sysconfdir}/ ${D}/
-    cp -a ${S}/www/ ${D}/
-    cp -a ${S}/${prefix} ${D}/
-    cp -a ${S}/usr/ ${D}/
-    chmod 755 ${D}/usr/bin/*
-    chmod 755 ${D}/etc/init.d/*
-    chmod 755 ${D}/${libexecdir}/commission/*
-    chown -R root:root ${D}/
-
-    oe_runmake install DESTDIR=${D}
-    chmod 755 ${D}/usr/bin/commissioning.fcgi
-}
diff --git a/recipes-core/multitech/commissioning_1.0.2.bb b/recipes-core/multitech/commissioning_1.0.2.bb
new file mode 100644
index 0000000..6083cb1
--- /dev/null
+++ b/recipes-core/multitech/commissioning_1.0.2.bb
@@ -0,0 +1,44 @@
+inherit update-rc.d
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=593c81e8a2bd8b4c4e310d8792372b13"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+DEPENDS = "fcgi jsoncpp16 shadow"
+RDEPENDS_${PN} += "jsoncpp16 lighttpd lighttpd-module-fastcgi lighttpd-module-openssl lighttpd-module-redirect bash openssl-bin"
+RDEPENDS_${PN}-php-fpm += "php-fpm ${PN}"
+PACKAGES =+ "${PN}-php-fpm"
+
+INITSCRIPT_PACKAGES = "${PN} ${PN}-php-fpm"
+INITSCRIPT_NAME_${PN} = "commission "
+INITSCRIPT_PARAMS_${PN} = "start 09 2 3 4 5 ."
+INITSCRIPT_NAME_${PN}-php-fpm = "commission-php-fpm"
+INITSCRIPT_PARAMS_${PN}-php-fpm = "start 09 2 3 4 5 ."
+
+PR = "r2"
+SRCREV = "${PV}"
+
+FILES_${PN}-php-fpm = "/etc/init.d/commission-php-fpm"
+FILES_${PN} += "/www/"
+
+SRC_URI = "git://git.multitech.net/cgit/commissioning.git;protocol=https;branch=master"
+
+S = "${WORKDIR}/git"
+do_compile() {
+    oe_runmake all
+}
+do_install() {
+
+    cp -a ${S}/${sysconfdir}/ ${D}/
+    cp -a ${S}/www/ ${D}/
+    cp -a ${S}/${prefix} ${D}/
+    cp -a ${S}/usr/ ${D}/
+    chmod 755 ${D}/usr/bin/*
+    chmod 755 ${D}/etc/init.d/*
+    chmod 755 ${D}/${libexecdir}/commission/*
+    chown -R root:root ${D}/
+
+    oe_runmake install DESTDIR=${D}
+    chmod 755 ${D}/usr/bin/commissioning.fcgi
+}
-- 
cgit v1.2.3


From 3aa3bbc2c5358ac44cee9aa96b8ca19f3377f52a Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 2 Feb 2023 14:16:29 -0600
Subject: Bump mLinux version for u-boot/rs9113 change

---
 conf/distro/mlinux.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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')}"
-- 
cgit v1.2.3