6 files changed, 13 insertions, 43 deletions
diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb
index 422d1a8..33d93c6 100644
--- a/recipes-core/images/mlinux-factory-image.bb
+++ b/recipes-core/images/mlinux-factory-image.bb
@@ -22,7 +22,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"
+IMAGE_INSTALL += "lora-gateway-utils lora-network-server lora-query lora-packet-forwarder-usb lora-gateway-geolocation-utils lora-packet-forwarder-geolocation"
 
 # MQTT server
 #IMAGE_INSTALL += "mosquitto"
diff --git a/recipes-core/images/mlinux-minimal-image.bb b/recipes-core/images/mlinux-minimal-image.bb
index f715445..a4eb6c2 100644
--- a/recipes-core/images/mlinux-minimal-image.bb
+++ b/recipes-core/images/mlinux-minimal-image.bb
@@ -35,8 +35,10 @@ NETWORKING_FEATURES = "ppp curl iproute2 \
 #         files survive flashing of rootfs. See recipe for details.
 #
 # set-rs485: enables RS485 half-duplex mode for a given tty device
+#
+# mtcap does not need mts-io-util, but it is required for LoRa 2.1 images
 
-MULTITECH_FEATURES = "mts-io config mts-id-eeprom set-rs485"
+MULTITECH_FEATURES = "kernel-module-mts-io mts-io-noarch  mts-io-util config mts-id-eeprom set-rs485"
 
 UPGRADE_FEATURES = "upgrade-reboot mtd-utils-static"
 
diff --git a/recipes-core/multitech/config/ppp/peers/lna3_chat_vz b/recipes-core/multitech/config/ppp/peers/lna3_chat_vz
index 58a5b30..1d2178d 100644
--- a/recipes-core/multitech/config/ppp/peers/lna3_chat_vz
+++ b/recipes-core/multitech/config/ppp/peers/lna3_chat_vz
@@ -32,6 +32,10 @@ OK 'AT+CSQ'
 # And to switch to AT&T (non-Verizon):
 # mlinux-switch-cell-fw 0
 # -----------------------------------------
+# Log APN (current context) for
+# diagnostic purposes
+#-----------------------------------
+OK 'AT+CGDCONT?'
 SAY "Dialing...\n"
 OK 'ATD*99***3#'
 SAY "Waiting for CONNECT...\n"
diff --git a/recipes-core/multitech/config/ppp/peers/lvw2_chat b/recipes-core/multitech/config/ppp/peers/lvw2_chat
index 5be458e..c7aede7 100644
--- a/recipes-core/multitech/config/ppp/peers/lvw2_chat
+++ b/recipes-core/multitech/config/ppp/peers/lvw2_chat
@@ -15,6 +15,10 @@ OK 'AT+CSQ'
 # It must be loaded dynamically
 # from the network.
 # ----------------------------------
+# Log APN (current context) for
+# diagnostic purposes
+#-----------------------------------
+OK 'AT+CGDCONT?'
 SAY "Dialing...\n"
 OK 'ATD*99***3#'
 SAY "Waiting for CONNECT...\n"
diff --git a/recipes-core/multitech/config_1.0.bb b/recipes-core/multitech/config_1.0.bb
deleted file mode 100644
index cf86b4b..0000000
--- a/recipes-core/multitech/config_1.0.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "Provides default system config files and /var/config fs"
-SECTION = "base"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-PR = "r6"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "config"
-INITSCRIPT_PARAMS = "start 31 S ."
-
-SRC_URI = "\
-  file://network \
-  file://ppp \
-  file://config.init \
-"
-
-CONFIGFILES = "network ppp"
-
-fakeroot do_install () {
-    cd ${WORKDIR}
-
-    # default config files
-    rm -f defaults.tar.gz
-    chown root:root -R ${CONFIGFILES}
-    tar czf defaults.tar.gz ${CONFIGFILES}
-    install -d ${D}${sysconfdir}
-    install -m 0644 ${WORKDIR}/defaults.tar.gz ${D}${sysconfdir}/defaults.tar.gz
-
-    # save root password for resetting to defaults
-    echo -n '${MTADM_PASSWORD_HASH}' > ${D}${sysconfdir}/default_pass
-    chmod 400 ${D}${sysconfdir}/default_pass
-
-    # init script
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/config.init ${D}${sysconfdir}/init.d/config
-}
-
-FILES_${PN} = "${sysconfdir}/defaults.tar.gz ${sysconfdir}/default_pass"
-FILES_${PN} += "${sysconfdir}/init.d/config"
diff --git a/recipes-core/multitech/config_2.1.bb b/recipes-core/multitech/config_2.1.bb
index c49f06a..a7dbed7 100644
--- a/recipes-core/multitech/config_2.1.bb
+++ b/recipes-core/multitech/config_2.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Provides default system config files and /var/config fs"
 SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-PR = "r1"
+PR = "r2"
 
 inherit update-rc.d