Merge branch 'master' of gitlab.multitech.net:mirrors/meta-mlinux into Conduit_0.1

8 files changed, 54 insertions, 5 deletions

diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend
index 461f869..f1ab005 100644
--- a/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,4 +1,7 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
 
+media_card="/media/card"
+media_card_mtp=""
+
 # add SD card dir
-dirs755_append = " /media/card"
+dirs755_append = " ${media_card}"
diff --git a/recipes-core/images/mlinux-picocell-debug-image.bb b/recipes-core/images/mlinux-picocell-debug-image.bb
new file mode 100644
index 0000000..9ae7ea7
--- /dev/null
+++ b/recipes-core/images/mlinux-picocell-debug-image.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "mLinux PicoCell debug image"
+
+require mlinux-picocell-image.bb
+
+# Extra stuff to install
+IMAGE_INSTALL += "lora-network-server-mtp \
+                  lora-gateway-utils \
+                  lora-query \
+                  mosquitto mosquitto-clients"
+
diff --git a/recipes-core/images/mlinux-picocell-image.bb b/recipes-core/images/mlinux-picocell-image.bb
index d839260..49670a9 100644
--- a/recipes-core/images/mlinux-picocell-image.bb
+++ b/recipes-core/images/mlinux-picocell-image.bb
@@ -35,7 +35,8 @@ MULTITECH_FEATURES += " \
                  "
 
 LORA_FEATURES = "lora-packet-forwarder \
-                 lora-packet-forwarder-dbg"
+                 lora-packet-forwarder-dbg \
+                 lora-gateway-utils"
 
 MISC_FEATURES = "minicom lrzsz nano"
 
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts-1.0/mlinux-set-apn b/recipes-core/mlinux-scripts/mlinux-scripts-1.0/mlinux-set-apn
index 65e01b8..85839f8 100755
--- a/recipes-core/mlinux-scripts/mlinux-scripts-1.0/mlinux-set-apn
+++ b/recipes-core/mlinux-scripts/mlinux-scripts-1.0/mlinux-set-apn
@@ -28,15 +28,17 @@ fi
 apn=$1
 gsm_chat_file=/etc/ppp/peers/gsm_chat
 lvw2_chat_file=/etc/ppp/peers/lvw2_chat
+leu1_chat_file=/etc/ppp/peers/leu1_chat
 
 sed -r -i "s/^OK\s+'AT\+CGDCONT=1,\"IP\",\"[^\"]*\"'$/OK 'AT\+CGDCONT=1,\"IP\",\"${apn}\"'/" $gsm_chat_file
 sed -r -i "s/^OK\s+'AT\+CGDCONT=3,\"IPV4V6\",\"[^\"]*\"'$/OK 'AT\+CGDCONT=3,\"IPV4V6\",\"${apn}\"'/" $lvw2_chat_file
+sed -r -i "s/^OK\s+'AT\+CGDCONT=1,\"IPV4V6\",\"[^\"]*\"'$/OK 'AT\+CGDCONT=1,\"IPV4V6\",\"${apn}\"'/" $leu1_chat_file
 
 if [[ $? != 0 ]]; then
 	echo "Failed to change APN"
 	exit 1
 else
-	echo "Set APN to \"${apn}\" in $gsm_chat_file and $lvw2_chat_file"
+	echo "Set APN to \"${apn}\" in $gsm_chat_file, $lvw2_chat_file and $leu1_chat_file"
 fi
 
 exit 0
diff --git a/recipes-core/mlinux-scripts/mlinux-scripts_1.0.bb b/recipes-core/mlinux-scripts/mlinux-scripts_1.0.bb
index efa8635..6b0d37f 100644
--- a/recipes-core/mlinux-scripts/mlinux-scripts_1.0.bb
+++ b/recipes-core/mlinux-scripts/mlinux-scripts_1.0.bb
@@ -2,6 +2,6 @@ DESCRIPTION = "Scripts to easily get started with common mLinux use cases"
 
 require mlinux-scripts-1.0.inc
 
-PR = "r3"
+PR = "r4"
 
 S = "${WORKDIR}/mlinux-scripts-${PV}"
diff --git a/recipes-core/multitech/config/ppp/peers/leu1 b/recipes-core/multitech/config/ppp/peers/leu1
new file mode 100644
index 0000000..993b33a
--- /dev/null
+++ b/recipes-core/multitech/config/ppp/peers/leu1
@@ -0,0 +1,11 @@
+linkname ppp0
+230400
+defaultroute
+replacedefaultroute
+usepeerdns
+ipcp-max-failure 10
+ipcp-restart 10
+noauth
+crtscts
+novj
+connect '/usr/sbin/chat -v -t 90 -f /etc/ppp/peers/leu1_chat'
diff --git a/recipes-core/multitech/config/ppp/peers/leu1_chat b/recipes-core/multitech/config/ppp/peers/leu1_chat
new file mode 100644
index 0000000..6f84008
--- /dev/null
+++ b/recipes-core/multitech/config/ppp/peers/leu1_chat
@@ -0,0 +1,22 @@
+SAY "LEU1 chat\n"
+ECHO OFF
+ABORT 'NO DIAL TONE'
+ABORT 'NO DIALTONE'
+ABORT 'NO ANSWER'
+ABORT 'NO CARRIER'
+ABORT 'DELAYED'
+ABORT 'VOICE'
+ABORT 'BUSY'
+'' 'AT'
+OK 'ATZ'
+OK 'AT+CSQ'
+# ----------------------------------
+# Set the APN for your provider here
+# ----------------------------------
+OK 'AT+CGDCONT=1,"IPV4V6","internet"'
+SAY "Dialing...\n"
+OK 'ATD*99***1#'
+SAY "Waiting for CONNECT...\n"
+TIMEOUT 120
+CONNECT ''
+SAY "Connected\n"
diff --git a/recipes-core/multitech/config_1.0.bb b/recipes-core/multitech/config_1.0.bb
index ed93e64..383baed 100644
--- a/recipes-core/multitech/config_1.0.bb
+++ b/recipes-core/multitech/config_1.0.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 = "r4"
+PR = "r5"
 
 inherit update-rc.d