From 14bf87bc4cf2c389c624ffdb1a6d09c24e3ab9d0 Mon Sep 17 00:00:00 2001
From: Jeff Hatch <jhatch@multitech.com>
Date: Mon, 13 Feb 2017 14:34:48 -0600
Subject: Initial commit of Yocto 2.1 changes

---
 conf/distro/mlinux.conf                            |   2 +-
 .../hostapd/hostap-daemon_1.0.bbappend             |   8 --
 recipes-connectivity/openssh/openssh_%.bbappend    |  21 ++++
 .../openssh/openssh_6.5p1.bbappend                 |  21 ----
 recipes-connectivity/openssl/openssl.inc           |   4 +-
 recipes-connectivity/ppp/ppp_2.4.7.bb              |   2 +-
 recipes-core/busybox/busybox_%.bbappend            |  10 ++
 recipes-core/busybox/busybox_1.22.1.bbappend       |  10 --
 recipes-core/images/mlinux-base-image.bb           |   2 +-
 recipes-core/mlinux/mlinux-version.bb              |  22 ----
 recipes-core/mlinux/mlinux-version.bb.orig         |  22 ++++
 .../udev/eudev-3.1.5/cellular_radios.rules         |  59 +++++++++
 recipes-core/udev/eudev-3.1.5/init                 | 138 +++++++++++++++++++++
 recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules    |   8 ++
 .../eudev-3.1.5/mtcdt/accessory_ethernet.rules     |  21 ++++
 recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules    |  14 +++
 recipes-core/udev/eudev-3.1.5/udev-cache.default   |   5 +
 recipes-core/udev/eudev_3.1.5.bbappend             |  20 +++
 recipes-core/udev/udev-182/cellular_radios.rules   |  69 -----------
 recipes-core/udev/udev-182/init                    | 138 ---------------------
 recipes-core/udev/udev-182/mtcap/mtcap.rules       |   8 --
 .../udev/udev-182/mtcdt/accessory_ethernet.rules   |  21 ----
 recipes-core/udev/udev-182/mtcdt/mtcdt.rules       |  14 ---
 recipes-core/udev/udev-182/udev-cache.default      |   5 -
 recipes-core/udev/udev-extraconf_%.bbappend        |   2 +
 recipes-core/udev/udev-extraconf_1.0.bbappend      |   2 -
 recipes-core/udev/udev_182.bbappend                |  20 ---
 recipes-extended/lighttpd/lighttpd_%.bbappend      |  21 ++++
 recipes-extended/lighttpd/lighttpd_1.4.33.bbappend |  21 ----
 recipes-extended/logrotate/logrotate_%.bbappend    |  15 +++
 .../logrotate/logrotate_3.8.7.bbappend             |  15 ---
 recipes-java/openjdk/openjdk-7/jvm.cfg             |  43 -------
 .../openjdk/openjdk-7_25b30-2.3.12.bbappend        |   6 -
 recipes-java/openjdk/openjdk-8/jvm.cfg             |  43 +++++++
 recipes-java/openjdk/openjdk-8_102b14.bbappend     |   6 +
 recipes-ruby/ruby/ruby_%.bbappend                  |   4 +
 recipes-ruby/ruby/ruby_1.9.3-p429.bbappend         |   4 -
 recipes-support/multitech/jsparser_0.3.bb          |   2 -
 recipes-support/ntp/ntp_%.bbappend                 |  30 +++++
 recipes-support/ntp/ntp_4.2.6p5.bbappend           |  33 -----
 40 files changed, 444 insertions(+), 467 deletions(-)
 delete mode 100644 recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend
 create mode 100644 recipes-connectivity/openssh/openssh_%.bbappend
 delete mode 100644 recipes-connectivity/openssh/openssh_6.5p1.bbappend
 create mode 100644 recipes-core/busybox/busybox_%.bbappend
 delete mode 100644 recipes-core/busybox/busybox_1.22.1.bbappend
 delete mode 100644 recipes-core/mlinux/mlinux-version.bb
 create mode 100644 recipes-core/mlinux/mlinux-version.bb.orig
 create mode 100644 recipes-core/udev/eudev-3.1.5/cellular_radios.rules
 create mode 100644 recipes-core/udev/eudev-3.1.5/init
 create mode 100644 recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules
 create mode 100644 recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules
 create mode 100644 recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules
 create mode 100644 recipes-core/udev/eudev-3.1.5/udev-cache.default
 create mode 100644 recipes-core/udev/eudev_3.1.5.bbappend
 delete mode 100644 recipes-core/udev/udev-182/cellular_radios.rules
 delete mode 100644 recipes-core/udev/udev-182/init
 delete mode 100644 recipes-core/udev/udev-182/mtcap/mtcap.rules
 delete mode 100644 recipes-core/udev/udev-182/mtcdt/accessory_ethernet.rules
 delete mode 100644 recipes-core/udev/udev-182/mtcdt/mtcdt.rules
 delete mode 100644 recipes-core/udev/udev-182/udev-cache.default
 create mode 100644 recipes-core/udev/udev-extraconf_%.bbappend
 delete mode 100644 recipes-core/udev/udev-extraconf_1.0.bbappend
 delete mode 100644 recipes-core/udev/udev_182.bbappend
 create mode 100644 recipes-extended/lighttpd/lighttpd_%.bbappend
 delete mode 100644 recipes-extended/lighttpd/lighttpd_1.4.33.bbappend
 create mode 100644 recipes-extended/logrotate/logrotate_%.bbappend
 delete mode 100644 recipes-extended/logrotate/logrotate_3.8.7.bbappend
 delete mode 100644 recipes-java/openjdk/openjdk-7/jvm.cfg
 delete mode 100644 recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend
 create mode 100644 recipes-java/openjdk/openjdk-8/jvm.cfg
 create mode 100644 recipes-java/openjdk/openjdk-8_102b14.bbappend
 create mode 100644 recipes-ruby/ruby/ruby_%.bbappend
 delete mode 100644 recipes-ruby/ruby/ruby_1.9.3-p429.bbappend
 create mode 100644 recipes-support/ntp/ntp_%.bbappend
 delete mode 100644 recipes-support/ntp/ntp_4.2.6p5.bbappend

diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index 1ad1f27..17b68c0 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -30,7 +30,7 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_MLINUX}"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 # extra packages to add to images
-DISTRO_EXTRA_RDEPENDS += "mlinux-version"
+#DISTRO_EXTRA_RDEPENDS += "mlinux-version"
 
 # add mlinux source mirror
 INHERIT += "mlinux-mirrors"
diff --git a/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend b/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend
deleted file mode 100644
index 48af903..0000000
--- a/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-
-SRC_URI += "file://default"
-
-do_install_append() {
-    mkdir -p ${D}${sysconfdir}/default
-	install -m 644 ${WORKDIR}/default ${D}${sysconfdir}/default/hostapd
-}
diff --git a/recipes-connectivity/openssh/openssh_%.bbappend b/recipes-connectivity/openssh/openssh_%.bbappend
new file mode 100644
index 0000000..87891c8
--- /dev/null
+++ b/recipes-connectivity/openssh/openssh_%.bbappend
@@ -0,0 +1,21 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://ssh.default"
+
+KEYFILES = "ssh_host_dsa_key \
+ssh_host_dsa_key.pub \
+ssh_host_ecdsa_key \
+ssh_host_ecdsa_key.pub \
+ssh_host_rsa_key \
+ssh_host_rsa_key.pub \
+ssh_host_ed25519_key \
+ssh_host_ed25519_key.pub \
+"
+
+do_install_append() {
+  install -d ${D}${sysconfdir}/default
+  install -m 644 ${WORKDIR}/ssh.default ${D}${sysconfdir}/default/ssh
+  for f in ${KEYFILES}; do
+    ln -sf /var/config/ssh/$f ${D}${sysconfdir}/ssh/$f
+  done
+}
diff --git a/recipes-connectivity/openssh/openssh_6.5p1.bbappend b/recipes-connectivity/openssh/openssh_6.5p1.bbappend
deleted file mode 100644
index 87891c8..0000000
--- a/recipes-connectivity/openssh/openssh_6.5p1.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://ssh.default"
-
-KEYFILES = "ssh_host_dsa_key \
-ssh_host_dsa_key.pub \
-ssh_host_ecdsa_key \
-ssh_host_ecdsa_key.pub \
-ssh_host_rsa_key \
-ssh_host_rsa_key.pub \
-ssh_host_ed25519_key \
-ssh_host_ed25519_key.pub \
-"
-
-do_install_append() {
-  install -d ${D}${sysconfdir}/default
-  install -m 644 ${WORKDIR}/ssh.default ${D}${sysconfdir}/default/ssh
-  for f in ${KEYFILES}; do
-    ln -sf /var/config/ssh/$f ${D}${sysconfdir}/ssh/$f
-  done
-}
diff --git a/recipes-connectivity/openssl/openssl.inc b/recipes-connectivity/openssl/openssl.inc
index 3b59e96..7533e8a 100644
--- a/recipes-connectivity/openssl/openssl.inc
+++ b/recipes-connectivity/openssl/openssl.inc
@@ -8,8 +8,8 @@ SECTION = "libs/network"
 LICENSE = "openssl"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
 
-# DEPENDS = "makedepend-native hostperl-runtime-native"
-DEPENDS = "makedepend-native perl-native-runtime"
+DEPENDS = "makedepend-native hostperl-runtime-native"
+#DEPENDS = "makedepend-native perl-native-runtime"
 DEPENDS_append_class-target = " openssl-native"
 
 SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
diff --git a/recipes-connectivity/ppp/ppp_2.4.7.bb b/recipes-connectivity/ppp/ppp_2.4.7.bb
index 881c40e..4d9094c 100644
--- a/recipes-connectivity/ppp/ppp_2.4.7.bb
+++ b/recipes-connectivity/ppp/ppp_2.4.7.bb
@@ -34,7 +34,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
 SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a"
 SRC_URI[sha256sum] = "02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30"
 
-inherit autotools
+inherit autotools-brokensep
 
 TARGET_CC_ARCH += " ${LDFLAGS}"
 EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}"
diff --git a/recipes-core/busybox/busybox_%.bbappend b/recipes-core/busybox/busybox_%.bbappend
new file mode 100644
index 0000000..40094e9
--- /dev/null
+++ b/recipes-core/busybox/busybox_%.bbappend
@@ -0,0 +1,10 @@
+PR .= ".mlinux1"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:${THISDIR}/files:"
+
+SRC_URI += "file://udhcpd.conf.example"
+
+do_install_append () {
+	install -m 600 ${WORKDIR}/udhcpd.conf.example ${D}${sysconfdir}/udhcpd.conf.example
+	install -m 600 ${WORKDIR}/udhcpd.conf.example ${D}${sysconfdir}/udhcpd.conf
+}
diff --git a/recipes-core/busybox/busybox_1.22.1.bbappend b/recipes-core/busybox/busybox_1.22.1.bbappend
deleted file mode 100644
index 40094e9..0000000
--- a/recipes-core/busybox/busybox_1.22.1.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-PR .= ".mlinux1"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:${THISDIR}/files:"
-
-SRC_URI += "file://udhcpd.conf.example"
-
-do_install_append () {
-	install -m 600 ${WORKDIR}/udhcpd.conf.example ${D}${sysconfdir}/udhcpd.conf.example
-	install -m 600 ${WORKDIR}/udhcpd.conf.example ${D}${sysconfdir}/udhcpd.conf
-}
diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb
index a0c460d..3ba6b2f 100644
--- a/recipes-core/images/mlinux-base-image.bb
+++ b/recipes-core/images/mlinux-base-image.bb
@@ -29,7 +29,7 @@ WIFI_FEATURES = " \
                 hostap-daemon hostap-utils \
                 "
 
-BLUETOOTH_FEATURES = "bluez4"
+BLUETOOTH_FEATURES = "bluez5"
 
 # Add all timezones available
 # ntpdate will sync time every 30 min by default via cron
diff --git a/recipes-core/mlinux/mlinux-version.bb b/recipes-core/mlinux/mlinux-version.bb
deleted file mode 100644
index f2debe1..0000000
--- a/recipes-core/mlinux/mlinux-version.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-inherit mlinux_metadata_scm
-
-# always parse this file so PV can change automatically
-__BB_DONT_CACHE = "1"
-
-PV = "${DISTRO_VERSION}_${MLINUX_METADATA_REVISION}"
-PR = "r2"
-PE = "1"
-
-PACKAGES = "${PN}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_install() {
-	mkdir -p ${D}${sysconfdir}
-	echo "mLinux ${DISTRO_VERSION}" > ${D}${sysconfdir}/mlinux-version
-	echo "Built from branch: ${MLINUX_METADATA_BRANCH}" >> ${D}${sysconfdir}/mlinux-version
-	echo "Revision: ${MLINUX_METADATA_REVISION}" >> ${D}${sysconfdir}/mlinux-version
-	echo "${MLINUX_LAYERS}" > ${D}${sysconfdir}/mlinux-layers
-}
diff --git a/recipes-core/mlinux/mlinux-version.bb.orig b/recipes-core/mlinux/mlinux-version.bb.orig
new file mode 100644
index 0000000..f2debe1
--- /dev/null
+++ b/recipes-core/mlinux/mlinux-version.bb.orig
@@ -0,0 +1,22 @@
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+inherit mlinux_metadata_scm
+
+# always parse this file so PV can change automatically
+__BB_DONT_CACHE = "1"
+
+PV = "${DISTRO_VERSION}_${MLINUX_METADATA_REVISION}"
+PR = "r2"
+PE = "1"
+
+PACKAGES = "${PN}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_install() {
+	mkdir -p ${D}${sysconfdir}
+	echo "mLinux ${DISTRO_VERSION}" > ${D}${sysconfdir}/mlinux-version
+	echo "Built from branch: ${MLINUX_METADATA_BRANCH}" >> ${D}${sysconfdir}/mlinux-version
+	echo "Revision: ${MLINUX_METADATA_REVISION}" >> ${D}${sysconfdir}/mlinux-version
+	echo "${MLINUX_LAYERS}" > ${D}${sysconfdir}/mlinux-layers
+}
diff --git a/recipes-core/udev/eudev-3.1.5/cellular_radios.rules b/recipes-core/udev/eudev-3.1.5/cellular_radios.rules
new file mode 100644
index 0000000..aa05e96
--- /dev/null
+++ b/recipes-core/udev/eudev-3.1.5/cellular_radios.rules
@@ -0,0 +1,59 @@
+ACTION=="remove", GOTO="mlinux_end"
+SUBSYSTEM!="tty", GOTO="mlinux_end"
+KERNEL!="ttyUSB[0-9]*|ttyACM[0-9]*", GOTO="mlinux_end"
+
+SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
+ENV{ID_IFACE}=="", GOTO="mlinux_end"
+
+# All modem ports
+# H5
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="02", SYMLINK+="modem1"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="04", SYMLINK+="modem2"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem3"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="08", SYMLINK+="modem4"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0a", SYMLINK+="modem5"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0c", SYMLINK+="modem6"
+# EV3
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="01", SYMLINK+="modem1"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem2"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem3"
+# H4
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="01", SYMLINK+="modem1"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="02", SYMLINK+="modem2"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem3"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem4"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem5"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="06", SYMLINK+="modem6"
+# EV2
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", SYMLINK+="modem$env{ID_PORT}"
+
+# AT Command ports
+# H5: ttyACM0, ttyACM3
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1"
+# EV3: ttyUSB2, ttyUSB3
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem_at1"
+# H4: ttyUSB3, ttyUSB4, ttyUSB5
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem_at1"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem_at2"
+# EV2: ttyUSB0
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", ENV{ID_PORT}=="0", SYMLINK+="modem_at0"
+# LAT1, LEU1, LVW2: ttyUSB2, ttyUSB3 (port 04 and port 05)
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1201", ENV{ID_IFACE}=="04", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1201", ENV{ID_IFACE}=="05", SYMLINK+="modem_at1"
+# LJP1(LE910-JN1), LNA3(LE910-NA1): ttyACM0, ttyACM3 (port 00 and port 03)
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1"
+# G3: ttyACM0, ttyACM1
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0022", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0022", ENV{ID_IFACE}=="02", SYMLINK+="modem_at1"
+# C2: ttyUSB0, ttyUSB1 (Telit Documentation: Modem Port = USB1, Aux Port = USB0)
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1011", ENV{ID_IFACE}=="01", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1011", ENV{ID_IFACE}=="00", SYMLINK+="modem_at1"
+
+LABEL="mlinux_end"
diff --git a/recipes-core/udev/eudev-3.1.5/init b/recipes-core/udev/eudev-3.1.5/init
new file mode 100644
index 0000000..bd716b0
--- /dev/null
+++ b/recipes-core/udev/eudev-3.1.5/init
@@ -0,0 +1,138 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          udev
+# Required-Start:    mountvirtfs
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Start udevd, populate /dev and load drivers.
+### END INIT INFO
+
+export TZ=/etc/localtime
+
+[ -d /sys/class ] || exit 1
+[ -r /proc/mounts ] || exit 1
+[ -x @UDEVD@ ] || exit 1
+[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
+[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+readfiles () {
+   READDATA=""
+   for filename in $@; do
+	   if [ -r $filename ]; then
+		   while read line; do
+			   READDATA="$READDATA$line"
+		   done < $filename
+	   fi
+   done
+}
+
+kill_udevd () {
+    pid=`pidof -x udevd`
+    [ -n "$pid" ] && kill $pid
+}
+
+case "$1" in
+  start)
+    export ACTION=add
+    # propagate /dev from /sys
+    echo "Starting udev"
+
+    # Check for requireed devtmpfs before trying to start udev and
+    # mount a no-existant fs.
+    if ! grep -q devtmpfs /proc/filesystems
+    then
+        echo "Missing devtmpfs, which is required for udev to run";
+        echo "Halting..."
+        halt
+    fi
+    # mount the devtmpfs on /dev, if not already done
+    LANG=C awk '$2 == "/dev" && ($3 == "devtmpfs") { exit 1 }' /proc/mounts && {
+            mount -n -o mode=0755 -t devtmpfs none "/dev"
+    }
+    [ -e /dev/pts ] || mkdir -m 0755 /dev/pts
+    [ -e /dev/shm ] || mkdir -m 1777 /dev/shm
+    # the automount rule for udev needs /tmp directory available, as /tmp is a symlink
+    # to /var/tmp which in turn is a symlink to /var/volatile/tmp, we need to make sure
+    # /var/volatile/tmp directory to be available.
+    mkdir -p /var/volatile/tmp
+
+    # Cache handling.
+    # A list of files which are used as a criteria to judge whether the udev cache could be reused.
+    CMP_FILE_LIST="/proc/version /proc/cmdline /proc/devices /proc/atags"
+    if [ "$DEVCACHE" != "" ]; then
+            if [ -e $DEVCACHE ]; then
+		    readfiles $CMP_FILE_LIST
+		    NEWDATA="$READDATA"
+		    readfiles /etc/udev/cache.data
+		    OLDDATA="$READDATA"
+		    if [ "$OLDDATA" = "$NEWDATA" ]; then
+                            (cd /; tar xf $DEVCACHE > /dev/null 2>&1)
+                            not_first_boot=1
+                            [ "$VERBOSE" != "no" ] && echo "udev: using cache file $DEVCACHE"
+                            [ -e /dev/shm/udev.cache ] && rm -f /dev/shm/udev.cache
+                    else
+			    # Output detailed reason why the cached /dev is not used
+			    if [ "$VERBOSE" != "no" ]; then
+				    echo "udev: udev cache not used"
+				    echo "udev: we use $CMP_FILE_LIST as criteria to judge whether the cache /dev could be resued"
+				    echo "udev: olddata: $OLDDATA"
+				    echo "udev: newdata: $NEWDATA"
+			    fi
+			    echo "$NEWDATA" > /dev/shm/udev.cache
+                    fi
+	    else
+		    if [ "$ROOTFS_READ_ONLY" != "yes" ]; then
+			    # If rootfs is not read-only, it's possible that a new udev cache would be generated;
+			    # otherwise, we do not bother to read files.
+			    readfiles $CMP_FILE_LIST
+			    echo "$READDATA" > /dev/shm/udev.cache
+		    fi
+            fi
+    fi
+
+    # make_extra_nodes
+    kill_udevd > "/dev/null" 2>&1
+
+    # trigger the sorted events
+    echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+    @UDEVD@ -d
+
+    udevadm control --env=STARTUP=1
+    if [ "$not_first_boot" != "" ];then
+            if [ "$PROBE_PLATFORM_BUS" != "yes" ]; then
+                PLATFORM_BUS_NOMATCH="--subsystem-nomatch=platform"
+            else
+                PLATFORM_BUS_NOMATCH=""
+            fi
+            udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux $PLATFORM_BUS_NOMATCH
+            (udevadm settle --timeout=10; udevadm control --env=STARTUP=)&
+    else
+            udevadm trigger --action=add
+            udevadm settle
+    fi
+    ;;
+  stop)
+    echo "Stopping udevd"
+    start-stop-daemon --stop --name udevd --quiet
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  status)
+    pid=`pidof -x udevd`
+    if [ -n "$pid" ]; then
+	echo "udevd (pid $pid) is running ..."
+    else
+	echo "udevd is stopped"
+    fi
+    ;;
+  *)
+    echo "Usage: $0 {start|stop|status|restart}"
+    exit 1
+esac
+exit 0
diff --git a/recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules b/recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules
new file mode 100644
index 0000000..a0dc9fb
--- /dev/null
+++ b/recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules
@@ -0,0 +1,8 @@
+ACTION=="remove", GOTO="mlinux_end"
+SUBSYSTEM!="tty", GOTO="mlinux_end"
+KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end"
+
+SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
+ENV{ID_IFACE}=="", GOTO="mlinux_end"
+
+LABEL="mlinux_end"
diff --git a/recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules b/recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules
new file mode 100644
index 0000000..376486b
--- /dev/null
+++ b/recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules
@@ -0,0 +1,21 @@
+#To add new rule for new device you have to run (in case if you want to add eth1 interface)
+#admin@mtcdt:~# udevadm info --attribute-walk --path=/sys/class/net/eth1
+# looking at device '/devices/ahb.0/700000.ehci/usb1/1-2/1-2.1/1-2.1.1/1-2.1.1:1.0/net/eth1':
+#    KERNEL=="eth1"
+#    SUBSYSTEM=="net"
+#    DRIVER==""
+#    ATTR{mtu}=="1500"
+#    ATTR{type}=="1"
+#    ...........
+#    ...........
+
+#  looking at parent device '/devices/ahb.0/700000.ehci/usb1/1-2/1-2.1/1-2.1.1/1-2.1.1:1.0':
+#    KERNELS=="1-2.1.1:1.0"  <------------------- extract this record to add to the rule
+#    SUBSYSTEMS=="usb"
+#    DRIVERS=="smsc75xx"
+#    ATTRS{bInterfaceClass}=="ff"
+#    ATTRS{bInterfaceSubClass}=="00"
+#    ...........
+
+KERNELS=="1-2.1.1:1.0", SUBSYSTEMS=="usb", DRIVERS=="smsc75xx", NAME="eth1"
+KERNELS=="1-2.1.2:1.0", SUBSYSTEMS=="usb", DRIVERS=="smsc75xx", NAME="eth2"
diff --git a/recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules b/recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules
new file mode 100644
index 0000000..5d528e6
--- /dev/null
+++ b/recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules
@@ -0,0 +1,14 @@
+ACTION=="remove", GOTO="mlinux_end"
+SUBSYSTEM!="tty", GOTO="mlinux_end"
+KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end"
+
+SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
+ENV{ID_IFACE}=="", GOTO="mlinux_end"
+
+# Accessory Ports
+ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1"
+ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1"
+ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2"
+ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2"
+
+LABEL="mlinux_end"
diff --git a/recipes-core/udev/eudev-3.1.5/udev-cache.default b/recipes-core/udev/eudev-3.1.5/udev-cache.default
new file mode 100644
index 0000000..b1aa63f
--- /dev/null
+++ b/recipes-core/udev/eudev-3.1.5/udev-cache.default
@@ -0,0 +1,5 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
+PROBE_PLATFORM_BUS="yes"
diff --git a/recipes-core/udev/eudev_3.1.5.bbappend b/recipes-core/udev/eudev_3.1.5.bbappend
new file mode 100644
index 0000000..e793d1d
--- /dev/null
+++ b/recipes-core/udev/eudev_3.1.5.bbappend
@@ -0,0 +1,20 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+
+PR .= ".mlinux2"
+
+# add custom rules for persistent modem device names
+SRC_URI += "	file://cellular_radios.rules \
+		file://${MACHINE}.rules \
+		   "
+
+SRC_URI_append_mtcdt = "       file://accessory_ethernet.rules \
+			"
+
+do_install_append() {
+	install -m 644 ${WORKDIR}/cellular_radios.rules ${D}${sysconfdir}/udev/rules.d/
+	install -m 644 ${WORKDIR}/${MACHINE}.rules ${D}${sysconfdir}/udev/rules.d/
+}
+
+do_install_append_mtcdt() {
+	install -m 644 ${WORKDIR}/accessory_ethernet.rules ${D}${sysconfdir}/udev/rules.d/
+}
diff --git a/recipes-core/udev/udev-182/cellular_radios.rules b/recipes-core/udev/udev-182/cellular_radios.rules
deleted file mode 100644
index fd36bbd..0000000
--- a/recipes-core/udev/udev-182/cellular_radios.rules
+++ /dev/null
@@ -1,69 +0,0 @@
-ACTION=="remove", GOTO="mlinux_end"
-SUBSYSTEM!="tty", GOTO="mlinux_end"
-KERNEL!="ttyUSB[0-9]*|ttyACM[0-9]*", GOTO="mlinux_end"
-
-SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
-ENV{ID_IFACE}=="", GOTO="mlinux_end"
-
-# All modem ports
-# H5
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="02", SYMLINK+="modem1"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="04", SYMLINK+="modem2"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem3"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="08", SYMLINK+="modem4"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0a", SYMLINK+="modem5"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0c", SYMLINK+="modem6"
-# LAT3, LVW3 and LEU3
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="02", SYMLINK+="modem1"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="04", SYMLINK+="modem2"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem3"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="08", SYMLINK+="modem4"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="0a", SYMLINK+="modem5"
-# EV3
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="01", SYMLINK+="modem1"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem2"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem3"
-# H4
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="01", SYMLINK+="modem1"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="02", SYMLINK+="modem2"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem3"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem4"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem5"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="06", SYMLINK+="modem6"
-# EV2
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", SYMLINK+="modem$env{ID_PORT}"
-
-# AT Command ports
-# H5: ttyACM0, ttyACM3
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1"
-# LAT3, LVW3 and LEU3
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1"
-# EV3: ttyUSB2, ttyUSB3
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem_at1"
-# H4: ttyUSB3, ttyUSB4, ttyUSB5
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem_at1"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem_at2"
-# EV2: ttyUSB0
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", ENV{ID_PORT}=="0", SYMLINK+="modem_at0"
-# LAT1, LEU1, LVW2: ttyUSB2, ttyUSB3 (port 04 and port 05)
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1201", ENV{ID_IFACE}=="04", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1201", ENV{ID_IFACE}=="05", SYMLINK+="modem_at1"
-# LJP1(LE910-JN1), LNA3(LE910-NA1): ttyACM0, ttyACM3 (port 00 and port 03)
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1"
-# G3: ttyACM0, ttyACM1
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0022", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0022", ENV{ID_IFACE}=="02", SYMLINK+="modem_at1"
-# C2: ttyUSB0, ttyUSB1 (Telit Documentation: Modem Port = USB1, Aux Port = USB0)
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1011", ENV{ID_IFACE}=="01", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1011", ENV{ID_IFACE}=="00", SYMLINK+="modem_at1"
-
-LABEL="mlinux_end"
diff --git a/recipes-core/udev/udev-182/init b/recipes-core/udev/udev-182/init
deleted file mode 100644
index bd716b0..0000000
--- a/recipes-core/udev/udev-182/init
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          udev
-# Required-Start:    mountvirtfs
-# Required-Stop:     
-# Default-Start:     S
-# Default-Stop:
-# Short-Description: Start udevd, populate /dev and load drivers.
-### END INIT INFO
-
-export TZ=/etc/localtime
-
-[ -d /sys/class ] || exit 1
-[ -r /proc/mounts ] || exit 1
-[ -x @UDEVD@ ] || exit 1
-[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
-[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-readfiles () {
-   READDATA=""
-   for filename in $@; do
-	   if [ -r $filename ]; then
-		   while read line; do
-			   READDATA="$READDATA$line"
-		   done < $filename
-	   fi
-   done
-}
-
-kill_udevd () {
-    pid=`pidof -x udevd`
-    [ -n "$pid" ] && kill $pid
-}
-
-case "$1" in
-  start)
-    export ACTION=add
-    # propagate /dev from /sys
-    echo "Starting udev"
-
-    # Check for requireed devtmpfs before trying to start udev and
-    # mount a no-existant fs.
-    if ! grep -q devtmpfs /proc/filesystems
-    then
-        echo "Missing devtmpfs, which is required for udev to run";
-        echo "Halting..."
-        halt
-    fi
-    # mount the devtmpfs on /dev, if not already done
-    LANG=C awk '$2 == "/dev" && ($3 == "devtmpfs") { exit 1 }' /proc/mounts && {
-            mount -n -o mode=0755 -t devtmpfs none "/dev"
-    }
-    [ -e /dev/pts ] || mkdir -m 0755 /dev/pts
-    [ -e /dev/shm ] || mkdir -m 1777 /dev/shm
-    # the automount rule for udev needs /tmp directory available, as /tmp is a symlink
-    # to /var/tmp which in turn is a symlink to /var/volatile/tmp, we need to make sure
-    # /var/volatile/tmp directory to be available.
-    mkdir -p /var/volatile/tmp
-
-    # Cache handling.
-    # A list of files which are used as a criteria to judge whether the udev cache could be reused.
-    CMP_FILE_LIST="/proc/version /proc/cmdline /proc/devices /proc/atags"
-    if [ "$DEVCACHE" != "" ]; then
-            if [ -e $DEVCACHE ]; then
-		    readfiles $CMP_FILE_LIST
-		    NEWDATA="$READDATA"
-		    readfiles /etc/udev/cache.data
-		    OLDDATA="$READDATA"
-		    if [ "$OLDDATA" = "$NEWDATA" ]; then
-                            (cd /; tar xf $DEVCACHE > /dev/null 2>&1)
-                            not_first_boot=1
-                            [ "$VERBOSE" != "no" ] && echo "udev: using cache file $DEVCACHE"
-                            [ -e /dev/shm/udev.cache ] && rm -f /dev/shm/udev.cache
-                    else
-			    # Output detailed reason why the cached /dev is not used
-			    if [ "$VERBOSE" != "no" ]; then
-				    echo "udev: udev cache not used"
-				    echo "udev: we use $CMP_FILE_LIST as criteria to judge whether the cache /dev could be resued"
-				    echo "udev: olddata: $OLDDATA"
-				    echo "udev: newdata: $NEWDATA"
-			    fi
-			    echo "$NEWDATA" > /dev/shm/udev.cache
-                    fi
-	    else
-		    if [ "$ROOTFS_READ_ONLY" != "yes" ]; then
-			    # If rootfs is not read-only, it's possible that a new udev cache would be generated;
-			    # otherwise, we do not bother to read files.
-			    readfiles $CMP_FILE_LIST
-			    echo "$READDATA" > /dev/shm/udev.cache
-		    fi
-            fi
-    fi
-
-    # make_extra_nodes
-    kill_udevd > "/dev/null" 2>&1
-
-    # trigger the sorted events
-    echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
-    @UDEVD@ -d
-
-    udevadm control --env=STARTUP=1
-    if [ "$not_first_boot" != "" ];then
-            if [ "$PROBE_PLATFORM_BUS" != "yes" ]; then
-                PLATFORM_BUS_NOMATCH="--subsystem-nomatch=platform"
-            else
-                PLATFORM_BUS_NOMATCH=""
-            fi
-            udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux $PLATFORM_BUS_NOMATCH
-            (udevadm settle --timeout=10; udevadm control --env=STARTUP=)&
-    else
-            udevadm trigger --action=add
-            udevadm settle
-    fi
-    ;;
-  stop)
-    echo "Stopping udevd"
-    start-stop-daemon --stop --name udevd --quiet
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    pid=`pidof -x udevd`
-    if [ -n "$pid" ]; then
-	echo "udevd (pid $pid) is running ..."
-    else
-	echo "udevd is stopped"
-    fi
-    ;;
-  *)
-    echo "Usage: $0 {start|stop|status|restart}"
-    exit 1
-esac
-exit 0
diff --git a/recipes-core/udev/udev-182/mtcap/mtcap.rules b/recipes-core/udev/udev-182/mtcap/mtcap.rules
deleted file mode 100644
index a0dc9fb..0000000
--- a/recipes-core/udev/udev-182/mtcap/mtcap.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-ACTION=="remove", GOTO="mlinux_end"
-SUBSYSTEM!="tty", GOTO="mlinux_end"
-KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end"
-
-SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
-ENV{ID_IFACE}=="", GOTO="mlinux_end"
-
-LABEL="mlinux_end"
diff --git a/recipes-core/udev/udev-182/mtcdt/accessory_ethernet.rules b/recipes-core/udev/udev-182/mtcdt/accessory_ethernet.rules
deleted file mode 100644
index 376486b..0000000
--- a/recipes-core/udev/udev-182/mtcdt/accessory_ethernet.rules
+++ /dev/null
@@ -1,21 +0,0 @@
-#To add new rule for new device you have to run (in case if you want to add eth1 interface)
-#admin@mtcdt:~# udevadm info --attribute-walk --path=/sys/class/net/eth1
-# looking at device '/devices/ahb.0/700000.ehci/usb1/1-2/1-2.1/1-2.1.1/1-2.1.1:1.0/net/eth1':
-#    KERNEL=="eth1"
-#    SUBSYSTEM=="net"
-#    DRIVER==""
-#    ATTR{mtu}=="1500"
-#    ATTR{type}=="1"
-#    ...........
-#    ...........
-
-#  looking at parent device '/devices/ahb.0/700000.ehci/usb1/1-2/1-2.1/1-2.1.1/1-2.1.1:1.0':
-#    KERNELS=="1-2.1.1:1.0"  <------------------- extract this record to add to the rule
-#    SUBSYSTEMS=="usb"
-#    DRIVERS=="smsc75xx"
-#    ATTRS{bInterfaceClass}=="ff"
-#    ATTRS{bInterfaceSubClass}=="00"
-#    ...........
-
-KERNELS=="1-2.1.1:1.0", SUBSYSTEMS=="usb", DRIVERS=="smsc75xx", NAME="eth1"
-KERNELS=="1-2.1.2:1.0", SUBSYSTEMS=="usb", DRIVERS=="smsc75xx", NAME="eth2"
diff --git a/recipes-core/udev/udev-182/mtcdt/mtcdt.rules b/recipes-core/udev/udev-182/mtcdt/mtcdt.rules
deleted file mode 100644
index 5d528e6..0000000
--- a/recipes-core/udev/udev-182/mtcdt/mtcdt.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-ACTION=="remove", GOTO="mlinux_end"
-SUBSYSTEM!="tty", GOTO="mlinux_end"
-KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end"
-
-SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
-ENV{ID_IFACE}=="", GOTO="mlinux_end"
-
-# Accessory Ports
-ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1"
-ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1"
-ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2"
-ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2"
-
-LABEL="mlinux_end"
diff --git a/recipes-core/udev/udev-182/udev-cache.default b/recipes-core/udev/udev-182/udev-cache.default
deleted file mode 100644
index b1aa63f..0000000
--- a/recipes-core/udev/udev-182/udev-cache.default
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
-PROBE_PLATFORM_BUS="yes"
diff --git a/recipes-core/udev/udev-extraconf_%.bbappend b/recipes-core/udev/udev-extraconf_%.bbappend
new file mode 100644
index 0000000..6d4804d
--- /dev/null
+++ b/recipes-core/udev/udev-extraconf_%.bbappend
@@ -0,0 +1,2 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
diff --git a/recipes-core/udev/udev-extraconf_1.0.bbappend b/recipes-core/udev/udev-extraconf_1.0.bbappend
deleted file mode 100644
index 6d4804d..0000000
--- a/recipes-core/udev/udev-extraconf_1.0.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
diff --git a/recipes-core/udev/udev_182.bbappend b/recipes-core/udev/udev_182.bbappend
deleted file mode 100644
index e793d1d..0000000
--- a/recipes-core/udev/udev_182.bbappend
+++ /dev/null
@@ -1,20 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-
-PR .= ".mlinux2"
-
-# add custom rules for persistent modem device names
-SRC_URI += "	file://cellular_radios.rules \
-		file://${MACHINE}.rules \
-		   "
-
-SRC_URI_append_mtcdt = "       file://accessory_ethernet.rules \
-			"
-
-do_install_append() {
-	install -m 644 ${WORKDIR}/cellular_radios.rules ${D}${sysconfdir}/udev/rules.d/
-	install -m 644 ${WORKDIR}/${MACHINE}.rules ${D}${sysconfdir}/udev/rules.d/
-}
-
-do_install_append_mtcdt() {
-	install -m 644 ${WORKDIR}/accessory_ethernet.rules ${D}${sysconfdir}/udev/rules.d/
-}
diff --git a/recipes-extended/lighttpd/lighttpd_%.bbappend b/recipes-extended/lighttpd/lighttpd_%.bbappend
new file mode 100644
index 0000000..473a113
--- /dev/null
+++ b/recipes-extended/lighttpd/lighttpd_%.bbappend
@@ -0,0 +1,21 @@
+PR .= ".mlinux1"
+
+# build with openssl support
+DEPENDS += " openssl "
+RDEPENDS_${PN} += " openssl logrotate "
+
+EXTRA_OECONF += "--with-openssl"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
+
+SRC_URI += "file://lighttpd.logrotate.conf \
+			file://lighttpd.default"
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/logrotate.d
+	install -d ${D}${sysconfdir}/default
+	install -m 0644 ${WORKDIR}/lighttpd.logrotate.conf ${D}${sysconfdir}/logrotate.d/lighttpd.conf
+	install -m 0644 ${WORKDIR}/lighttpd.default ${D}${sysconfdir}/default/lighttpd
+}
+
+CONFFILES_${PN} += "${sysconfdir}/default/lighttpd ${sysconfdir}/logrotate.d/lighttpd.conf"
diff --git a/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend b/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend
deleted file mode 100644
index 473a113..0000000
--- a/recipes-extended/lighttpd/lighttpd_1.4.33.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-PR .= ".mlinux1"
-
-# build with openssl support
-DEPENDS += " openssl "
-RDEPENDS_${PN} += " openssl logrotate "
-
-EXTRA_OECONF += "--with-openssl"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
-
-SRC_URI += "file://lighttpd.logrotate.conf \
-			file://lighttpd.default"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/logrotate.d
-	install -d ${D}${sysconfdir}/default
-	install -m 0644 ${WORKDIR}/lighttpd.logrotate.conf ${D}${sysconfdir}/logrotate.d/lighttpd.conf
-	install -m 0644 ${WORKDIR}/lighttpd.default ${D}${sysconfdir}/default/lighttpd
-}
-
-CONFFILES_${PN} += "${sysconfdir}/default/lighttpd ${sysconfdir}/logrotate.d/lighttpd.conf"
diff --git a/recipes-extended/logrotate/logrotate_%.bbappend b/recipes-extended/logrotate/logrotate_%.bbappend
new file mode 100644
index 0000000..efebecb
--- /dev/null
+++ b/recipes-extended/logrotate/logrotate_%.bbappend
@@ -0,0 +1,15 @@
+PR .= ".mlinux2"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
+
+SRC_URI += "file://logrotate.conf"
+
+do_install_append() {
+	# setup cron to run logrotate more often
+	rm -f ${D}${sysconfdir}/cron.daily/logrotate
+	install -d ${D}${sysconfdir}/cron.d
+	echo "*/5 * * * * root /usr/sbin/logrotate /etc/logrotate.conf" > ${D}${sysconfdir}/cron.d/logrotate
+
+	install -m 0644 ${WORKDIR}/logrotate.conf ${D}${sysconfdir}/
+}
+
diff --git a/recipes-extended/logrotate/logrotate_3.8.7.bbappend b/recipes-extended/logrotate/logrotate_3.8.7.bbappend
deleted file mode 100644
index efebecb..0000000
--- a/recipes-extended/logrotate/logrotate_3.8.7.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-PR .= ".mlinux2"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
-
-SRC_URI += "file://logrotate.conf"
-
-do_install_append() {
-	# setup cron to run logrotate more often
-	rm -f ${D}${sysconfdir}/cron.daily/logrotate
-	install -d ${D}${sysconfdir}/cron.d
-	echo "*/5 * * * * root /usr/sbin/logrotate /etc/logrotate.conf" > ${D}${sysconfdir}/cron.d/logrotate
-
-	install -m 0644 ${WORKDIR}/logrotate.conf ${D}${sysconfdir}/
-}
-
diff --git a/recipes-java/openjdk/openjdk-7/jvm.cfg b/recipes-java/openjdk/openjdk-7/jvm.cfg
deleted file mode 100644
index 5a21e4e..0000000
--- a/recipes-java/openjdk/openjdk-7/jvm.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Sun designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Sun in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
-#
-# 
-# List of JVMs that can be used as an option to java, javac, etc.
-# Order is important -- first in this list is the default JVM.
-# NOTE that this both this file and its format are UNSUPPORTED and
-# WILL GO AWAY in a future release.
-#
-# You may also select a JVM in an arbitrary location with the
-# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
-# and may not be available in a future release.
-#
--jamvm ERROR
--server ERROR
--client IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
--zero ALIASED_TO -server
--shark ERROR
--cacao ERROR
diff --git a/recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend b/recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend
deleted file mode 100644
index c7a6e78..0000000
--- a/recipes-java/openjdk/openjdk-7_25b30-2.3.12.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-# provides custom jvm.cfg to set the default JVM
-
-# openjdk-7 recipe is prepending to FILESPATH, so use
-# FILESPATH instead of FILESEXTRAPATH or our file doesn't
-# get picked up
-FILESPATH_prepend := "${THISDIR}/openjdk-7:"
diff --git a/recipes-java/openjdk/openjdk-8/jvm.cfg b/recipes-java/openjdk/openjdk-8/jvm.cfg
new file mode 100644
index 0000000..5a21e4e
--- /dev/null
+++ b/recipes-java/openjdk/openjdk-8/jvm.cfg
@@ -0,0 +1,43 @@
+# Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Sun designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Sun in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#
+# 
+# List of JVMs that can be used as an option to java, javac, etc.
+# Order is important -- first in this list is the default JVM.
+# NOTE that this both this file and its format are UNSUPPORTED and
+# WILL GO AWAY in a future release.
+#
+# You may also select a JVM in an arbitrary location with the
+# "-XXaltjvm=<jvm_dir>" option, but that too is unsupported
+# and may not be available in a future release.
+#
+-jamvm ERROR
+-server ERROR
+-client IGNORE
+-hotspot ERROR
+-classic WARN
+-native ERROR
+-green ERROR
+-zero ALIASED_TO -server
+-shark ERROR
+-cacao ERROR
diff --git a/recipes-java/openjdk/openjdk-8_102b14.bbappend b/recipes-java/openjdk/openjdk-8_102b14.bbappend
new file mode 100644
index 0000000..4a258d2
--- /dev/null
+++ b/recipes-java/openjdk/openjdk-8_102b14.bbappend
@@ -0,0 +1,6 @@
+# provides custom jvm.cfg to set the default JVM
+
+# openjdk-7 recipe is prepending to FILESPATH, so use
+# FILESPATH instead of FILESEXTRAPATH or our file doesn't
+# get picked up
+FILESPATH_prepend := "${THISDIR}/openjdk-8:"
diff --git a/recipes-ruby/ruby/ruby_%.bbappend b/recipes-ruby/ruby/ruby_%.bbappend
new file mode 100644
index 0000000..b31d44c
--- /dev/null
+++ b/recipes-ruby/ruby/ruby_%.bbappend
@@ -0,0 +1,4 @@
+# remove /usr/share/ri from main ruby package
+# using FILES_${PN}_remove doesn't work...
+FILES_ruby_remove = "${datadir}/ri"
+FILES_${PN}-doc += "${datadir}/ri"
diff --git a/recipes-ruby/ruby/ruby_1.9.3-p429.bbappend b/recipes-ruby/ruby/ruby_1.9.3-p429.bbappend
deleted file mode 100644
index b31d44c..0000000
--- a/recipes-ruby/ruby/ruby_1.9.3-p429.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-# remove /usr/share/ri from main ruby package
-# using FILES_${PN}_remove doesn't work...
-FILES_ruby_remove = "${datadir}/ri"
-FILES_${PN}-doc += "${datadir}/ri"
diff --git a/recipes-support/multitech/jsparser_0.3.bb b/recipes-support/multitech/jsparser_0.3.bb
index b3c7313..e5e2687 100644
--- a/recipes-support/multitech/jsparser_0.3.bb
+++ b/recipes-support/multitech/jsparser_0.3.bb
@@ -12,8 +12,6 @@ SRC_URI = "git://git.multitech.net/jsparser;branch=master \
 
 S = "${WORKDIR}/git"
 
-inherit autotools
-
 do_install_append() {
     install -d ${D}/usr/bin
     install -m 755 ${WORKDIR}/jspp ${D}/usr/bin/jspp
diff --git a/recipes-support/ntp/ntp_%.bbappend b/recipes-support/ntp/ntp_%.bbappend
new file mode 100644
index 0000000..6546de2
--- /dev/null
+++ b/recipes-support/ntp/ntp_%.bbappend
@@ -0,0 +1,30 @@
+PR .= ".mlinux2"
+
+SRC_URI += " file://ntpd-default \
+		"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files"
+
+python do_patch_prepend () {
+    import os
+}
+
+do_install_append() {
+    install -d ${D}${sysconfdir}/default
+    install -m 0644 ${WORKDIR}/ntpd-default ${D}${sysconfdir}/default/ntpd.default
+
+    drdir=${D}${localstatedir}/lib/ntp
+    install -d -m 0755 -p ${drdir}
+    drfile="${drdir}/ntp.drift"
+    touch ${drfile}
+    chmod 664 ${drfile}
+    chown -R ntp:ntp ${drdir}
+}
+pkg_postinst_${PN}_append() {
+    update-alternatives --install ${sysconfdir}/default/ntpd ntpd-defaults ${sysconfdir}/default/ntpd.default 10
+}
+
+pkg_postrm_${PN}_append() {
+    update-alternatives --remove ntpd-defaults ${sysconfdir}/default/ntpd.default
+}
+FILES_${PN} += "${sysconfdir}/default/ntpd.default ${localstatedir}/lib/*"
+CONFFILES_${PN} += "${sysconfdir}/default/ntpd.default"
diff --git a/recipes-support/ntp/ntp_4.2.6p5.bbappend b/recipes-support/ntp/ntp_4.2.6p5.bbappend
deleted file mode 100644
index 8460fda..0000000
--- a/recipes-support/ntp/ntp_4.2.6p5.bbappend
+++ /dev/null
@@ -1,33 +0,0 @@
-PR .= ".mlinux2"
-
-SRC_URI += " file://ntpd-init.patch;patchdir=.. \
-             file://ntp.conf.patch;patchdir=.. \
-             file://ntpd-default \
-             file://logtime.patch \
-		"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files"
-
-python do_patch_prepend () {
-    import os
-}
-
-do_install_append() {
-    install -d ${D}${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/ntpd-default ${D}${sysconfdir}/default/ntpd.default
-
-    drdir=${D}${localstatedir}/lib/ntp
-    install -d -m 0755 -p ${drdir}
-    drfile="${drdir}/ntp.drift"
-    touch ${drfile}
-    chmod 664 ${drfile}
-    chown -R ntp:ntp ${drdir}
-}
-pkg_postinst_${PN}_append() {
-    update-alternatives --install ${sysconfdir}/default/ntpd ntpd-defaults ${sysconfdir}/default/ntpd.default 10
-}
-
-pkg_postrm_${PN}_append() {
-    update-alternatives --remove ntpd-defaults ${sysconfdir}/default/ntpd.default
-}
-FILES_${PN} += "${sysconfdir}/default/ntpd.default ${localstatedir}/lib/*"
-CONFFILES_${PN} += "${sysconfdir}/default/ntpd.default"
-- 
cgit v1.2.3


From 50e3ef3045985319c7f84c0840ef78bfd10df9e9 Mon Sep 17 00:00:00 2001
From: Jeff Hatch <jhatch@multitech.com>
Date: Mon, 6 Mar 2017 15:05:23 -0600
Subject: Add IMAGE_FSTYPES for jffs2 and tar.gz to local.conf

---
 contrib/local.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/local.conf b/contrib/local.conf
index 1e83060..8eb6d46 100644
--- a/contrib/local.conf
+++ b/contrib/local.conf
@@ -49,3 +49,5 @@ PRSERV_HOST = "localhost:0"
 INHERIT += "buildhistory"
 BUILDHISTORY_COMMIT = "0"
 BUILDHISTORY_FEATURES = "image"
+
+IMAGE_FSTYPES =+ "jffs2 tar.gz"
-- 
cgit v1.2.3


From cc8d54d4e3637d2450a30e099505a5768565e0cc Mon Sep 17 00:00:00 2001
From: Jeff Hatch <jhatch@multitech.com>
Date: Mon, 6 Mar 2017 16:15:56 -0600
Subject: Fix FILESEXTRAPATHS_prepend in a couple of bitbake recipes

---
 recipes-core/base-files/base-files_3.0.14.bbappend | 2 +-
 recipes-support/ntp/ntp_%.bbappend                 | 2 +-
 2 files changed, 2 insertions(+), 2 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 0f0ae4f..b9a4231 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,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 media_card="/media/card"
 media_card_mtcap=""
diff --git a/recipes-support/ntp/ntp_%.bbappend b/recipes-support/ntp/ntp_%.bbappend
index 6546de2..c8e094d 100644
--- a/recipes-support/ntp/ntp_%.bbappend
+++ b/recipes-support/ntp/ntp_%.bbappend
@@ -2,7 +2,7 @@ PR .= ".mlinux2"
 
 SRC_URI += " file://ntpd-default \
 		"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 python do_patch_prepend () {
     import os
-- 
cgit v1.2.3


From 2db010b3b63c58fb966b44cb8df0b16dd913469f Mon Sep 17 00:00:00 2001
From: Jeff Hatch <jhatch@multitech.com>
Date: Thu, 9 Mar 2017 14:27:42 -0600
Subject: Fix build where do_rootfs wasn't done before do_firmware tried to
 copy rootfs file

---
 classes/mlinux-image.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass
index 4af7d9e..785160e 100644
--- a/classes/mlinux-image.bbclass
+++ b/classes/mlinux-image.bbclass
@@ -44,6 +44,7 @@ do_firmware () {
     cp at91bootstrap_pmecc_padded.bin bstrap.bin
     cp u-boot-${MACHINE}.bin uboot.bin
     cp uImage-${MACHINE}.bin uImage.bin
+    sleep 30
     cp ${IMAGE_BASENAME}-${MACHINE}.jffs2 rootfs.jffs2
 
     cat bstrap.bin | md5sum > bstrap.bin.md5
-- 
cgit v1.2.3


From 14559d854833786c62a20fb6e0788890512f6ba4 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 27 Mar 2017 15:40:37 -0500
Subject: Need to define __USE_XOPEN2K for struct addrinfo in netdb.h

---
 recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
index 98e1973..a4e625f 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
@@ -33,7 +33,7 @@ LORA_DIR = "/opt/lora"
 export LGW_PATH = "${STAGING_LIBDIR}/lora"
 export LGW_INC = "${STAGING_INCDIR}/lora"
 
-CFLAGS += "-I${LGW_INC} -Iinc -I."
+CFLAGS += "-I${LGW_INC} -Iinc -I. -std=gnu11 "
 
 do_compile() {
   oe_runmake
-- 
cgit v1.2.3


From 0be295f0fafb6e3333670bf6e1ecb45889d9d5c6 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 27 Mar 2017 16:11:38 -0500
Subject: Tie the nodejs level to the minor level, not the micro.

---
 conf/distro/mlinux.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index 17b68c0..aa4b1ea 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -72,7 +72,7 @@ PREFERRED_PROVIDER_jpeg = "jpeg"
 PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
 require java.inc
 
-PREFERRED_VERSION_nodejs ?= "0.10.44"
-PREFERRED_VERSION_nodejs-native ?= "0.10.44"
+PREFERRED_VERSION_nodejs ?= "0.10.%"
+PREFERRED_VERSION_nodejs-native ?= "0.10.%"
 
 PREFERRED_VERSION_gpsd ?= "3.16"
-- 
cgit v1.2.3


From 743fda56318bb7219f9cb419322615efa042c0b8 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 28 Mar 2017 09:26:49 -0500
Subject: Remove incompatible libesmtp recipe - switching to meta-openembedded

---
 recipes-support/libesmtp/libesmtp_1.0.6.bb  | 25 -------------------------
 recipes-support/libesmtp/libesmtp_1.0.6.bxb | 25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 recipes-support/libesmtp/libesmtp_1.0.6.bb
 create mode 100644 recipes-support/libesmtp/libesmtp_1.0.6.bxb

diff --git a/recipes-support/libesmtp/libesmtp_1.0.6.bb b/recipes-support/libesmtp/libesmtp_1.0.6.bb
deleted file mode 100644
index e421e63..0000000
--- a/recipes-support/libesmtp/libesmtp_1.0.6.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "LibESMTP is a library to manage posting \
-(or submission of) electronic mail using SMTP to a \
-preconfigured Mail Transport Agent (MTA) such as Exim or PostFix."
-LICENSE = "LGPLv2.1 GPLv2"
-LIC_FILES_CHKSUM= "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
-                   file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06 \
-"
-SECTION = "libs/network"
-DEPENDS = "openssl"
-PR = "r0"
-
-SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2"
-
-inherit autotools binconfig
-
-EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.."
-
-FILES_${PN} = "${libdir}/lib*${SOLIBS} \
-		${libdir}/esmtp-plugins/*${SOLIBSDEV}"
-FILES_${PN}-dev  += "${libdir}/esmtp-plugins/*.la"
-FILES_${PN}-staticdev += "${libdir}/esmtp-plugins/*.a"
-FILES_${PN}-dbg += "${libdir}/esmtp-plugins/.debug/"
-
-SRC_URI[md5sum] = "bf3915e627fd8f35524a8fdfeed979c8"
-SRC_URI[sha256sum] = "d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b"
diff --git a/recipes-support/libesmtp/libesmtp_1.0.6.bxb b/recipes-support/libesmtp/libesmtp_1.0.6.bxb
new file mode 100644
index 0000000..e421e63
--- /dev/null
+++ b/recipes-support/libesmtp/libesmtp_1.0.6.bxb
@@ -0,0 +1,25 @@
+DESCRIPTION = "LibESMTP is a library to manage posting \
+(or submission of) electronic mail using SMTP to a \
+preconfigured Mail Transport Agent (MTA) such as Exim or PostFix."
+LICENSE = "LGPLv2.1 GPLv2"
+LIC_FILES_CHKSUM= "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                   file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06 \
+"
+SECTION = "libs/network"
+DEPENDS = "openssl"
+PR = "r0"
+
+SRC_URI = "http://www.stafford.uklinux.net/libesmtp/libesmtp-${PV}.tar.bz2"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.."
+
+FILES_${PN} = "${libdir}/lib*${SOLIBS} \
+		${libdir}/esmtp-plugins/*${SOLIBSDEV}"
+FILES_${PN}-dev  += "${libdir}/esmtp-plugins/*.la"
+FILES_${PN}-staticdev += "${libdir}/esmtp-plugins/*.a"
+FILES_${PN}-dbg += "${libdir}/esmtp-plugins/.debug/"
+
+SRC_URI[md5sum] = "bf3915e627fd8f35524a8fdfeed979c8"
+SRC_URI[sha256sum] = "d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b"
-- 
cgit v1.2.3


From 127e2c487872eb9ca664084c568549289f23800e Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 28 Mar 2017 12:21:20 -0500
Subject: Merge mLinux mosquitto recipe with Yocto MQTT 3.1

---
 recipes-connectivity/mosquitto/mosquitto_1.4.bb | 26 ++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/recipes-connectivity/mosquitto/mosquitto_1.4.bb b/recipes-connectivity/mosquitto/mosquitto_1.4.bb
index 3f035a7..4403643 100644
--- a/recipes-connectivity/mosquitto/mosquitto_1.4.bb
+++ b/recipes-connectivity/mosquitto/mosquitto_1.4.bb
@@ -1,3 +1,6 @@
+# This recipe was a merger of the Multitech Daisy 3.5 Recipe with the
+# reciped found at:
+# http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-iot-middleware/plain/recipes-connectivity/mosquitto/mosquitto_1.4.10.bb
 SUMMARY = "Open source MQTT v3.5 implemention"
 DESCRIPTION = "Mosquitto is an open source (BSD licensed) message broker that implements the MQ Telemetry Transport protocol version 3.5. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. "
 HOMEPAGE = "http://mosquitto.org/"
@@ -8,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20"
 # util-linux is needed to provide libuuid dependancy
 DEPENDS = "c-ares openssl util-linux"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://mosquitto.org/files/source/${PN}-${PV}.tar.gz \
            file://mosquitto.init \
@@ -21,13 +24,18 @@ SRC_URI = "http://mosquitto.org/files/source/${PN}-${PV}.tar.gz \
 SRC_URI[md5sum] = "cd879f5964311501ba8e2275add71484"
 SRC_URI[sha256sum] = "591f3adcb6ed92c01f7ace1c878af728b797fe836892535620aa6106f42dbcc6"
 
-inherit autotools update-rc.d
-
-INITSCRIPT_NAME = "mosquitto"
-INITSCRIPT_PARAMS = "defaults 70 30"
+export LIB_SUFFIX="${@d.getVar('baselib', True).replace('lib', '')}"
+#inherit autotools update-rc.d
 
+#INITSCRIPT_NAME = "mosquitto"
+#INITSCRIPT_PARAMS = "defaults 70 30"
+do_compile() {
+    oe_runmake PREFIX=/usr
+}
 do_install() {
-    oe_runmake DESTDIR=${D} prefix=/usr install
+    # oe_runmake DESTDIR=${D} prefix=/usr install
+	oe_runmake install DESTDIR=${D}
+	install -m 0755 -d ${D}/usr/lib
     install -m 0644 lib/libmosquitto.a ${D}${libdir}/
 
     install -d ${D}${sysconfdir}/init.d
@@ -45,7 +53,8 @@ PACKAGES += "libmosquitto1 libmosquittopp1 ${PN}-clients ${PN}-python"
 CONFFILES_${PN} = "${sysconfdir}/mosquitto.conf ${sysconfdir}/default/mosquitto"
 FILES_${PN} = "${sbindir}/mosquitto \
                ${bindir}/mosquitto_passwd \
-               ${sysconfdir} \
+               ${sysconfdir}/mosquitto \
+               ${systemd_unitdir}/system/mosquitto.service \
 "
 
 FILES_libmosquitto1 = "${libdir}/libmosquitto.so.1"
@@ -60,3 +69,6 @@ FILES_${PN}-staticdev += "${libdir}/libmosquitto.a"
 
 FILES_${PN}-python = "/usr/lib/python2.7/site-packages"
 
+inherit systemd
+
+SYSTEMD_SERVICE_${PN} = "mosquitto.service"
-- 
cgit v1.2.3


From 2efebad5a69814f99104323a5e47acf123ae78ca Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 29 Mar 2017 10:07:16 -0500
Subject: mosquitto license error

---
 recipes-connectivity/mosquitto/mosquitto_1.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-connectivity/mosquitto/mosquitto_1.4.bb b/recipes-connectivity/mosquitto/mosquitto_1.4.bb
index 4403643..653fdf8 100644
--- a/recipes-connectivity/mosquitto/mosquitto_1.4.bb
+++ b/recipes-connectivity/mosquitto/mosquitto_1.4.bb
@@ -5,7 +5,7 @@ SUMMARY = "Open source MQTT v3.5 implemention"
 DESCRIPTION = "Mosquitto is an open source (BSD licensed) message broker that implements the MQ Telemetry Transport protocol version 3.5. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. "
 HOMEPAGE = "http://mosquitto.org/"
 SECTION = "console/network"
-LICENSE = "EPL-1.0 EDL-1.0"
+LICENSE = "EPL-1.0 & EDL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=62ddc846179e908dc0c8efec4a42ef20"
 
 # util-linux is needed to provide libuuid dependancy
-- 
cgit v1.2.3


From d621cca0b2536105a29a572a4cd0ca40d5165264 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 29 Mar 2017 14:34:16 -0500
Subject: libmpsse autotools_brokensep

---
 recipes-support/libmpsse/libmpsse_1.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-support/libmpsse/libmpsse_1.3.bb b/recipes-support/libmpsse/libmpsse_1.3.bb
index e534281..f1d9723 100644
--- a/recipes-support/libmpsse/libmpsse_1.3.bb
+++ b/recipes-support/libmpsse/libmpsse_1.3.bb
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "08f2a0025074720d40e29430089b1ab78d764756cc5d2bcb3148d98131
 
 S = "${WORKDIR}/libmpsse-${PV}/src"
 
-inherit autotools
+inherit autotools-brokensep
 
 EXTRA_OECONF += "--disable-python"
 CFLAGS += "-DLIBFTDI1=1"
-- 
cgit v1.2.3


From 0206a6df152114d83f25e8f558df249cf9ba7a2e Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 30 Mar 2017 16:40:49 -0500
Subject: sms-utils autotools_brokensep

---
 recipes-extended/multitech/sms-utils.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/multitech/sms-utils.inc b/recipes-extended/multitech/sms-utils.inc
index 9deea31..5a13eff 100644
--- a/recipes-extended/multitech/sms-utils.inc
+++ b/recipes-extended/multitech/sms-utils.inc
@@ -10,7 +10,7 @@ SRCREV = "${PV}"
 SRC_URI = "git://git.multitech.net/sms-utils.git;protocol=git"
 S = "${WORKDIR}/git"
 
-inherit autotools
+inherit autotools-brokensep
 
 PARALLEL_MAKE = ""
 
-- 
cgit v1.2.3


From f923325d9ddc6c9487b8d217c391658699dd2256 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 30 Mar 2017 16:44:49 -0500
Subject: uvccapture autotools_brokensep

---
 recipes-extended/uvccapture/uvccapture_0.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/uvccapture/uvccapture_0.5.bb b/recipes-extended/uvccapture/uvccapture_0.5.bb
index 57fe424..92e781e 100644
--- a/recipes-extended/uvccapture/uvccapture_0.5.bb
+++ b/recipes-extended/uvccapture/uvccapture_0.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM="file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 PR = "r1"
 
-inherit autotools
+inherit autotools-brokensep
 
 SRC_URI = "http://staticwave.ca/source/uvccapture/${PN}-${PV}.tar.bz2 \
 		   file://uvccapture_use_videodev2.patch \
-- 
cgit v1.2.3


From 023383fc98da6a34b8eba7cbcde380e0a967a220 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 30 Mar 2017 17:10:04 -0500
Subject: Lora needs build directory location for Krogoth

---
 recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb | 1 +
 recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
index 7ca1ffb..903d1e5 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
@@ -23,6 +23,7 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
 "
 
 S = "${WORKDIR}/git"
+B = "${S}"
 
 LORA_DIR = "/opt/lora"
 
diff --git a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
index a4e625f..33c24a0 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
@@ -27,6 +27,7 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
 
 
 S = "${WORKDIR}/git"
+B = "${S}"
 
 LORA_DIR = "/opt/lora"
 
-- 
cgit v1.2.3


From 18ce886647f912cc77cd1f78236061f9ba0b5db0 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 3 Apr 2017 12:47:22 -0500
Subject: Use make with e option and add gnu11 as C standard

---
 recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb | 4 +++-
 recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb     | 2 +-
 recipes-ruby/ruby-serialport/ruby-serialport_1.1.0.bb        | 1 +
 recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb              | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
index 903d1e5..00aaad9 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
@@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45"
 DEPENDS = "lora-gateway-usb"
 PR = "r10"
 
+EXTRA_OEMAKE = " -e"
+
 # tag v1.4.1
 SRCREV = "0011a60759a7d81656a5393e97089daab1ff1a81"
 
@@ -30,7 +32,7 @@ LORA_DIR = "/opt/lora"
 export LGW_PATH = "${STAGING_LIBDIR}/lora-usb"
 export LGW_INC = "${STAGING_INCDIR}/lora-usb"
 
-CFLAGS += "-I${LGW_INC} -Iinc -I."
+CFLAGS += "-I${LGW_INC} -Iinc -I. -std=gnu11"
 
 do_compile() {
 	oe_runmake
diff --git a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
index 33c24a0..06b96ee 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
@@ -34,7 +34,7 @@ LORA_DIR = "/opt/lora"
 export LGW_PATH = "${STAGING_LIBDIR}/lora"
 export LGW_INC = "${STAGING_INCDIR}/lora"
 
-CFLAGS += "-I${LGW_INC} -Iinc -I. -std=gnu11 "
+CFLAGS += "-I${LGW_INC} -Iinc -I. -std=gnu11"
 
 do_compile() {
   oe_runmake
diff --git a/recipes-ruby/ruby-serialport/ruby-serialport_1.1.0.bb b/recipes-ruby/ruby-serialport/ruby-serialport_1.1.0.bb
index a020f90..f00c45c 100644
--- a/recipes-ruby/ruby-serialport/ruby-serialport_1.1.0.bb
+++ b/recipes-ruby/ruby-serialport/ruby-serialport_1.1.0.bb
@@ -15,6 +15,7 @@ SRCREV = "709e385f6d20aaadc7f3252af59250336d27e607"
 SRC_URI = "git://github.com/hparra/ruby-serialport.git;protocol=git"
 
 S = "${WORKDIR}/git"
+B = "${S}"
 
 do_compile() {
   ${CC} ${CFLAGS} ${LDFLAGS} -Iext/native -I${STAGING_INCDIR}/ruby-1.9.1 -I${STAGING_INCDIR}/ruby-1.9.1/arm-linux-eabi -c ext/native/*.c
diff --git a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb
index b3210e6..d0cb2b6 100644
--- a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb
+++ b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb
@@ -12,6 +12,7 @@ PR = "r0"
 SRC_URI = "git://github.com/luislavena/sqlite3-ruby.git;tag=v${PV};protocol=git"
 
 S = "${WORKDIR}/git"
+B = "${S}"
 
 do_compile() {
   ${CC} ${CFLAGS} ${LDFLAGS} -Iext/sqlite3 -Iext/native -I${STAGING_INCDIR}/ruby-1.9.1 -I${STAGING_INCDIR}/ruby-1.9.1/arm-linux-eabi -c ext/sqlite3/*.c
-- 
cgit v1.2.3


From 0f2dca7de250ebb262e4d6e305b15008cc354281 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 3 Apr 2017 14:54:24 -0500
Subject: make ruby-sqlite3 compatible with new ruby/sqlite3

---
 recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb | 32 ++++++++++++++++++++++++
 recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb  | 29 ---------------------
 2 files changed, 32 insertions(+), 29 deletions(-)
 create mode 100644 recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
 delete mode 100644 recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb

diff --git a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
new file mode 100644
index 0000000..fa1ff9e
--- /dev/null
+++ b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Ruby bindings for the SQLite3 embedded database"
+HOMEPAGE = "https://github.com/sparklemotion/sqlite3-ruby"
+LICENSE = "custom-freely-distributable"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=f24ce0d57c8f8576a36e2803d35bcfec"
+SECTION = "console/utils"
+PRIORITY = "optional"
+DEPENDS = "ruby sqlite3"
+
+PR = "r0"
+
+SRC_URI = "git://github.com/sparklemotion/sqlite3-ruby.git;tag=v${PV};branch=1-3-stable;protocol=git"
+
+S = "${WORKDIR}/git"
+B = "${S}"
+
+# RUBY_VERSION
+do_compile() {
+  fn=$(ls ${STAGING_INCDIR}/ruby-*/ruby.h | head -1)
+  pn=$(dirname $fn)
+  pn2=$(ls -d ${STAGING_INCDIR}/ruby-*/arm-linux-*)
+  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/sqlite3 -Iext/native -I${pn} -I${pn2} -c ext/sqlite3/*.c
+  ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/sqlite3/sqlite3_native.so *.o -lsqlite3
+}
+
+do_install() {
+  install -d ${D}${libdir}/ruby ${D}${libdir}/ruby/sqlite3
+  install lib/sqlite3.rb ${D}${libdir}/ruby/sqlite3.rb
+  install lib/sqlite3/* ext/sqlite3/sqlite3_native.so -t ${D}${libdir}/ruby/sqlite3
+}
+
+FILES_${PN} = "${libdir}/ruby/sqlite3*"
+FILES_${PN}-dbg += "${libdir}/ruby/sqlite3/.debug*"
diff --git a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb
deleted file mode 100644
index d0cb2b6..0000000
--- a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.7.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "Ruby bindings for the SQLite3 embedded database"
-HOMEPAGE = "https://github.com/luislavena/sqlite3-ruby"
-LICENSE = "custom-freely-distributable"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=f24ce0d57c8f8576a36e2803d35bcfec"
-SECTION = "console/utils"
-PRIORITY = "optional"
-
-DEPENDS = "ruby sqlite3"
-
-PR = "r0"
-
-SRC_URI = "git://github.com/luislavena/sqlite3-ruby.git;tag=v${PV};protocol=git"
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-do_compile() {
-  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/sqlite3 -Iext/native -I${STAGING_INCDIR}/ruby-1.9.1 -I${STAGING_INCDIR}/ruby-1.9.1/arm-linux-eabi -c ext/sqlite3/*.c
-  ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/sqlite3/sqlite3_native.so *.o -lsqlite3
-}
-
-do_install() {
-  install -d ${D}${libdir}/ruby ${D}${libdir}/ruby/sqlite3
-  install lib/sqlite3.rb ${D}${libdir}/ruby/sqlite3.rb
-  install lib/sqlite3/* ext/sqlite3/sqlite3_native.so -t ${D}${libdir}/ruby/sqlite3
-}
-
-FILES_${PN} = "${libdir}/ruby/sqlite3*"
-FILES_${PN}-dbg += "${libdir}/ruby/sqlite3/.debug*"
-- 
cgit v1.2.3


From 6160f537666c4c6ab443e70856f72898db0ed031 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 11 Apr 2017 11:12:26 -0500
Subject: Fix FILESEXTRAPATHS_prepend

---
 recipes-extended/lighttpd/lighttpd_%.bbappend      |  2 +-
 .../ruby-serialport/ruby-serialport_1.1.0.bb       | 32 ----------------------
 .../ruby-serialport/ruby-serialport_1.3.0.bb       | 32 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 recipes-ruby/ruby-serialport/ruby-serialport_1.1.0.bb
 create mode 100644 recipes-ruby/ruby-serialport/ruby-serialport_1.3.0.bb

diff --git a/recipes-extended/lighttpd/lighttpd_%.bbappend b/recipes-extended/lighttpd/lighttpd_%.bbappend
index 473a113..8171f17 100644
--- a/recipes-extended/lighttpd/lighttpd_%.bbappend
+++ b/recipes-extended/lighttpd/lighttpd_%.bbappend
@@ -6,7 +6,7 @@ RDEPENDS_${PN} += " openssl logrotate "
 
 EXTRA_OECONF += "--with-openssl"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://lighttpd.logrotate.conf \
 			file://lighttpd.default"
diff --git a/recipes-ruby/ruby-serialport/ruby-serialport_1.1.0.bb b/recipes-ruby/ruby-serialport/ruby-serialport_1.1.0.bb
deleted file mode 100644
index f00c45c..0000000
--- a/recipes-ruby/ruby-serialport/ruby-serialport_1.1.0.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "A Ruby library that provides a class for using RS-232 serial ports"
-HOMEPAGE = "https://github.com/hparra/ruby-serialport"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
-SECTION = "console/utils"
-PRIORITY = "optional"
-
-DEPENDS = "ruby"
-
-PR = "r2"
-
-# tag v1.1.0
-SRCREV = "709e385f6d20aaadc7f3252af59250336d27e607"
-
-SRC_URI = "git://github.com/hparra/ruby-serialport.git;protocol=git"
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-do_compile() {
-  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/native -I${STAGING_INCDIR}/ruby-1.9.1 -I${STAGING_INCDIR}/ruby-1.9.1/arm-linux-eabi -c ext/native/*.c
-  ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/native/serialport.so serialport.o posix_serialport_impl.o
-}
-
-do_install() {
-  install -d ${D}${libdir}/ruby/serialport
-  install lib/serialport.rb ${D}${libdir}/ruby/serialport.rb
-  install ext/native/serialport.so -t ${D}${libdir}/ruby
-}
-
-FILES_${PN} = "${libdir}/ruby/serialport*"
-FILES_${PN}-dbg += "${libdir}/ruby/.debug"
diff --git a/recipes-ruby/ruby-serialport/ruby-serialport_1.3.0.bb b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.0.bb
new file mode 100644
index 0000000..f00c45c
--- /dev/null
+++ b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.0.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "A Ruby library that provides a class for using RS-232 serial ports"
+HOMEPAGE = "https://github.com/hparra/ruby-serialport"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+SECTION = "console/utils"
+PRIORITY = "optional"
+
+DEPENDS = "ruby"
+
+PR = "r2"
+
+# tag v1.1.0
+SRCREV = "709e385f6d20aaadc7f3252af59250336d27e607"
+
+SRC_URI = "git://github.com/hparra/ruby-serialport.git;protocol=git"
+
+S = "${WORKDIR}/git"
+B = "${S}"
+
+do_compile() {
+  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/native -I${STAGING_INCDIR}/ruby-1.9.1 -I${STAGING_INCDIR}/ruby-1.9.1/arm-linux-eabi -c ext/native/*.c
+  ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/native/serialport.so serialport.o posix_serialport_impl.o
+}
+
+do_install() {
+  install -d ${D}${libdir}/ruby/serialport
+  install lib/serialport.rb ${D}${libdir}/ruby/serialport.rb
+  install ext/native/serialport.so -t ${D}${libdir}/ruby
+}
+
+FILES_${PN} = "${libdir}/ruby/serialport*"
+FILES_${PN}-dbg += "${libdir}/ruby/.debug"
-- 
cgit v1.2.3


From ee18b442388c36edd3f12e2249d0a59639857e13 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 11 Apr 2017 16:37:07 -0500
Subject: Gets us to the GCC compatibility bug

---
 recipes-ruby/ruby-serialport/ruby-serialport_1.3.0.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/recipes-ruby/ruby-serialport/ruby-serialport_1.3.0.bb b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.0.bb
index f00c45c..6767e55 100644
--- a/recipes-ruby/ruby-serialport/ruby-serialport_1.3.0.bb
+++ b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.0.bb
@@ -18,8 +18,11 @@ S = "${WORKDIR}/git"
 B = "${S}"
 
 do_compile() {
-  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/native -I${STAGING_INCDIR}/ruby-1.9.1 -I${STAGING_INCDIR}/ruby-1.9.1/arm-linux-eabi -c ext/native/*.c
-  ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/native/serialport.so serialport.o posix_serialport_impl.o
+  ls -d ${STAGING_INCDIR}/ruby-* >/tmp/ruby.txt
+  rp=$(ls -d ${STAGING_INCDIR}/ruby-* | head -1)
+  echo ${rp} >/tmp/ruby2.txt
+  ${CC} -v ${CFLAGS} ${LDFLAGS} -Iext/native -I${rp} -I${rp}/arm-linux-gnueabi -c ext/native/*.c
+  ${CC} -v ${CFLAGS} ${LDFLAGS} --shared -o ext/native/serialport.so serialport.o posix_serialport_impl.o
 }
 
 do_install() {
-- 
cgit v1.2.3


From c9515b69abd1fcf8182c930651e9677d249a8212 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 11 Apr 2017 17:14:40 -0500
Subject: Need ruby-serialport 1.3.1 to avoid gcc errors

---
 .../ruby-serialport/ruby-serialport_1.3.0.bb       | 35 ----------------------
 .../ruby-serialport/ruby-serialport_1.3.1.bb       | 35 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 35 deletions(-)
 delete mode 100644 recipes-ruby/ruby-serialport/ruby-serialport_1.3.0.bb
 create mode 100644 recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb

diff --git a/recipes-ruby/ruby-serialport/ruby-serialport_1.3.0.bb b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.0.bb
deleted file mode 100644
index 6767e55..0000000
--- a/recipes-ruby/ruby-serialport/ruby-serialport_1.3.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "A Ruby library that provides a class for using RS-232 serial ports"
-HOMEPAGE = "https://github.com/hparra/ruby-serialport"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
-SECTION = "console/utils"
-PRIORITY = "optional"
-
-DEPENDS = "ruby"
-
-PR = "r2"
-
-# tag v1.1.0
-SRCREV = "709e385f6d20aaadc7f3252af59250336d27e607"
-
-SRC_URI = "git://github.com/hparra/ruby-serialport.git;protocol=git"
-
-S = "${WORKDIR}/git"
-B = "${S}"
-
-do_compile() {
-  ls -d ${STAGING_INCDIR}/ruby-* >/tmp/ruby.txt
-  rp=$(ls -d ${STAGING_INCDIR}/ruby-* | head -1)
-  echo ${rp} >/tmp/ruby2.txt
-  ${CC} -v ${CFLAGS} ${LDFLAGS} -Iext/native -I${rp} -I${rp}/arm-linux-gnueabi -c ext/native/*.c
-  ${CC} -v ${CFLAGS} ${LDFLAGS} --shared -o ext/native/serialport.so serialport.o posix_serialport_impl.o
-}
-
-do_install() {
-  install -d ${D}${libdir}/ruby/serialport
-  install lib/serialport.rb ${D}${libdir}/ruby/serialport.rb
-  install ext/native/serialport.so -t ${D}${libdir}/ruby
-}
-
-FILES_${PN} = "${libdir}/ruby/serialport*"
-FILES_${PN}-dbg += "${libdir}/ruby/.debug"
diff --git a/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb
new file mode 100644
index 0000000..c0510e9
--- /dev/null
+++ b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "A Ruby library that provides a class for using RS-232 serial ports"
+HOMEPAGE = "https://github.com/hparra/ruby-serialport"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
+SECTION = "console/utils"
+PRIORITY = "optional"
+
+DEPENDS = "ruby"
+
+PR = "r2"
+
+# tag v1.3.0
+SRCREV = "2781dbb1ffbf33d7c65478aa25dad5f954d0d3bf"
+
+SRC_URI = "git://github.com/hparra/ruby-serialport.git;protocol=git"
+
+S = "${WORKDIR}/git"
+B = "${S}"
+
+do_compile() {
+  ls -d ${STAGING_INCDIR}/ruby-* >/tmp/ruby.txt
+  rp=$(ls -d ${STAGING_INCDIR}/ruby-* | head -1)
+  echo ${rp} >/tmp/ruby2.txt
+  ${CC} -v ${CFLAGS} ${LDFLAGS} -Iext/native -I${rp} -I${rp}/arm-linux-gnueabi -c ext/native/*.c
+  ${CC} -v ${CFLAGS} ${LDFLAGS} --shared -o ext/native/serialport.so serialport.o posix_serialport_impl.o
+}
+
+do_install() {
+  install -d ${D}${libdir}/ruby/serialport
+  install lib/serialport.rb ${D}${libdir}/ruby/serialport.rb
+  install ext/native/serialport.so -t ${D}${libdir}/ruby
+}
+
+FILES_${PN} = "${libdir}/ruby/serialport*"
+FILES_${PN}-dbg += "${libdir}/ruby/.debug"
-- 
cgit v1.2.3


From 5e19029437fa71ef531f53ccbb76d8791d69d89f Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 13 Apr 2017 10:40:36 -0500
Subject: Fix autossh broken autotools build

---
 recipes-extended/autossh/autossh_1.4c.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-extended/autossh/autossh_1.4c.bb b/recipes-extended/autossh/autossh_1.4c.bb
index b40b53f..c314093 100644
--- a/recipes-extended/autossh/autossh_1.4c.bb
+++ b/recipes-extended/autossh/autossh_1.4c.bb
@@ -4,6 +4,7 @@ LICENSE = "custom-freely-distributable"
 LIC_FILES_CHKSUM = "file://autossh.c;start_line=10;end_line=22;md5=60abb4e02db9c8a062426f574d2fccae"
 SECTION = "console/utils"
 PRIORITY = "optional"
+inherit autotools-brokensep
 
 PR = "r1"
 
-- 
cgit v1.2.3


From 6836446cf59587119441a2d444585f40ceec3831 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 17 Apr 2017 15:06:02 -0500
Subject: Put mosquitto in /usr not /usr/local

---
 .../mosquitto/mosquitto/config_mk.patch            | 12 ++++++
 recipes-connectivity/mosquitto/mosquitto_1.4.bb    |  3 ++
 recipes-extended/monit/monit_5.12.2.bb             | 43 ----------------------
 recipes-extended/monit/monit_5.21.0.bb             | 43 ++++++++++++++++++++++
 4 files changed, 58 insertions(+), 43 deletions(-)
 create mode 100644 recipes-connectivity/mosquitto/mosquitto/config_mk.patch
 delete mode 100644 recipes-extended/monit/monit_5.12.2.bb
 create mode 100644 recipes-extended/monit/monit_5.21.0.bb

diff --git a/recipes-connectivity/mosquitto/mosquitto/config_mk.patch b/recipes-connectivity/mosquitto/mosquitto/config_mk.patch
new file mode 100644
index 0000000..8c0494e
--- /dev/null
+++ b/recipes-connectivity/mosquitto/mosquitto/config_mk.patch
@@ -0,0 +1,12 @@
+diff -Naur old/config.mk new/config.mk
+--- old/config.mk	2017-04-17 14:33:32.504351936 -0500
++++ new/config.mk	2017-04-17 14:34:27.061557282 -0500
+@@ -240,7 +240,7 @@
+ endif
+ 
+ INSTALL?=install
+-prefix=/usr/local
++prefix=/usr
+ mandir=${prefix}/share/man
+ localedir=${prefix}/share/locale
+ STRIP?=strip
diff --git a/recipes-connectivity/mosquitto/mosquitto_1.4.bb b/recipes-connectivity/mosquitto/mosquitto_1.4.bb
index 653fdf8..133a0e0 100644
--- a/recipes-connectivity/mosquitto/mosquitto_1.4.bb
+++ b/recipes-connectivity/mosquitto/mosquitto_1.4.bb
@@ -1,6 +1,7 @@
 # This recipe was a merger of the Multitech Daisy 3.5 Recipe with the
 # reciped found at:
 # http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-iot-middleware/plain/recipes-connectivity/mosquitto/mosquitto_1.4.10.bb
+inherit autotools-brokensep
 SUMMARY = "Open source MQTT v3.5 implemention"
 DESCRIPTION = "Mosquitto is an open source (BSD licensed) message broker that implements the MQ Telemetry Transport protocol version 3.5. MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model. "
 HOMEPAGE = "http://mosquitto.org/"
@@ -19,6 +20,7 @@ SRC_URI = "http://mosquitto.org/files/source/${PN}-${PV}.tar.gz \
            file://mosquitto.default \
            file://mosquitto.logrotate.conf \
            file://nostrip.patch \
+           file://config_mk.patch \
            "
 
 SRC_URI[md5sum] = "cd879f5964311501ba8e2275add71484"
@@ -55,6 +57,7 @@ FILES_${PN} = "${sbindir}/mosquitto \
                ${bindir}/mosquitto_passwd \
                ${sysconfdir}/mosquitto \
                ${systemd_unitdir}/system/mosquitto.service \
+               ${sysconfdir}/ \
 "
 
 FILES_libmosquitto1 = "${libdir}/libmosquitto.so.1"
diff --git a/recipes-extended/monit/monit_5.12.2.bb b/recipes-extended/monit/monit_5.12.2.bb
deleted file mode 100644
index ddd2ea9..0000000
--- a/recipes-extended/monit/monit_5.12.2.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "Monit"
-HOMEPAGE = "http://mmonit.com/"
-LICENSE = "AGPL-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51"
-DEPENDS = "libpam"
-
-PR = "r1"
-
-SRC_URI = "http://mmonit.com/monit/dist/monit-5.12.2.tar.gz \
-           file://monitrc \
-           file://monit.init \
-           file://monit.default \
-           "
-
-SRC_URI[md5sum] = "5f5cf4c18b42e8091b49b4e07cf972ce"
-SRC_URI[sha256sum] = "8ab0296d1aa2351b1573481592d7b5e06de1edd49dff1b5552839605a450914c"
-
-inherit autotools
-
-EXTRA_OECONF += "--with-ssl-lib-dir=${STAGING_LIBDIR} \
-                --with-ssl-incl-dir=${STAGING_INCDIR} \
-                "
-
-EXTRA_OECONF_append_armv5 = " libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes "
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "monit"
-INITSCRIPT_PARAMS = "defaults 99 10"
-
-do_install_append() {
-    install -d ${D}${sysconfdir}
-    install -d ${D}${sysconfdir}/monit.d
-    install -m 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/
-
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/monit.init ${D}${sysconfdir}/init.d/monit
-
-    install -d ${D}${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/monit.default ${D}${sysconfdir}/default/monit
-}
-
-CONFFILES_${PN} += "${sysconfdir}/monitrc ${sysconfdir}/default/monit"
diff --git a/recipes-extended/monit/monit_5.21.0.bb b/recipes-extended/monit/monit_5.21.0.bb
new file mode 100644
index 0000000..ddd2ea9
--- /dev/null
+++ b/recipes-extended/monit/monit_5.21.0.bb
@@ -0,0 +1,43 @@
+DESCRIPTION = "Monit"
+HOMEPAGE = "http://mmonit.com/"
+LICENSE = "AGPL-3.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51"
+DEPENDS = "libpam"
+
+PR = "r1"
+
+SRC_URI = "http://mmonit.com/monit/dist/monit-5.12.2.tar.gz \
+           file://monitrc \
+           file://monit.init \
+           file://monit.default \
+           "
+
+SRC_URI[md5sum] = "5f5cf4c18b42e8091b49b4e07cf972ce"
+SRC_URI[sha256sum] = "8ab0296d1aa2351b1573481592d7b5e06de1edd49dff1b5552839605a450914c"
+
+inherit autotools
+
+EXTRA_OECONF += "--with-ssl-lib-dir=${STAGING_LIBDIR} \
+                --with-ssl-incl-dir=${STAGING_INCDIR} \
+                "
+
+EXTRA_OECONF_append_armv5 = " libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes "
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "monit"
+INITSCRIPT_PARAMS = "defaults 99 10"
+
+do_install_append() {
+    install -d ${D}${sysconfdir}
+    install -d ${D}${sysconfdir}/monit.d
+    install -m 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/
+
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/monit.init ${D}${sysconfdir}/init.d/monit
+
+    install -d ${D}${sysconfdir}/default
+    install -m 0644 ${WORKDIR}/monit.default ${D}${sysconfdir}/default/monit
+}
+
+CONFFILES_${PN} += "${sysconfdir}/monitrc ${sysconfdir}/default/monit"
-- 
cgit v1.2.3


From 2bb02ff02e2d600190c18646dc76cdfccf1ec5a0 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 17 Apr 2017 16:46:33 -0500
Subject: Fix Lora license to be compatible with Yocto 2.1

---
 recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb       | 2 +-
 recipes-connectivity/lora/lora-gateway_4.1.3.bb              | 2 +-
 recipes-connectivity/lora/lora-network-server_1.0.32.bb      | 2 +-
 recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb | 2 +-
 recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb     | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb b/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb
index 382328d..e7e5fed 100644
--- a/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb
+++ b/recipes-connectivity/lora/lora-gateway-usb_1.7.0mts.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://www.semtech.com/"
 PRIORITY = "optional"
 SECTION = "console/utils"
 # Semtech license is a modified BSD-style license
-LICENSE = "SEMTECH"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb"
 DEPENDS = "libftdi libmpsse libusb1"
 INC_PR = "r9"
diff --git a/recipes-connectivity/lora/lora-gateway_4.1.3.bb b/recipes-connectivity/lora/lora-gateway_4.1.3.bb
index 6c3214b..9a471ac 100644
--- a/recipes-connectivity/lora/lora-gateway_4.1.3.bb
+++ b/recipes-connectivity/lora/lora-gateway_4.1.3.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/Lora-net/lora_gateway"
 PRIORITY = "optional"
 SECTION = "console/utils"
 # Semtech license is a modified BSD-style license
-LICENSE = "SEMTECH"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=a2bdef95625509f821ba00460e3ae0eb"
 DEPENDS = ""
 PR = "r10"
diff --git a/recipes-connectivity/lora/lora-network-server_1.0.32.bb b/recipes-connectivity/lora/lora-network-server_1.0.32.bb
index 0ae96f6..3038f85 100644
--- a/recipes-connectivity/lora/lora-network-server_1.0.32.bb
+++ b/recipes-connectivity/lora/lora-network-server_1.0.32.bb
@@ -4,7 +4,7 @@ SECTION = "console/utils"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7ffae4666a986c4ccf45e99e464f8402"
 DEPENDS = "jsoncpp libmts mosquitto sqlite3"
-RDEPENDS_${PN} += "lora-packet-forwarder logrotate"
+RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash"
 PR = "r1"
 
 SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \
diff --git a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
index 00aaad9..bfa21ff 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder-usb_1.4.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/Lora-net"
 PRIORITY = "optional"
 SECTION = "console/utils"
 # Semtech license is a modified BSD-style license
-LICENSE = "SEMTECH"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45"
 DEPENDS = "lora-gateway-usb"
 PR = "r10"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
index 06b96ee..b536309 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
@@ -3,9 +3,10 @@ HOMEPAGE = "https://github.com/Lora-net/packet_forwarder"
 PRIORITY = "optional"
 SECTION = "console/utils"
 # Semtech license is a modified BSD-style license
-LICENSE = "SEMTECH"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=22af7693d7b76ef0fc76161c4be76c45"
 DEPENDS = "lora-gateway"
+RDEPENDS_${PN} += "bash"
 PR = "r9"
 
 SRCREV = "v${PV}"
-- 
cgit v1.2.3


From 4979ec261513b5dae7da34fe9a1b8f35de4a72c7 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 17 Apr 2017 16:47:20 -0500
Subject: Fix autossh license to be compatible with Yocto 2.1

---
 recipes-extended/autossh/autossh_1.4c.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/autossh/autossh_1.4c.bb b/recipes-extended/autossh/autossh_1.4c.bb
index c314093..8ba78f8 100644
--- a/recipes-extended/autossh/autossh_1.4c.bb
+++ b/recipes-extended/autossh/autossh_1.4c.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Keeps ssh tunnels alive"
 HOMEPAGE = "http://www.harding.motd.ca/autossh"
-LICENSE = "custom-freely-distributable"
+LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://autossh.c;start_line=10;end_line=22;md5=60abb4e02db9c8a062426f574d2fccae"
 SECTION = "console/utils"
 PRIORITY = "optional"
-- 
cgit v1.2.3


From 0641240a3fe5f3dd0856c9a24aa1b13e98c56e59 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 19 Apr 2017 14:19:26 -0500
Subject: logrotate and openjdk-8

---
 conf/distro/java.inc                               |  12 +-
 recipes-core/images/mlinux-factory-image.bb        |  22 ++-
 .../logrotate/act-as-mv-when-rotate.patch          | 147 +++++++++++++++++++++
 .../disable-check-different-filesystems.patch      |  32 +++++
 .../logrotate/logrotate/update-the-manual.patch    |  38 ++++++
 recipes-extended/logrotate/logrotate_%.bbappend    |   7 +-
 .../logrotate/logrotate_3.9.1-mlinux1.bb           |  73 ++++++++++
 recipes-extended/monit/monit_5.21.0.bb             |  10 +-
 recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb   |  19 +--
 9 files changed, 327 insertions(+), 33 deletions(-)
 create mode 100644 recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
 create mode 100644 recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
 create mode 100644 recipes-extended/logrotate/logrotate/update-the-manual.patch
 create mode 100644 recipes-extended/logrotate/logrotate_3.9.1-mlinux1.bb

diff --git a/conf/distro/java.inc b/conf/distro/java.inc
index ff620d8..6980075 100644
--- a/conf/distro/java.inc
+++ b/conf/distro/java.inc
@@ -1,9 +1,11 @@
-PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
-
+PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
 PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+
+#PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+
 PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 
-PREFERRED_VERSION_openjdk-7-jre = "25b30-2.3.12"
-PREFERRED_VERSION_icedtea7-native = "2.1.3"
+#PREFERRED_VERSION_openjdk-7-jre = "25b30-2.3.12"
+#PREFERRED_VERSION_icedtea7-native = "2.1.3"
 
-PREFERRED_PROVIDER_openjdk-7-jre = "openjdk-7-jre"
+#PREFERRED_PROVIDER_openjdk-7-jre = "openjdk-7-jre"
diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb
index c50619b..cc8401b 100644
--- a/recipes-core/images/mlinux-factory-image.bb
+++ b/recipes-core/images/mlinux-factory-image.bb
@@ -18,15 +18,17 @@ IMAGE_INSTALL += "sqlite3"
 
 IMAGE_INSTALL += "autossh"
 
-# Monit system/process monitor
-IMAGE_INSTALL += "monit"
+# Monit system/process monitor  TBD
+#IMAGE_INSTALL += "monit"
 
 # LoRa support (MTAC-LORA accessory card)
 IMAGE_INSTALL += "lora-gateway-utils lora-network-server lora-query lora-packet-forwarder-usb"
 
 # MQTT server
+#IMAGE_INSTALL += "mosquitto"
 IMAGE_INSTALL += "mosquitto mosquitto-clients"
 
+
 # Perl support
 IMAGE_INSTALL += "perl"
 IMAGE_INSTALL += "perl-module-io perl-module-fcntl"
@@ -58,17 +60,23 @@ python-xml \
 
 # Ruby support
 IMAGE_INSTALL += "ruby"
-IMAGE_INSTALL += "ruby-sqlite3"
+
+# Ruby-sqlite3 build for 2.2 Ruby requires
+# ruby-hoe native, which is not in openembedded.
+# In Debian the build needs ruby-redcloth,
+# rake, ruby-minitest.  Openembedded does not
+# support this stuff.  TBD
+#IMAGE_INSTALL += "ruby-sqlite3"
 IMAGE_INSTALL += "ruby-serialport"
 
 # OpenJDK Java runtime
-IMAGE_INSTALL += "openjdk-7-jre"
+IMAGE_INSTALL += "openjdk-8"
 # OpenJDK with JamVM VM (Multi-Tech default)
-IMAGE_INSTALL += "openjdk-7-vm-jamvm"
+# IMAGE_INSTALL += "jamvm"
 # OpenJDK with CACAO VM (run with 'java -cacao')
-IMAGE_INSTALL += "openjdk-7-vm-cacao"
+# IMAGE_INSTALL += "openjdk-7-vm-cacao"
 # OpenJDK Zero VM (run with 'java -zero')
-IMAGE_INSTALL += "openjdk-7-vm-zero"
+# IMAGE_INSTALL += "openjdk-7-vm-zero"
 
 # PHP support
 IMAGE_INSTALL += "php php-cli php-cgi"
diff --git a/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch b/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
new file mode 100644
index 0000000..2e931a2
--- /dev/null
+++ b/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
@@ -0,0 +1,147 @@
+From 68f29ab490cf987aa34b5f4caf1784b58a021308 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Tue, 17 Feb 2015 21:08:07 -0800
+Subject: [PATCH] Act as the "mv" command when rotate log
+
+Act as the "mv" command when rotate log, first rename, if failed, then
+read and write.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ logrotate.c |   71 +++++++++++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 59 insertions(+), 12 deletions(-)
+
+diff --git a/logrotate.c b/logrotate.c
+index d3deb6a..cf8bf2c 100644
+--- a/logrotate.c
++++ b/logrotate.c
+@@ -1157,6 +1157,53 @@ int findNeedRotating(struct logInfo *log, int logNum, int force)
+     return 0;
+ }
+ 
++/* Act as the "mv" command, if rename failed, then read the old file and
++ * write to new file. The function which invokes the mvFile will use
++ * the strerror(errorno) to handle the error message, so we don't have
++ * to print the error message here */
++
++int mvFile (char *oldName, char *newName, struct logInfo *log, acl_type acl)
++{
++    struct stat sbprev;
++    int fd_old, fd_new, n;
++    char buf[BUFSIZ];
++
++    /* Do the rename first */
++    if (!rename(oldName, newName))
++        return 0;
++
++    /* If the errno is EXDEV, then read old file, write newfile and
++     * remove the oldfile */
++    if (errno == EXDEV) {
++        /* Open the old file to read */
++        if ((fd_old = open(oldName, O_RDONLY)) < 0)
++            return 1;
++
++        /* Create the file to write, keep the same attribute as the old file */
++        if (stat(oldName, &sbprev))
++            return 1;
++        else {
++            if ((fd_new = createOutputFile(newName,
++                O_WRONLY | O_CREAT | O_TRUNC, &sbprev, acl, 0)) < 0 )
++                return 1;
++        }
++
++        /* Read and write */
++        while ((n = read(fd_old, buf, BUFSIZ)) > 0)
++            if (write(fd_new, buf, n) != n)
++                return 1;
++
++        if ((close(fd_old) < 0) ||
++            removeLogFile(oldName, log) ||
++            (close(fd_new) < 0))
++            return 1;
++
++        return 0;
++    }
++
++    return 1;
++}
++
+ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
+ 		       struct logNames *rotNames)
+ {
+@@ -1523,15 +1570,15 @@ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
+ 		}
+ 
+ 	    message(MESS_DEBUG,
+-		    "renaming %s to %s (rotatecount %d, logstart %d, i %d), \n",
++		    "moving %s to %s (rotatecount %d, logstart %d, i %d), \n",
+ 		    oldName, newName, rotateCount, logStart, i);
+ 
+-	    if (!debug && rename(oldName, newName)) {
++	    if (!debug && mvFile(oldName, newName, log, prev_acl)) {
+ 		if (errno == ENOENT) {
+ 		    message(MESS_DEBUG, "old log %s does not exist\n",
+ 			    oldName);
+ 		} else {
+-		    message(MESS_ERROR, "error renaming %s to %s: %s\n",
++		    message(MESS_ERROR, "error moving %s to %s: %s\n",
+ 			    oldName, newName, strerror(errno));
+ 		    hasErrors = 1;
+ 		}
+@@ -1669,21 +1716,21 @@ int rotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
+ 				return 1;
+ 			}
+ 
+-			message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum],
++			message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum],
+ 				tmpFilename);
+-			if (!debug && !hasErrors && rename(log->files[logNum], tmpFilename)) {
+-			message(MESS_ERROR, "failed to rename %s to %s: %s\n",
++			if (!debug && !hasErrors && mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) {
++			message(MESS_ERROR, "failed to move %s to %s: %s\n",
+ 				log->files[logNum], tmpFilename,
+ 				strerror(errno));
+ 				hasErrors = 1;
+ 			}
+ 		}
+ 		else {
+-			message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum],
++			message(MESS_DEBUG, "moving %s to %s\n", log->files[logNum],
+ 				rotNames->finalName);
+ 			if (!debug && !hasErrors &&
+-			rename(log->files[logNum], rotNames->finalName)) {
+-				message(MESS_ERROR, "failed to rename %s to %s: %s\n",
++			mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) {
++				message(MESS_ERROR, "failed to move %s to %s: %s\n",
+ 					log->files[logNum], tmpFilename,
+ 					strerror(errno));
+ 					hasErrors = 1;
+@@ -2063,7 +2110,7 @@ int rotateLogSet(struct logInfo *log, int force)
+     return hasErrors;
+ }
+ 
+-static int writeState(char *stateFilename)
++static int writeState(struct logInfo *log, char *stateFilename)
+ {
+ 	struct logState *p;
+ 	FILE *f;
+@@ -2227,7 +2274,7 @@ static int writeState(char *stateFilename)
+ 		fclose(f);
+ 
+ 	if (error == 0) {
+-		if (rename(tmpFilename, stateFilename)) {
++		if (mvFile(tmpFilename, stateFilename, log, prev_acl)) {
+ 			unlink(tmpFilename);
+ 			error = 1;
+ 			message(MESS_ERROR, "error renaming temp state file %s\n",
+@@ -2525,7 +2572,7 @@ int main(int argc, const char **argv)
+ 		rc |= rotateLogSet(log, force);
+ 
+ 	if (!debug)
+-		rc |= writeState(stateFile);
++		rc |= writeState(log, stateFile);
+ 
+ 	return (rc != 0);
+ }
diff --git a/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch b/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
new file mode 100644
index 0000000..793d702
--- /dev/null
+++ b/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
@@ -0,0 +1,32 @@
+Disable the check for different filesystems
+
+The logrotate supports rotate log across different filesystems now, so
+disable the check for different filesystems.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ config.c |    9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/config.c b/config.c
+index dbbf563..64e66f6 100644
+--- a/config.c
++++ b/config.c
+@@ -1493,15 +1493,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
+ 							goto error;
+ 						}
+ 					}
+-
+-					if (sb.st_dev != sb2.st_dev
+-						&& !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY | LOG_FLAG_TMPFILENAME))) {
+-						message(MESS_ERROR,
+-							"%s:%d olddir %s and log file %s "
+-							"are on different devices\n", configFile,
+-							lineNum, newlog->oldDir, newlog->files[i]);
+-						goto error;
+-					}
+ 				}
+ 			}
+ 
diff --git a/recipes-extended/logrotate/logrotate/update-the-manual.patch b/recipes-extended/logrotate/logrotate/update-the-manual.patch
new file mode 100644
index 0000000..50d037d
--- /dev/null
+++ b/recipes-extended/logrotate/logrotate/update-the-manual.patch
@@ -0,0 +1,38 @@
+From e0b0fe30e9c49234994a20a86aacfaf80e690087 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Tue, 17 Feb 2015 21:14:37 -0800
+Subject: [PATCH] Update the manual
+
+Update the manual for rotating on different filesystems.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ logrotate.8 |   10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/logrotate.8 b/logrotate.8
+index e4e5f48..84407d0 100644
+--- a/logrotate.8
++++ b/logrotate.8
+@@ -405,12 +405,10 @@ Do not rotate the log if it is empty (this overrides the \fBifempty\fR option).
+ 
+ .TP
+ \fBolddir \fIdirectory\fR
+-Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR must be
+-on the same physical device as the log file being rotated, unless \fBcopy\fR,
+-\fBcopytruncate\fR or \fBrenamecopy\fR option is used. The \fIdirectory\fR
+-is assumed to be relative to the directory holding the log file
+-unless an absolute path name is specified. When this option is used all
+-old versions of the log end up in \fIdirectory\fR.  This option may be
++Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR
++is assumed to be relative to the directory holding the log file unless
++an absolute path name is specified. When this option is used all old
++versions of the log end up in \fIdirectory\fR. This option may be
+ overridden by the \fBnoolddir\fR option.
+ 
+ .TP
+-- 
+1.7.9.5
+
diff --git a/recipes-extended/logrotate/logrotate_%.bbappend b/recipes-extended/logrotate/logrotate_%.bbappend
index efebecb..c8adb80 100644
--- a/recipes-extended/logrotate/logrotate_%.bbappend
+++ b/recipes-extended/logrotate/logrotate_%.bbappend
@@ -1,9 +1,14 @@
 PR .= ".mlinux2"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI[md5sum] = "8572b7c2cf9ade09a8a8e10098500fb3"
+SRC_URI[sha256sum] = "5bf8e478c428e7744fefa465118f8296e7e771c981fb6dffb7527856a0ea3617"
+
 
 SRC_URI += "file://logrotate.conf"
 
+# consider Systemd here someday.  Also prevent logrotate from starting if it is already running
+# use startdaemon?
 do_install_append() {
 	# setup cron to run logrotate more often
 	rm -f ${D}${sysconfdir}/cron.daily/logrotate
diff --git a/recipes-extended/logrotate/logrotate_3.9.1-mlinux1.bb b/recipes-extended/logrotate/logrotate_3.9.1-mlinux1.bb
new file mode 100644
index 0000000..ef26ce4
--- /dev/null
+++ b/recipes-extended/logrotate/logrotate_3.9.1-mlinux1.bb
@@ -0,0 +1,73 @@
+SUMMARY = "Rotates, compresses, removes and mails system log files"
+SECTION = "console/utils"
+HOMEPAGE = "https://github.com/logrotate/logrotate/issues"
+LICENSE = "GPLv2"
+
+# TODO: logrotate 3.8.8 adds autotools/automake support, update recipe to use it.
+# TODO: Document coreutils dependency. Why not RDEPENDS? Why not busybox?
+
+DEPENDS="coreutils popt"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
+
+# When updating logrotate to latest upstream, SRC_URI should point to
+# a proper release tarball from https://github.com/logrotate/logrotate/releases
+# and we have to take the snapshot for now because there is no such
+# tarball available for 3.9.1.
+
+S = "${WORKDIR}/${BPN}-r3-9-1"
+
+UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
+
+SRC_URI = "https://github.com/${BPN}/${BPN}/archive/r3-9-1.tar.gz;downloadfilename=${BP}.tar.gz\
+           file://act-as-mv-when-rotate.patch \
+           file://update-the-manual.patch \
+           file://disable-check-different-filesystems.patch \
+           "
+
+SRC_URI[md5sum] = "8572b7c2cf9ade09a8a8e10098500fb3"
+SRC_URI[sha256sum] = "5bf8e478c428e7744fefa465118f8296e7e771c981fb6dffb7527856a0ea3617"
+
+# PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}"
+PACKAGECONFIG ?= "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
+"
+
+PACKAGECONFIG[acl] = ",,acl"
+PACKAGECONFIG[selinux] = ",,libselinux"
+
+CONFFILES_${PN} += "${localstatedir}/lib/logrotate.status \
+		    ${sysconfdir}/logrotate.conf"
+
+# If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our
+# optimization variables, so use it rather than EXTRA_CFLAGS.
+EXTRA_OEMAKE = "\
+    LFS= \
+    OS_NAME='${OS_NAME}' \
+    'CC=${CC}' \
+    'RPM_OPT_FLAGS=${CFLAGS}' \
+    'EXTRA_LDFLAGS=${LDFLAGS}' \
+    ${@bb.utils.contains('PACKAGECONFIG', 'acl', 'WITH_ACL=yes', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'selinux', 'WITH_SELINUX=yes', '', d)} \
+"
+
+# OS_NAME in the makefile defaults to `uname -s`. The behavior for
+# freebsd/netbsd is questionable, so leave it as Linux, which only sets
+# INSTALL=install and BASEDIR=/usr.
+OS_NAME = "Linux"
+
+do_compile_prepend() {
+    # Make sure the recompile is OK
+    rm -f ${B}/.depend
+}
+
+do_install(){
+    oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
+    mkdir -p ${D}${sysconfdir}/logrotate.d
+    mkdir -p ${D}${sysconfdir}/cron.daily
+    mkdir -p ${D}${localstatedir}/lib
+    install -p -m 644 examples/logrotate-default ${D}${sysconfdir}/logrotate.conf
+    install -p -m 755 examples/logrotate.cron ${D}${sysconfdir}/cron.daily/logrotate
+    touch ${D}${localstatedir}/lib/logrotate.status
+}
diff --git a/recipes-extended/monit/monit_5.21.0.bb b/recipes-extended/monit/monit_5.21.0.bb
index ddd2ea9..8bef5c6 100644
--- a/recipes-extended/monit/monit_5.21.0.bb
+++ b/recipes-extended/monit/monit_5.21.0.bb
@@ -6,14 +6,18 @@ DEPENDS = "libpam"
 
 PR = "r1"
 
-SRC_URI = "http://mmonit.com/monit/dist/monit-5.12.2.tar.gz \
+SRC_URI = "http://mmonit.com/monit/dist/monit-5.21.0.tar.gz \
            file://monitrc \
            file://monit.init \
            file://monit.default \
+	   file://monit-remove-atomic.patch;patch=1;pnum=1 \
+	   file://monit-libtool.patch;patch=1;pnum=1 \
            "
+# file://monit-libtool.patch;patch=1;pnum=1
+
+SRC_URI[md5sum] = "6e300f87fd108d85844cee9a64f0c7fb"
+SRC_URI[sha256sum] = "fbf76163ed4a180854d378af60fed0cdbc5a8772823957234efc182ead10c03c"
 
-SRC_URI[md5sum] = "5f5cf4c18b42e8091b49b4e07cf972ce"
-SRC_URI[sha256sum] = "8ab0296d1aa2351b1573481592d7b5e06de1edd49dff1b5552839605a450914c"
 
 inherit autotools
 
diff --git a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
index fa1ff9e..35e473c 100644
--- a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
+++ b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
@@ -1,32 +1,17 @@
 DESCRIPTION = "Ruby bindings for the SQLite3 embedded database"
 HOMEPAGE = "https://github.com/sparklemotion/sqlite3-ruby"
-LICENSE = "custom-freely-distributable"
+LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f24ce0d57c8f8576a36e2803d35bcfec"
 SECTION = "console/utils"
 PRIORITY = "optional"
 DEPENDS = "ruby sqlite3"
 
+inherit ruby
 PR = "r0"
 
 SRC_URI = "git://github.com/sparklemotion/sqlite3-ruby.git;tag=v${PV};branch=1-3-stable;protocol=git"
 
 S = "${WORKDIR}/git"
-B = "${S}"
-
-# RUBY_VERSION
-do_compile() {
-  fn=$(ls ${STAGING_INCDIR}/ruby-*/ruby.h | head -1)
-  pn=$(dirname $fn)
-  pn2=$(ls -d ${STAGING_INCDIR}/ruby-*/arm-linux-*)
-  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/sqlite3 -Iext/native -I${pn} -I${pn2} -c ext/sqlite3/*.c
-  ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/sqlite3/sqlite3_native.so *.o -lsqlite3
-}
-
-do_install() {
-  install -d ${D}${libdir}/ruby ${D}${libdir}/ruby/sqlite3
-  install lib/sqlite3.rb ${D}${libdir}/ruby/sqlite3.rb
-  install lib/sqlite3/* ext/sqlite3/sqlite3_native.so -t ${D}${libdir}/ruby/sqlite3
-}
 
 FILES_${PN} = "${libdir}/ruby/sqlite3*"
 FILES_${PN}-dbg += "${libdir}/ruby/sqlite3/.debug*"
-- 
cgit v1.2.3


From df5312a5710020377380fd4e5b0e971366edc319 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 20 Apr 2017 11:26:50 -0500
Subject: Add sudo so root password can be eliminated eventually

---
 contrib/local.conf                       | 13 +++++++++++++
 recipes-extended/sudo/sudo/privacy       |  1 +
 recipes-extended/sudo/sudo/sudoers.patch | 21 +++++++++++++++++++++
 recipes-extended/sudo/sudo_%.bbappend    | 12 ++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 recipes-extended/sudo/sudo/privacy
 create mode 100644 recipes-extended/sudo/sudo/sudoers.patch
 create mode 100644 recipes-extended/sudo/sudo_%.bbappend

diff --git a/contrib/local.conf b/contrib/local.conf
index 8eb6d46..6740f14 100644
--- a/contrib/local.conf
+++ b/contrib/local.conf
@@ -51,3 +51,16 @@ BUILDHISTORY_COMMIT = "0"
 BUILDHISTORY_FEATURES = "image"
 
 IMAGE_FSTYPES =+ "jffs2 tar.gz"
+
+# OpenJDK Java runtime
+# Uncomment for a bigger image with java.
+# Java requires using tftp or a flash drive
+# for updating.
+# IMAGE_INSTALL += "openjdk-8"
+# OpenJDK with JamVM VM (Multi-Tech default)
+# IMAGE_INSTALL += "jamvm"
+# OpenJDK with CACAO VM (run with 'java -cacao')
+# IMAGE_INSTALL += "openjdk-7-vm-cacao"
+# OpenJDK Zero VM (run with 'java -zero')
+# IMAGE_INSTALL += "openjdk-7-vm-zero"
+
diff --git a/recipes-extended/sudo/sudo/privacy b/recipes-extended/sudo/sudo/privacy
new file mode 100644
index 0000000..7c03615
--- /dev/null
+++ b/recipes-extended/sudo/sudo/privacy
@@ -0,0 +1 @@
+Defaults      lecture = never
diff --git a/recipes-extended/sudo/sudo/sudoers.patch b/recipes-extended/sudo/sudo/sudoers.patch
new file mode 100644
index 0000000..aed0f10
--- /dev/null
+++ b/recipes-extended/sudo/sudo/sudoers.patch
@@ -0,0 +1,21 @@
+diff -uprN old/plugins/sudoers/sudoers.in new/plugins/sudoers/sudoers.in
+--- old/plugins/sudoers/sudoers.in	2015-10-31 18:34:59.000000000 -0500
++++ new/plugins/sudoers/sudoers.in	2017-04-20 10:32:19.530931283 -0500
+@@ -57,7 +57,7 @@
+ # Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER"
+ ##
+ ## Uncomment to use a hard-coded PATH instead of the user's to find commands
+-# Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
++Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ ##
+ ## Uncomment to send mail if the user does not enter the correct password.
+ # Defaults mail_badpass
+@@ -85,7 +85,7 @@ root ALL=(ALL) ALL
+ # %wheel ALL=(ALL) NOPASSWD: ALL
+ 
+ ## Uncomment to allow members of group sudo to execute any command
+-# %sudo	ALL=(ALL) ALL
++%sudo	ALL=(ALL) ALL
+ 
+ ## Uncomment to allow any user to run sudo if they know the password
+ ## of the user they are running the command as (root by default).
diff --git a/recipes-extended/sudo/sudo_%.bbappend b/recipes-extended/sudo/sudo_%.bbappend
new file mode 100644
index 0000000..a1e4b04
--- /dev/null
+++ b/recipes-extended/sudo/sudo_%.bbappend
@@ -0,0 +1,12 @@
+SRC_URI += "file://sudoers.patch \
+            file://privacy"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+
+CONFFILES_${PN} += "${sysconfdir}/sudoers.d/privacy"
+
+do_install_append() {
+    install -D -m 644 ${WORKDIR}/privacy ${D}/${sysconfdir}/sudoers.d
+}
+
-- 
cgit v1.2.3


From 00ce6692fd0287c15b7f6e5aa25fa66eb2221971 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Fri, 21 Apr 2017 10:35:44 -0500
Subject: mtadm user, root password removed, sudo

---
 classes/mlinux-image.bbclass                      |  8 ++--
 recipes-core/images/mlinux-factory-image.bb       |  2 +-
 recipes-core/images/mlinux-minimal-image.bb       |  2 +
 recipes-core/initscripts/initscripts-1.0/umountfs | 11 ++++--
 recipes-core/useradd/useradd.bb                   | 47 +++++++++++++++++++++++
 5 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 recipes-core/useradd/useradd.bb

diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass
index 785160e..3c3bcaa 100644
--- a/classes/mlinux-image.bbclass
+++ b/classes/mlinux-image.bbclass
@@ -2,12 +2,14 @@
 # having file mod times of zero confuses cron
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
 
-# set specified root password in image using ROOT_PASSWORD_HASH
+# set specified mtadm password in image using ROOT_PASSWORD_HASH
 mlinux_set_root_password () {
+    echo IMAGE_ROOTFS is ${IMAGE_ROOTFS} >/tmp/m_set_root_pwd.txt
+    ls ${IMAGE_ROOTFS} >/tmp/ls_pwd.txt
     if [ -e ${IMAGE_ROOTFS}/etc/shadow ]; then
-        sed -i 's%^root:[^:]*:%root:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/shadow
+        sed -i 's%^mtadm:[^:]*:%mtadm:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/shadow
     elif [ -e ${IMAGE_ROOTFS}/etc/passwd ]; then
-        sed -i 's%^root:[^:]*:%root:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/passwd
+        sed -i 's%^mtadm:[^:]*:%mtadm:${ROOT_PASSWORD_HASH}:%' ${IMAGE_ROOTFS}/etc/passwd
     fi
 }
 ROOTFS_POSTPROCESS_COMMAND += "mlinux_set_root_password;"
diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb
index cc8401b..9e59bfb 100644
--- a/recipes-core/images/mlinux-factory-image.bb
+++ b/recipes-core/images/mlinux-factory-image.bb
@@ -70,7 +70,7 @@ IMAGE_INSTALL += "ruby"
 IMAGE_INSTALL += "ruby-serialport"
 
 # OpenJDK Java runtime
-IMAGE_INSTALL += "openjdk-8"
+# IMAGE_INSTALL += "openjdk-8"
 # OpenJDK with JamVM VM (Multi-Tech default)
 # IMAGE_INSTALL += "jamvm"
 # OpenJDK with CACAO VM (run with 'java -cacao')
diff --git a/recipes-core/images/mlinux-minimal-image.bb b/recipes-core/images/mlinux-minimal-image.bb
index 2f2d61b..1a92e8e 100644
--- a/recipes-core/images/mlinux-minimal-image.bb
+++ b/recipes-core/images/mlinux-minimal-image.bb
@@ -16,8 +16,10 @@ CORE_FEATURES = "packagegroup-core-boot packagegroup-distro-base \
                  openssh-sftp-server \
                  util-linux-mount util-linux-umount \
                  start-stop-daemon \
+		 sudo \
                  ${CORE_IMAGE_EXTRA_INSTALL} \
                  mlinux-feed-configs \
+		 useradd \
                  "
 
 NETWORKING_FEATURES = "ppp curl iproute2 \
diff --git a/recipes-core/initscripts/initscripts-1.0/umountfs b/recipes-core/initscripts/initscripts-1.0/umountfs
index 8c12ebe..bfd4d47 100644
--- a/recipes-core/initscripts/initscripts-1.0/umountfs
+++ b/recipes-core/initscripts/initscripts-1.0/umountfs
@@ -10,6 +10,7 @@
 ### END INIT INFO
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
+upgrade_fname="/var/volatile/do_flash_upgrade"
 
 umount_all() {
   echo "Deactivating swap..."
@@ -256,9 +257,13 @@ flash_upgrade() {
 }
 
 # do flash on reboot if do_flash_upgrade exists
-if [ -f /var/volatile/do_flash_upgrade ]; then
-    flash_upgrade /var/volatile
-    flash_upgrade /media/card
+# and is owned by root
+if [[ -f ${upgrade_fname} ]] ; then
+    owner=$(stat -c%u "${upgrade_fname}")
+    if ((${#owner} > 0)) && ((owner == 0)) ; then
+      flash_upgrade /var/volatile
+      flash_upgrade /media/card
+    fi
 fi
 
 umount_all
diff --git a/recipes-core/useradd/useradd.bb b/recipes-core/useradd/useradd.bb
new file mode 100644
index 0000000..0afa3b1
--- /dev/null
+++ b/recipes-core/useradd/useradd.bb
@@ -0,0 +1,47 @@
+SUMMARY = "Add mtadm user"
+DESCRIPTION = "Add mtadm user for security purposes"
+SECTION = "mtadm"
+PR = "r1"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+S = "${WORKDIR}"
+
+inherit useradd
+
+# You must set USERADD_PACKAGES when you inherit useradd. This
+# lists which output packages will include the user/group
+# creation code.
+#USERADD_PACKAGES = "${PN} ${PN}-user3"
+USERADD_PACKAGES = "${PN}"
+
+# You must also set USERADD_PARAM and/or GROUPADD_PARAM when
+# you inherit useradd.
+
+# GROUPADD_PARAM works the same way, which you set to the options
+# you'd normally pass to the groupadd command. This will create
+# groups group1 and group2:
+GROUPADD_PARAM_${PN} = "-r  -g 27 sudo"
+
+# USERADD_PARAM specifies command line options to pass to the
+# useradd command. Multiple users can be created by separating
+# the commands with a semicolon. Here we'll create two users,
+# user1 and user2:
+USERADD_PARAM_${PN} = "-u 50 -G sudo -m -r -s /bin/bash mtadm"
+
+do_install () {
+        # If the recipe doesn't have a file, the ipk
+        # is deleted, and it does nothing.
+        # Create a .ssh directory for mtadm.
+        install -d 0700 ${D}/home/mtadm/.ssh
+	chown mtadm:mtadm ${D}/home/mtadm
+	chown mtadm:mtadm ${D}/home/mtadm/.ssh
+}
+
+FILES_${PN} = "/home/mtadm/.ssh"
+
+# Prevents do_package failures with:
+# debugsources.list: No such file or directory:
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+
-- 
cgit v1.2.3


From 0628de62996b4193a1106c8b1b5ce7ca6bb8bcf4 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 25 Apr 2017 13:32:53 -0500
Subject: Make eudev bbappend allow new levels of uedev

---
 .../udev/eudev-3.1.5/cellular_radios.rules         |  59 ---------
 recipes-core/udev/eudev-3.1.5/init                 | 138 ---------------------
 recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules    |   8 --
 .../eudev-3.1.5/mtcdt/accessory_ethernet.rules     |  21 ----
 recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules    |  14 ---
 recipes-core/udev/eudev-3.1.5/udev-cache.default   |   5 -
 recipes-core/udev/eudev/cellular_radios.rules      |  59 +++++++++
 recipes-core/udev/eudev/init                       | 138 +++++++++++++++++++++
 recipes-core/udev/eudev/mtcap/mtcap.rules          |   8 ++
 .../udev/eudev/mtcdt/accessory_ethernet.rules      |  21 ++++
 recipes-core/udev/eudev/mtcdt/mtcdt.rules          |  14 +++
 recipes-core/udev/eudev/udev-cache.default         |   5 +
 recipes-core/udev/eudev_%.bbappend                 |  21 ++++
 recipes-core/udev/eudev_3.1.5.bbappend             |  20 ---
 14 files changed, 266 insertions(+), 265 deletions(-)
 delete mode 100644 recipes-core/udev/eudev-3.1.5/cellular_radios.rules
 delete mode 100644 recipes-core/udev/eudev-3.1.5/init
 delete mode 100644 recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules
 delete mode 100644 recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules
 delete mode 100644 recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules
 delete mode 100644 recipes-core/udev/eudev-3.1.5/udev-cache.default
 create mode 100644 recipes-core/udev/eudev/cellular_radios.rules
 create mode 100644 recipes-core/udev/eudev/init
 create mode 100644 recipes-core/udev/eudev/mtcap/mtcap.rules
 create mode 100644 recipes-core/udev/eudev/mtcdt/accessory_ethernet.rules
 create mode 100644 recipes-core/udev/eudev/mtcdt/mtcdt.rules
 create mode 100644 recipes-core/udev/eudev/udev-cache.default
 create mode 100644 recipes-core/udev/eudev_%.bbappend
 delete mode 100644 recipes-core/udev/eudev_3.1.5.bbappend

diff --git a/recipes-core/udev/eudev-3.1.5/cellular_radios.rules b/recipes-core/udev/eudev-3.1.5/cellular_radios.rules
deleted file mode 100644
index aa05e96..0000000
--- a/recipes-core/udev/eudev-3.1.5/cellular_radios.rules
+++ /dev/null
@@ -1,59 +0,0 @@
-ACTION=="remove", GOTO="mlinux_end"
-SUBSYSTEM!="tty", GOTO="mlinux_end"
-KERNEL!="ttyUSB[0-9]*|ttyACM[0-9]*", GOTO="mlinux_end"
-
-SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
-ENV{ID_IFACE}=="", GOTO="mlinux_end"
-
-# All modem ports
-# H5
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="02", SYMLINK+="modem1"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="04", SYMLINK+="modem2"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem3"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="08", SYMLINK+="modem4"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0a", SYMLINK+="modem5"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0c", SYMLINK+="modem6"
-# EV3
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="01", SYMLINK+="modem1"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem2"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem3"
-# H4
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="01", SYMLINK+="modem1"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="02", SYMLINK+="modem2"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem3"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem4"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem5"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="06", SYMLINK+="modem6"
-# EV2
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", SYMLINK+="modem$env{ID_PORT}"
-
-# AT Command ports
-# H5: ttyACM0, ttyACM3
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1"
-# EV3: ttyUSB2, ttyUSB3
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem_at1"
-# H4: ttyUSB3, ttyUSB4, ttyUSB5
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem_at1"
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem_at2"
-# EV2: ttyUSB0
-ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", ENV{ID_PORT}=="0", SYMLINK+="modem_at0"
-# LAT1, LEU1, LVW2: ttyUSB2, ttyUSB3 (port 04 and port 05)
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1201", ENV{ID_IFACE}=="04", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1201", ENV{ID_IFACE}=="05", SYMLINK+="modem_at1"
-# LJP1(LE910-JN1), LNA3(LE910-NA1): ttyACM0, ttyACM3 (port 00 and port 03)
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1"
-# G3: ttyACM0, ttyACM1
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0022", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0022", ENV{ID_IFACE}=="02", SYMLINK+="modem_at1"
-# C2: ttyUSB0, ttyUSB1 (Telit Documentation: Modem Port = USB1, Aux Port = USB0)
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1011", ENV{ID_IFACE}=="01", SYMLINK+="modem_at0"
-ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1011", ENV{ID_IFACE}=="00", SYMLINK+="modem_at1"
-
-LABEL="mlinux_end"
diff --git a/recipes-core/udev/eudev-3.1.5/init b/recipes-core/udev/eudev-3.1.5/init
deleted file mode 100644
index bd716b0..0000000
--- a/recipes-core/udev/eudev-3.1.5/init
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          udev
-# Required-Start:    mountvirtfs
-# Required-Stop:     
-# Default-Start:     S
-# Default-Stop:
-# Short-Description: Start udevd, populate /dev and load drivers.
-### END INIT INFO
-
-export TZ=/etc/localtime
-
-[ -d /sys/class ] || exit 1
-[ -r /proc/mounts ] || exit 1
-[ -x @UDEVD@ ] || exit 1
-[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
-[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
-readfiles () {
-   READDATA=""
-   for filename in $@; do
-	   if [ -r $filename ]; then
-		   while read line; do
-			   READDATA="$READDATA$line"
-		   done < $filename
-	   fi
-   done
-}
-
-kill_udevd () {
-    pid=`pidof -x udevd`
-    [ -n "$pid" ] && kill $pid
-}
-
-case "$1" in
-  start)
-    export ACTION=add
-    # propagate /dev from /sys
-    echo "Starting udev"
-
-    # Check for requireed devtmpfs before trying to start udev and
-    # mount a no-existant fs.
-    if ! grep -q devtmpfs /proc/filesystems
-    then
-        echo "Missing devtmpfs, which is required for udev to run";
-        echo "Halting..."
-        halt
-    fi
-    # mount the devtmpfs on /dev, if not already done
-    LANG=C awk '$2 == "/dev" && ($3 == "devtmpfs") { exit 1 }' /proc/mounts && {
-            mount -n -o mode=0755 -t devtmpfs none "/dev"
-    }
-    [ -e /dev/pts ] || mkdir -m 0755 /dev/pts
-    [ -e /dev/shm ] || mkdir -m 1777 /dev/shm
-    # the automount rule for udev needs /tmp directory available, as /tmp is a symlink
-    # to /var/tmp which in turn is a symlink to /var/volatile/tmp, we need to make sure
-    # /var/volatile/tmp directory to be available.
-    mkdir -p /var/volatile/tmp
-
-    # Cache handling.
-    # A list of files which are used as a criteria to judge whether the udev cache could be reused.
-    CMP_FILE_LIST="/proc/version /proc/cmdline /proc/devices /proc/atags"
-    if [ "$DEVCACHE" != "" ]; then
-            if [ -e $DEVCACHE ]; then
-		    readfiles $CMP_FILE_LIST
-		    NEWDATA="$READDATA"
-		    readfiles /etc/udev/cache.data
-		    OLDDATA="$READDATA"
-		    if [ "$OLDDATA" = "$NEWDATA" ]; then
-                            (cd /; tar xf $DEVCACHE > /dev/null 2>&1)
-                            not_first_boot=1
-                            [ "$VERBOSE" != "no" ] && echo "udev: using cache file $DEVCACHE"
-                            [ -e /dev/shm/udev.cache ] && rm -f /dev/shm/udev.cache
-                    else
-			    # Output detailed reason why the cached /dev is not used
-			    if [ "$VERBOSE" != "no" ]; then
-				    echo "udev: udev cache not used"
-				    echo "udev: we use $CMP_FILE_LIST as criteria to judge whether the cache /dev could be resued"
-				    echo "udev: olddata: $OLDDATA"
-				    echo "udev: newdata: $NEWDATA"
-			    fi
-			    echo "$NEWDATA" > /dev/shm/udev.cache
-                    fi
-	    else
-		    if [ "$ROOTFS_READ_ONLY" != "yes" ]; then
-			    # If rootfs is not read-only, it's possible that a new udev cache would be generated;
-			    # otherwise, we do not bother to read files.
-			    readfiles $CMP_FILE_LIST
-			    echo "$READDATA" > /dev/shm/udev.cache
-		    fi
-            fi
-    fi
-
-    # make_extra_nodes
-    kill_udevd > "/dev/null" 2>&1
-
-    # trigger the sorted events
-    echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
-    @UDEVD@ -d
-
-    udevadm control --env=STARTUP=1
-    if [ "$not_first_boot" != "" ];then
-            if [ "$PROBE_PLATFORM_BUS" != "yes" ]; then
-                PLATFORM_BUS_NOMATCH="--subsystem-nomatch=platform"
-            else
-                PLATFORM_BUS_NOMATCH=""
-            fi
-            udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux $PLATFORM_BUS_NOMATCH
-            (udevadm settle --timeout=10; udevadm control --env=STARTUP=)&
-    else
-            udevadm trigger --action=add
-            udevadm settle
-    fi
-    ;;
-  stop)
-    echo "Stopping udevd"
-    start-stop-daemon --stop --name udevd --quiet
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    pid=`pidof -x udevd`
-    if [ -n "$pid" ]; then
-	echo "udevd (pid $pid) is running ..."
-    else
-	echo "udevd is stopped"
-    fi
-    ;;
-  *)
-    echo "Usage: $0 {start|stop|status|restart}"
-    exit 1
-esac
-exit 0
diff --git a/recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules b/recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules
deleted file mode 100644
index a0dc9fb..0000000
--- a/recipes-core/udev/eudev-3.1.5/mtcap/mtcap.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-ACTION=="remove", GOTO="mlinux_end"
-SUBSYSTEM!="tty", GOTO="mlinux_end"
-KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end"
-
-SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
-ENV{ID_IFACE}=="", GOTO="mlinux_end"
-
-LABEL="mlinux_end"
diff --git a/recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules b/recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules
deleted file mode 100644
index 376486b..0000000
--- a/recipes-core/udev/eudev-3.1.5/mtcdt/accessory_ethernet.rules
+++ /dev/null
@@ -1,21 +0,0 @@
-#To add new rule for new device you have to run (in case if you want to add eth1 interface)
-#admin@mtcdt:~# udevadm info --attribute-walk --path=/sys/class/net/eth1
-# looking at device '/devices/ahb.0/700000.ehci/usb1/1-2/1-2.1/1-2.1.1/1-2.1.1:1.0/net/eth1':
-#    KERNEL=="eth1"
-#    SUBSYSTEM=="net"
-#    DRIVER==""
-#    ATTR{mtu}=="1500"
-#    ATTR{type}=="1"
-#    ...........
-#    ...........
-
-#  looking at parent device '/devices/ahb.0/700000.ehci/usb1/1-2/1-2.1/1-2.1.1/1-2.1.1:1.0':
-#    KERNELS=="1-2.1.1:1.0"  <------------------- extract this record to add to the rule
-#    SUBSYSTEMS=="usb"
-#    DRIVERS=="smsc75xx"
-#    ATTRS{bInterfaceClass}=="ff"
-#    ATTRS{bInterfaceSubClass}=="00"
-#    ...........
-
-KERNELS=="1-2.1.1:1.0", SUBSYSTEMS=="usb", DRIVERS=="smsc75xx", NAME="eth1"
-KERNELS=="1-2.1.2:1.0", SUBSYSTEMS=="usb", DRIVERS=="smsc75xx", NAME="eth2"
diff --git a/recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules b/recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules
deleted file mode 100644
index 5d528e6..0000000
--- a/recipes-core/udev/eudev-3.1.5/mtcdt/mtcdt.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-ACTION=="remove", GOTO="mlinux_end"
-SUBSYSTEM!="tty", GOTO="mlinux_end"
-KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end"
-
-SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
-ENV{ID_IFACE}=="", GOTO="mlinux_end"
-
-# Accessory Ports
-ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1"
-ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1"
-ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2"
-ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2"
-
-LABEL="mlinux_end"
diff --git a/recipes-core/udev/eudev-3.1.5/udev-cache.default b/recipes-core/udev/eudev-3.1.5/udev-cache.default
deleted file mode 100644
index b1aa63f..0000000
--- a/recipes-core/udev/eudev-3.1.5/udev-cache.default
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default for /etc/init.d/udev
-
-# Comment this out to disable device cache
-#DEVCACHE="/etc/dev.tar"
-PROBE_PLATFORM_BUS="yes"
diff --git a/recipes-core/udev/eudev/cellular_radios.rules b/recipes-core/udev/eudev/cellular_radios.rules
new file mode 100644
index 0000000..aa05e96
--- /dev/null
+++ b/recipes-core/udev/eudev/cellular_radios.rules
@@ -0,0 +1,59 @@
+ACTION=="remove", GOTO="mlinux_end"
+SUBSYSTEM!="tty", GOTO="mlinux_end"
+KERNEL!="ttyUSB[0-9]*|ttyACM[0-9]*", GOTO="mlinux_end"
+
+SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
+ENV{ID_IFACE}=="", GOTO="mlinux_end"
+
+# All modem ports
+# H5
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="02", SYMLINK+="modem1"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="04", SYMLINK+="modem2"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem3"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="08", SYMLINK+="modem4"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0a", SYMLINK+="modem5"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0c", SYMLINK+="modem6"
+# EV3
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="01", SYMLINK+="modem1"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem2"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem3"
+# H4
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="01", SYMLINK+="modem1"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="02", SYMLINK+="modem2"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem3"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem4"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem5"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="06", SYMLINK+="modem6"
+# EV2
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", SYMLINK+="modem$env{ID_PORT}"
+
+# AT Command ports
+# H5: ttyACM0, ttyACM3
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1"
+# EV3: ttyUSB2, ttyUSB3
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem_at1"
+# H4: ttyUSB3, ttyUSB4, ttyUSB5
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="03", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="04", SYMLINK+="modem_at1"
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="683c", ENV{ID_IFACE}=="05", SYMLINK+="modem_at2"
+# EV2: ttyUSB0
+ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", ENV{ID_PORT}=="0", SYMLINK+="modem_at0"
+# LAT1, LEU1, LVW2: ttyUSB2, ttyUSB3 (port 04 and port 05)
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1201", ENV{ID_IFACE}=="04", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1201", ENV{ID_IFACE}=="05", SYMLINK+="modem_at1"
+# LJP1(LE910-JN1), LNA3(LE910-NA1): ttyACM0, ttyACM3 (port 00 and port 03)
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1"
+# G3: ttyACM0, ttyACM1
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0022", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0022", ENV{ID_IFACE}=="02", SYMLINK+="modem_at1"
+# C2: ttyUSB0, ttyUSB1 (Telit Documentation: Modem Port = USB1, Aux Port = USB0)
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1011", ENV{ID_IFACE}=="01", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1011", ENV{ID_IFACE}=="00", SYMLINK+="modem_at1"
+
+LABEL="mlinux_end"
diff --git a/recipes-core/udev/eudev/init b/recipes-core/udev/eudev/init
new file mode 100644
index 0000000..bd716b0
--- /dev/null
+++ b/recipes-core/udev/eudev/init
@@ -0,0 +1,138 @@
+#!/bin/sh
+
+### BEGIN INIT INFO
+# Provides:          udev
+# Required-Start:    mountvirtfs
+# Required-Stop:     
+# Default-Start:     S
+# Default-Stop:
+# Short-Description: Start udevd, populate /dev and load drivers.
+### END INIT INFO
+
+export TZ=/etc/localtime
+
+[ -d /sys/class ] || exit 1
+[ -r /proc/mounts ] || exit 1
+[ -x @UDEVD@ ] || exit 1
+[ -f /etc/default/udev-cache ] && . /etc/default/udev-cache
+[ -f /etc/udev/udev.conf ] && . /etc/udev/udev.conf
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+readfiles () {
+   READDATA=""
+   for filename in $@; do
+	   if [ -r $filename ]; then
+		   while read line; do
+			   READDATA="$READDATA$line"
+		   done < $filename
+	   fi
+   done
+}
+
+kill_udevd () {
+    pid=`pidof -x udevd`
+    [ -n "$pid" ] && kill $pid
+}
+
+case "$1" in
+  start)
+    export ACTION=add
+    # propagate /dev from /sys
+    echo "Starting udev"
+
+    # Check for requireed devtmpfs before trying to start udev and
+    # mount a no-existant fs.
+    if ! grep -q devtmpfs /proc/filesystems
+    then
+        echo "Missing devtmpfs, which is required for udev to run";
+        echo "Halting..."
+        halt
+    fi
+    # mount the devtmpfs on /dev, if not already done
+    LANG=C awk '$2 == "/dev" && ($3 == "devtmpfs") { exit 1 }' /proc/mounts && {
+            mount -n -o mode=0755 -t devtmpfs none "/dev"
+    }
+    [ -e /dev/pts ] || mkdir -m 0755 /dev/pts
+    [ -e /dev/shm ] || mkdir -m 1777 /dev/shm
+    # the automount rule for udev needs /tmp directory available, as /tmp is a symlink
+    # to /var/tmp which in turn is a symlink to /var/volatile/tmp, we need to make sure
+    # /var/volatile/tmp directory to be available.
+    mkdir -p /var/volatile/tmp
+
+    # Cache handling.
+    # A list of files which are used as a criteria to judge whether the udev cache could be reused.
+    CMP_FILE_LIST="/proc/version /proc/cmdline /proc/devices /proc/atags"
+    if [ "$DEVCACHE" != "" ]; then
+            if [ -e $DEVCACHE ]; then
+		    readfiles $CMP_FILE_LIST
+		    NEWDATA="$READDATA"
+		    readfiles /etc/udev/cache.data
+		    OLDDATA="$READDATA"
+		    if [ "$OLDDATA" = "$NEWDATA" ]; then
+                            (cd /; tar xf $DEVCACHE > /dev/null 2>&1)
+                            not_first_boot=1
+                            [ "$VERBOSE" != "no" ] && echo "udev: using cache file $DEVCACHE"
+                            [ -e /dev/shm/udev.cache ] && rm -f /dev/shm/udev.cache
+                    else
+			    # Output detailed reason why the cached /dev is not used
+			    if [ "$VERBOSE" != "no" ]; then
+				    echo "udev: udev cache not used"
+				    echo "udev: we use $CMP_FILE_LIST as criteria to judge whether the cache /dev could be resued"
+				    echo "udev: olddata: $OLDDATA"
+				    echo "udev: newdata: $NEWDATA"
+			    fi
+			    echo "$NEWDATA" > /dev/shm/udev.cache
+                    fi
+	    else
+		    if [ "$ROOTFS_READ_ONLY" != "yes" ]; then
+			    # If rootfs is not read-only, it's possible that a new udev cache would be generated;
+			    # otherwise, we do not bother to read files.
+			    readfiles $CMP_FILE_LIST
+			    echo "$READDATA" > /dev/shm/udev.cache
+		    fi
+            fi
+    fi
+
+    # make_extra_nodes
+    kill_udevd > "/dev/null" 2>&1
+
+    # trigger the sorted events
+    echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
+    @UDEVD@ -d
+
+    udevadm control --env=STARTUP=1
+    if [ "$not_first_boot" != "" ];then
+            if [ "$PROBE_PLATFORM_BUS" != "yes" ]; then
+                PLATFORM_BUS_NOMATCH="--subsystem-nomatch=platform"
+            else
+                PLATFORM_BUS_NOMATCH=""
+            fi
+            udevadm trigger --action=add --subsystem-nomatch=tty --subsystem-nomatch=mem --subsystem-nomatch=vc --subsystem-nomatch=vtconsole --subsystem-nomatch=misc --subsystem-nomatch=dcon --subsystem-nomatch=pci_bus --subsystem-nomatch=graphics --subsystem-nomatch=backlight --subsystem-nomatch=video4linux $PLATFORM_BUS_NOMATCH
+            (udevadm settle --timeout=10; udevadm control --env=STARTUP=)&
+    else
+            udevadm trigger --action=add
+            udevadm settle
+    fi
+    ;;
+  stop)
+    echo "Stopping udevd"
+    start-stop-daemon --stop --name udevd --quiet
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  status)
+    pid=`pidof -x udevd`
+    if [ -n "$pid" ]; then
+	echo "udevd (pid $pid) is running ..."
+    else
+	echo "udevd is stopped"
+    fi
+    ;;
+  *)
+    echo "Usage: $0 {start|stop|status|restart}"
+    exit 1
+esac
+exit 0
diff --git a/recipes-core/udev/eudev/mtcap/mtcap.rules b/recipes-core/udev/eudev/mtcap/mtcap.rules
new file mode 100644
index 0000000..a0dc9fb
--- /dev/null
+++ b/recipes-core/udev/eudev/mtcap/mtcap.rules
@@ -0,0 +1,8 @@
+ACTION=="remove", GOTO="mlinux_end"
+SUBSYSTEM!="tty", GOTO="mlinux_end"
+KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end"
+
+SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
+ENV{ID_IFACE}=="", GOTO="mlinux_end"
+
+LABEL="mlinux_end"
diff --git a/recipes-core/udev/eudev/mtcdt/accessory_ethernet.rules b/recipes-core/udev/eudev/mtcdt/accessory_ethernet.rules
new file mode 100644
index 0000000..376486b
--- /dev/null
+++ b/recipes-core/udev/eudev/mtcdt/accessory_ethernet.rules
@@ -0,0 +1,21 @@
+#To add new rule for new device you have to run (in case if you want to add eth1 interface)
+#admin@mtcdt:~# udevadm info --attribute-walk --path=/sys/class/net/eth1
+# looking at device '/devices/ahb.0/700000.ehci/usb1/1-2/1-2.1/1-2.1.1/1-2.1.1:1.0/net/eth1':
+#    KERNEL=="eth1"
+#    SUBSYSTEM=="net"
+#    DRIVER==""
+#    ATTR{mtu}=="1500"
+#    ATTR{type}=="1"
+#    ...........
+#    ...........
+
+#  looking at parent device '/devices/ahb.0/700000.ehci/usb1/1-2/1-2.1/1-2.1.1/1-2.1.1:1.0':
+#    KERNELS=="1-2.1.1:1.0"  <------------------- extract this record to add to the rule
+#    SUBSYSTEMS=="usb"
+#    DRIVERS=="smsc75xx"
+#    ATTRS{bInterfaceClass}=="ff"
+#    ATTRS{bInterfaceSubClass}=="00"
+#    ...........
+
+KERNELS=="1-2.1.1:1.0", SUBSYSTEMS=="usb", DRIVERS=="smsc75xx", NAME="eth1"
+KERNELS=="1-2.1.2:1.0", SUBSYSTEMS=="usb", DRIVERS=="smsc75xx", NAME="eth2"
diff --git a/recipes-core/udev/eudev/mtcdt/mtcdt.rules b/recipes-core/udev/eudev/mtcdt/mtcdt.rules
new file mode 100644
index 0000000..5d528e6
--- /dev/null
+++ b/recipes-core/udev/eudev/mtcdt/mtcdt.rules
@@ -0,0 +1,14 @@
+ACTION=="remove", GOTO="mlinux_end"
+SUBSYSTEM!="tty", GOTO="mlinux_end"
+KERNEL!="ttyXRUSB[0-9]*", GOTO="mlinux_end"
+
+SUBSYSTEMS=="usb", ENV{ID_IFACE}="$attr{bInterfaceNumber}"
+ENV{ID_IFACE}=="", GOTO="mlinux_end"
+
+# Accessory Ports
+ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1"
+ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="00", SYMLINK+="ttyAP1"
+ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1412", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2"
+ATTRS{idVendor}=="04e2", ATTRS{idProduct}=="1414", ENV{ID_IFACE}=="02", SYMLINK+="ttyAP2"
+
+LABEL="mlinux_end"
diff --git a/recipes-core/udev/eudev/udev-cache.default b/recipes-core/udev/eudev/udev-cache.default
new file mode 100644
index 0000000..b1aa63f
--- /dev/null
+++ b/recipes-core/udev/eudev/udev-cache.default
@@ -0,0 +1,5 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
+PROBE_PLATFORM_BUS="yes"
diff --git a/recipes-core/udev/eudev_%.bbappend b/recipes-core/udev/eudev_%.bbappend
new file mode 100644
index 0000000..2a15734
--- /dev/null
+++ b/recipes-core/udev/eudev_%.bbappend
@@ -0,0 +1,21 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+
+PR .= ".mlinux2"
+
+# add custom rules for persistent modem device names
+SRC_URI += "	file://cellular_radios.rules \
+		file://${MACHINE}.rules \
+		   "
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI_append_mtcdt = "       file://accessory_ethernet.rules \
+			"
+
+do_install_append() {
+	install -m 644 ${WORKDIR}/cellular_radios.rules ${D}${sysconfdir}/udev/rules.d/
+	install -m 644 ${WORKDIR}/${MACHINE}.rules ${D}${sysconfdir}/udev/rules.d/
+}
+
+do_install_append_mtcdt() {
+	install -m 644 ${WORKDIR}/accessory_ethernet.rules ${D}${sysconfdir}/udev/rules.d/
+}
diff --git a/recipes-core/udev/eudev_3.1.5.bbappend b/recipes-core/udev/eudev_3.1.5.bbappend
deleted file mode 100644
index e793d1d..0000000
--- a/recipes-core/udev/eudev_3.1.5.bbappend
+++ /dev/null
@@ -1,20 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-
-PR .= ".mlinux2"
-
-# add custom rules for persistent modem device names
-SRC_URI += "	file://cellular_radios.rules \
-		file://${MACHINE}.rules \
-		   "
-
-SRC_URI_append_mtcdt = "       file://accessory_ethernet.rules \
-			"
-
-do_install_append() {
-	install -m 644 ${WORKDIR}/cellular_radios.rules ${D}${sysconfdir}/udev/rules.d/
-	install -m 644 ${WORKDIR}/${MACHINE}.rules ${D}${sysconfdir}/udev/rules.d/
-}
-
-do_install_append_mtcdt() {
-	install -m 644 ${WORKDIR}/accessory_ethernet.rules ${D}${sysconfdir}/udev/rules.d/
-}
-- 
cgit v1.2.3


From f911d680a7b085b29d2bdd87cae0381985a6fc39 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 25 Apr 2017 15:48:35 -0500
Subject: Use openembedded ppp

---
 ...01-ppp-Fix-compilation-errors-in-Makefile.patch |  75 ------
 recipes-connectivity/ppp/ppp-2.4.7/08setupdns      |  12 -
 recipes-connectivity/ppp/ppp-2.4.7/92removedns     |   5 -
 .../ppp/ppp-2.4.7/cifdefroute.patch                | 292 ---------------------
 recipes-connectivity/ppp/ppp-2.4.7/copts.patch     |  21 --
 recipes-connectivity/ppp/ppp-2.4.7/init            |  50 ----
 recipes-connectivity/ppp/ppp-2.4.7/ip-down         |  43 ---
 recipes-connectivity/ppp/ppp-2.4.7/ip-up           |  49 ----
 .../makefile-remove-hard-usr-reference.patch       |  37 ---
 recipes-connectivity/ppp/ppp-2.4.7/makefile.patch  |  95 -------
 recipes-connectivity/ppp/ppp-2.4.7/pap             |  22 --
 recipes-connectivity/ppp/ppp-2.4.7/poff            |  26 --
 recipes-connectivity/ppp/ppp-2.4.7/pon             |   9 -
 recipes-connectivity/ppp/ppp-2.4.7/ppp_on_boot     |  21 --
 .../ppp/ppp-2.4.7/pppd-resolv-varrun.patch         |  45 ----
 recipes-connectivity/ppp/ppp-2.4.7/provider        |  35 ---
 recipes-connectivity/ppp/ppp_2.4.7.bb              |  88 -------
 17 files changed, 925 deletions(-)
 delete mode 100644 recipes-connectivity/ppp/ppp-2.4.7/0001-ppp-Fix-compilation-errors-in-Makefile.patch
 delete mode 100644 recipes-connectivity/ppp/ppp-2.4.7/08setupdns
 delete mode 100644 recipes-connectivity/ppp/ppp-2.4.7/92removedns
 delete mode 100644 recipes-connectivity/ppp/ppp-2.4.7/cifdefroute.patch
 delete mode 100644 recipes-connectivity/ppp/ppp-2.4.7/copts.patch
 delete mode 100755 recipes-connectivity/ppp/ppp-2.4.7/init
 delete mode 100755 recipes-connectivity/ppp/ppp-2.4.7/ip-down
 delete mode 100755 recipes-connectivity/ppp/ppp-2.4.7/ip-up
 delete mode 100644 recipes-connectivity/ppp/ppp-2.4.7/makefile-remove-hard-usr-reference.patch
 delete mode 100644 recipes-connectivity/ppp/ppp-2.4.7/makefile.patch
 delete mode 100644 recipes-connectivity/ppp/ppp-2.4.7/pap
 delete mode 100644 recipes-connectivity/ppp/ppp-2.4.7/poff
 delete mode 100644 recipes-connectivity/ppp/ppp-2.4.7/pon
 delete mode 100644 recipes-connectivity/ppp/ppp-2.4.7/ppp_on_boot
 delete mode 100644 recipes-connectivity/ppp/ppp-2.4.7/pppd-resolv-varrun.patch
 delete mode 100644 recipes-connectivity/ppp/ppp-2.4.7/provider
 delete mode 100644 recipes-connectivity/ppp/ppp_2.4.7.bb

diff --git a/recipes-connectivity/ppp/ppp-2.4.7/0001-ppp-Fix-compilation-errors-in-Makefile.patch b/recipes-connectivity/ppp/ppp-2.4.7/0001-ppp-Fix-compilation-errors-in-Makefile.patch
deleted file mode 100644
index 8aa2d2e..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/0001-ppp-Fix-compilation-errors-in-Makefile.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From ba0f6058d1f25b2b60fc31ab2656bf12a71ffdab Mon Sep 17 00:00:00 2001
-From: Lu Chong <Chong.Lu@windriver.com>
-Date: Tue, 5 Nov 2013 17:32:56 +0800
-Subject: [PATCH] ppp: Fix compilation errors in Makefile
-
-This patch fixes below issues:
-
-1. Make can't exit while compilation error occurs in subdir for plugins building.
-
-2. If build ppp with newer kernel (3.10.10), it will pick 'if_pppox.h' from sysroot-dir and
-   'if_pppol2tp.h' from its own source dir, this cause below build errors:
-
-        bitbake_build/tmp/sysroots/intel-x86-64/usr/include/linux/if_pppox.h:84:26:
-        error: field 'pppol2tp' has incomplete type
-          struct pppol2tpin6_addr pppol2tp;
-                                  ^
-        bitbake_build/tmp/sysroots/intel-x86-64/usr/include/linux/if_pppox.h:99:28:
-        error: field 'pppol2tp' has incomplete type
-          struct pppol2tpv3in6_addr pppol2tp;
-                                    ^
-
-The 'sysroot-dir/if_pppox.h' enabled ipv6 support but the 'source-dir/if_pppol2tp.h' lost
-related structure definitions, we should use both header files from sysroots to fix this
-build failure.
-
-Upstream-Status: Pending
-
-Signed-off-by: Lu Chong <Chong.Lu@windriver.com>
----
- pppd/plugins/Makefile.linux          |    2 +-
- pppd/plugins/pppol2tp/Makefile.linux |    2 +-
- pppd/plugins/rp-pppoe/Makefile.linux |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
-index 0a7ec7b..2a2c15a 100644
---- a/pppd/plugins/Makefile.linux
-+++ b/pppd/plugins/Makefile.linux
-@@ -20,7 +20,7 @@ include .depend
- endif
- 
- all:	$(PLUGINS)
--	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done
-+	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all || exit 1; done
- 
- %.so: %.c
- 	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
-diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
-index 19eff67..feb2f52 100644
---- a/pppd/plugins/pppol2tp/Makefile.linux
-+++ b/pppd/plugins/pppol2tp/Makefile.linux
-@@ -1,6 +1,6 @@
- #CC	= gcc
- COPTS	= -O2 -g
--CFLAGS	= $(COPTS) -I. -I../.. -I../../../include -fPIC
-+CFLAGS	= $(COPTS) -I. -I../.. -fPIC
- LDFLAGS	= -shared
- INSTALL	= install
- 
-diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
-index f078991..15b9118 100644
---- a/pppd/plugins/rp-pppoe/Makefile.linux
-+++ b/pppd/plugins/rp-pppoe/Makefile.linux
-@@ -26,7 +26,7 @@ INSTALL	= install
- RP_VERSION=3.8p
- 
- COPTS=-O2 -g
--CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
-+CFLAGS=$(COPTS) '-DRP_VERSION="$(RP_VERSION)"'
- all: rp-pppoe.so pppoe-discovery
- 
- pppoe-discovery: pppoe-discovery.o debug.o
--- 
-1.7.9.5
-
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/08setupdns b/recipes-connectivity/ppp/ppp-2.4.7/08setupdns
deleted file mode 100644
index 998219d..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/08setupdns
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-ACTUALCONF=/var/run/resolv.conf
-PPPCONF=/var/run/ppp/resolv.conf
-if [ -f $PPPCONF ] ; then
-	if [ -f $ACTUALCONF ] ; then
-		if [ ! -h $ACTUALCONF -o ! "`readlink $ACTUALCONF 2>&1`" = "$PPPCONF" ] ; then
-			mv $ACTUALCONF $ACTUALCONF.ppporig
-		fi
-	fi
-
-	ln -sf $PPPCONF $ACTUALCONF
-fi
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/92removedns b/recipes-connectivity/ppp/ppp-2.4.7/92removedns
deleted file mode 100644
index 2eadec6..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/92removedns
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-ACTUALCONF=/var/run/resolv.conf
-if [ -f $ACTUALCONF.ppporig ] ; then
-	mv $ACTUALCONF.ppporig $ACTUALCONF
-fi
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/cifdefroute.patch b/recipes-connectivity/ppp/ppp-2.4.7/cifdefroute.patch
deleted file mode 100644
index db4dbc2..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/cifdefroute.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-This patch comes from OpenEmbedded.
-The original patch is from Debian / SuSE to implement replacedefaultroute
-Rebased it to fit ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
-
-Upstream-Status: Inappropriate [debian/suse patches]
-
-diff -urN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
---- ppp-2.4.5-orig/pppd/ipcp.c	2010-06-30 15:51:12.050166398 +0800
-+++ ppp-2.4.5/pppd/ipcp.c	2010-06-30 16:40:00.478716855 +0800
-@@ -198,6 +198,16 @@
-       "disable defaultroute option", OPT_ALIAS | OPT_A2CLR,
-       &ipcp_wantoptions[0].default_route },
- 
-+#ifdef __linux__
-+    { "replacedefaultroute", o_bool,
-+                               &ipcp_wantoptions[0].replace_default_route,
-+      "Replace default route", 1
-+    },
-+    { "noreplacedefaultroute", o_bool,
-+                               &ipcp_allowoptions[0].replace_default_route,
-+      "Never replace default route", OPT_A2COPY,
-+                               &ipcp_wantoptions[0].replace_default_route },
-+#endif
-     { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp,
-       "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp },
-     { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp,
-@@ -271,7 +281,7 @@
-     ip_active_pkt
- };
- 
--static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t));
-+static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t, bool));
- static void ipcp_script __P((char *, int));	/* Run an up/down script */
- static void ipcp_script_done __P((void *));
- 
-@@ -1742,7 +1752,12 @@
-     if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE))
- 	return 0;
-     if (wo->default_route)
-+#ifndef __linux__
- 	if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr))
-+#else
-+	if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr,
-+                                            wo->replace_default_route))
-+#endif
- 	    default_route_set[u] = 1;
-     if (wo->proxy_arp)
- 	if (sifproxyarp(u, wo->hisaddr))
-@@ -1830,7 +1845,8 @@
-      */
-     if (demand) {
- 	if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) {
--	    ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr);
-+	    ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr, 
-+				      wo->replace_default_route);
- 	    if (go->ouraddr != wo->ouraddr) {
- 		warn("Local IP address changed to %I", go->ouraddr);
- 		script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0);
-@@ -1855,7 +1871,12 @@
- 
- 	    /* assign a default route through the interface if required */
- 	    if (ipcp_wantoptions[f->unit].default_route) 
-+#ifndef __linux__
- 		if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
-+#else
-+		if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr,
-+					     wo->replace_default_route))
-+#endif
- 		    default_route_set[f->unit] = 1;
- 
- 	    /* Make a proxy ARP entry if requested. */
-@@ -1905,7 +1926,12 @@
- 
- 	/* assign a default route through the interface if required */
- 	if (ipcp_wantoptions[f->unit].default_route) 
-+#ifndef __linux__
- 	    if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
-+#else
-+	    if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr,
-+					 wo->replace_default_route))
-+#endif
- 		default_route_set[f->unit] = 1;
- 
- 	/* Make a proxy ARP entry if requested. */
-@@ -1983,7 +2009,7 @@
- 	sifnpmode(f->unit, PPP_IP, NPMODE_DROP);
- 	sifdown(f->unit);
- 	ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr,
--			 ipcp_hisoptions[f->unit].hisaddr);
-+			 ipcp_hisoptions[f->unit].hisaddr, 0);
-     }
- 
-     /* Execute the ip-down script */
-@@ -1999,12 +2025,21 @@
-  * proxy arp entries, etc.
-  */
- static void
--ipcp_clear_addrs(unit, ouraddr, hisaddr)
-+ipcp_clear_addrs(unit, ouraddr, hisaddr, replacedefaultroute)
-     int unit;
-     u_int32_t ouraddr;  /* local address */
-     u_int32_t hisaddr;  /* remote address */
-+    bool replacedefaultroute;
- {
--    if (proxy_arp_set[unit]) {
-+    /* If replacedefaultroute, sifdefaultroute will be called soon
-+     * with replacedefaultroute set and that will overwrite the current
-+     * default route. This is the case only when doing demand, otherwise
-+     * during demand, this cifdefaultroute would restore the old default
-+     * route which is not what we want in this case. In the non-demand
-+     * case, we'll delete the default route and restore the old if there
-+     * is one saved by an sifdefaultroute with replacedefaultroute.
-+     */
-+    if (!replacedefaultroute && default_route_set[unit]) {
- 	cifproxyarp(unit, hisaddr);
- 	proxy_arp_set[unit] = 0;
-     }
-diff -urN ppp-2.4.5-orig/pppd/ipcp.h ppp-2.4.5/pppd/ipcp.h
---- ppp-2.4.5-orig/pppd/ipcp.h	2010-06-30 15:51:12.043682063 +0800
-+++ ppp-2.4.5/pppd/ipcp.h	2010-06-30 16:40:49.586203129 +0800
-@@ -70,6 +70,7 @@
-     bool old_addrs;		/* Use old (IP-Addresses) option? */
-     bool req_addr;		/* Ask peer to send IP address? */
-     bool default_route;		/* Assign default route through interface? */
-+    bool replace_default_route; /* Replace default route through interface? */
-     bool proxy_arp;		/* Make proxy ARP entry for peer? */
-     bool neg_vj;		/* Van Jacobson Compression? */
-     bool old_vj;		/* use old (short) form of VJ option? */
-diff -urN ppp-2.4.5-orig/pppd/pppd.8 ppp-2.4.5/pppd/pppd.8
---- ppp-2.4.5-orig/pppd/pppd.8	2010-06-30 15:51:12.043682063 +0800
-+++ ppp-2.4.5/pppd/pppd.8	2010-06-30 16:42:47.102413859 +0800
-@@ -121,6 +121,13 @@
- This entry is removed when the PPP connection is broken.  This option
- is privileged if the \fInodefaultroute\fR option has been specified.
- .TP
-+.B replacedefaultroute
-+This option is a flag to the defaultroute option. If defaultroute is
-+set and this flag is also set, pppd replaces an existing default route
-+with the new default route.
-+
-+
-+.TP
- .B disconnect \fIscript
- Execute the command specified by \fIscript\fR, by passing it to a
- shell, after
-@@ -717,7 +724,12 @@
- .TP
- .B nodefaultroute
- Disable the \fIdefaultroute\fR option.  The system administrator who
--wishes to prevent users from creating default routes with pppd
-+wishes to prevent users from adding a default route with pppd
-+can do so by placing this option in the /etc/ppp/options file.
-+.TP
-+.B noreplacedefaultroute
-+Disable the \fIreplacedefaultroute\fR option. The system administrator who
-+wishes to prevent users from replacing a default route with pppd
- can do so by placing this option in the /etc/ppp/options file.
- .TP
- .B nodeflate
-diff -urN ppp-2.4.5-orig/pppd/pppd.h ppp-2.4.5/pppd/pppd.h
---- ppp-2.4.5-orig/pppd/pppd.h	2010-06-30 15:51:12.050166398 +0800
-+++ ppp-2.4.5/pppd/pppd.h	2010-06-30 16:43:36.514148327 +0800
-@@ -643,7 +643,11 @@
- int  cif6addr __P((int, eui64_t, eui64_t));
- 				/* Remove an IPv6 address from i/f */
- #endif
-+#ifndef __linux__
- int  sifdefaultroute __P((int, u_int32_t, u_int32_t));
-+#else
-+int  sifdefaultroute __P((int, u_int32_t, u_int32_t, bool replace_default_rt));
-+#endif
- 				/* Create default route through i/f */
- int  cifdefaultroute __P((int, u_int32_t, u_int32_t));
- 				/* Delete default route through i/f */
-diff -urN ppp-2.4.5-orig/pppd/sys-linux.c ppp-2.4.5/pppd/sys-linux.c
---- ppp-2.4.5-orig/pppd/sys-linux.c	2010-06-30 15:51:12.050166398 +0800
-+++ ppp-2.4.5/pppd/sys-linux.c	2010-06-30 16:54:00.362716231 +0800
-@@ -206,6 +206,8 @@
- 
- static int	if_is_up;	/* Interface has been marked up */
- static int	have_default_route;	/* Gateway for default route added */
-+static struct rtentry old_def_rt;       /* Old default route */
-+static int       default_rt_repl_rest;  /* replace and restore old default rt */
- static u_int32_t proxy_arp_addr;	/* Addr for proxy arp entry added */
- static char proxy_arp_dev[16];		/* Device for proxy arp entry */
- static u_int32_t our_old_addr;		/* for detecting address changes */
-@@ -1537,6 +1539,9 @@
- 	p = NULL;
-     }
- 
-+    SET_SA_FAMILY (rt->rt_dst,     AF_INET);
-+    SET_SA_FAMILY (rt->rt_gateway, AF_INET);
-+
-     SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16);
-     SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16);
-     SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16);
-@@ -1606,20 +1611,51 @@
- /********************************************************************
-  *
-  * sifdefaultroute - assign a default route through the address given.
-- */
--
--int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
--{
--    struct rtentry rt;
--
--    if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) {
--	if (rt.rt_flags & RTF_GATEWAY)
--	    error("not replacing existing default route via %I",
--		  SIN_ADDR(rt.rt_gateway));
--	else
--	    error("not replacing existing default route through %s",
--		  rt.rt_dev);
--	return 0;
-+ *
-+ * If the global default_rt_repl_rest flag is set, then this function
-+ * already replaced the original system defaultroute with some other
-+ * route and it should just replace the current defaultroute with
-+ * another one, without saving the current route. Use: demand mode,
-+ * when pppd sets first a defaultroute it it's temporary ppp0 addresses
-+ * and then changes the temporary addresses to the addresses for the real
-+ * ppp connection when it has come up.
-+ */
-+
-+int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway, bool replace)
-+{
-+    struct rtentry rt, tmp_rt;
-+    struct rtentry *del_rt = NULL;
-+
-+    if (default_rt_repl_rest) {
-+	/* We have already reclaced the original defaultroute, if we
-+         * are called again, we will delete the current default route
-+         * and set the new default route in this function.  
-+         * - this is normally only the case the doing demand: */
-+	if (defaultroute_exists( &tmp_rt ))
-+		del_rt = &tmp_rt;
-+    } else if ( defaultroute_exists( &old_def_rt                ) &&
-+	                     strcmp(  old_def_rt.rt_dev, ifname ) != 0) {
-+	/* We did not yet replace an existing default route, let's
-+	 * check if we should save and replace a default route:
-+         */
-+	u_int32_t old_gateway = SIN_ADDR(old_def_rt.rt_gateway);
-+	if (old_gateway != gateway) {
-+	    if (!replace) {
-+	        error("not replacing default route to %s [%I]",
-+			old_def_rt.rt_dev, old_gateway);
-+		return 0;
-+	    } else {
-+		// we need to copy rt_dev because we need it permanent too:
-+		char * tmp_dev = malloc(strlen(old_def_rt.rt_dev)+1);
-+		strcpy(tmp_dev, old_def_rt.rt_dev);
-+		old_def_rt.rt_dev = tmp_dev;
-+
-+		notice("replacing old default route to %s [%I]",
-+			old_def_rt.rt_dev, old_gateway);
-+	        default_rt_repl_rest = 1;
-+		del_rt = &old_def_rt;
-+	    }
-+	}
-     }
- 
-     memset (&rt, 0, sizeof (rt));
-@@ -1638,6 +1674,12 @@
- 	    error("default route ioctl(SIOCADDRT): %m");
- 	return 0;
-     }
-+    if (default_rt_repl_rest && del_rt)
-+        if (ioctl(sock_fd, SIOCDELRT, del_rt) < 0) {
-+	    if ( ! ok_error ( errno ))
-+	        error("del old default route ioctl(SIOCDELRT): %m(%d)", errno);
-+	    return 0;
-+        }
- 
-     have_default_route = 1;
-     return 1;
-@@ -1673,6 +1715,16 @@
- 	    return 0;
- 	}
-     }
-+    if (default_rt_repl_rest) {
-+	notice("restoring old default route to %s [%I]",
-+			old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway));
-+        if (ioctl(sock_fd, SIOCADDRT, &old_def_rt) < 0) {
-+	    if ( ! ok_error ( errno ))
-+	        error("restore default route ioctl(SIOCADDRT): %m(%d)", errno);
-+	    return 0;
-+        }
-+        default_rt_repl_rest = 0;
-+    }
- 
-     return 1;
- }
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/copts.patch b/recipes-connectivity/ppp/ppp-2.4.7/copts.patch
deleted file mode 100644
index 53ff06e..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/copts.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-ppp: use build system CFLAGS when compiling
-
-Upstream-Status: Pending
-
-Override the hard-coded COPTS make variables with
-CFLAGS.  Add COPTS into one Makefile that did not
-use it.
-
-Signed-off-by: Joe Slater <jslater@windriver.com>
-
---- a/pppd/plugins/radius/Makefile.linux
-+++ b/pppd/plugins/radius/Makefile.linux
-@@ -12,7 +12,7 @@ VERSION = $(shell awk -F '"' '/VERSION/ 
- INSTALL	= install
- 
- PLUGIN=radius.so radattr.so radrealms.so
--CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
-+CFLAGS=-I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
- 
- # Uncomment the next line to include support for Microsoft's
- # MS-CHAP authentication protocol.
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/init b/recipes-connectivity/ppp/ppp-2.4.7/init
deleted file mode 100755
index 5b3b7ab..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/init
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#
-#   /etc/init.d/ppp: start or stop PPP link.
-#
-# If you want PPP started on boot time (most dialup systems won't need it)
-# rename the /etc/ppp/no_ppp_on_boot file to /etc/ppp/ppp_on_boot, and
-# follow the instructions in the comments in that file.
-
-test -x /usr/sbin/pppd -a -f /etc/ppp/ppp_on_boot || exit 0
-if [ -x /etc/ppp/ppp_on_boot ]; then RUNFILE=1; fi
-
-case "$1" in
-  start)
-      echo -n "Starting up PPP link: pppd"
-      if [ "$RUNFILE" = "1" ]; then
-        /etc/ppp/ppp_on_boot
-      else
-        pppd call provider
-      fi
-      echo "."
-    ;;
-  stop)
-      echo -n "Shutting down PPP link: pppd"
-      if [ "$RUNFILE" = "1" ]; then
-        poff
-      else
-        poff provider
-      fi
-      echo "."
-    ;;
-  restart|force-reload)
-    echo -n "Restarting PPP link: pppd"
-    if [ "$RUNFILE" = "1" ]; then      
-      poff
-      sleep 5
-      /etc/ppp/ppp_on_boot
-    else                  
-      poff provider
-      sleep 5
-      pppd call provider
-    fi
-    echo "."
-    ;;
-  *)
-      echo "Usage: /etc/init.d/ppp {start|stop|restart|force-reload}"
-      exit 1
-    ;;
-esac
-
-exit 0
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/ip-down b/recipes-connectivity/ppp/ppp-2.4.7/ip-down
deleted file mode 100755
index 06d3548..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/ip-down
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# $Id: ip-down,v 1.2 1998/02/10 21:21:55 phil Exp $
-#
-# This script is run by the pppd _after_ the link is brought down.
-# It uses run-parts to run scripts in /etc/ppp/ip-down.d, so to delete
-# routes, unset IP addresses etc. you should create script(s) there.
-#
-# Be aware that other packages may include /etc/ppp/ip-down.d scripts (named
-# after that package), so choose local script names with that in mind.
-#
-# This script is called with the following arguments:
-#    Arg  Name                          Example
-#    $1   Interface name                ppp0
-#    $2   The tty                       ttyS1
-#    $3   The link speed                38400
-#    $4   Local IP number               12.34.56.78
-#    $5   Peer  IP number               12.34.56.99
-#    $6   Optional ``ipparam'' value    foo
-
-# The  environment is cleared before executing this script
-# so the path must be reset
-PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
-export PATH
-# These variables are for the use of the scripts run by run-parts
-PPP_IFACE="$1"
-PPP_TTY="$2"
-PPP_SPEED="$3"
-PPP_LOCAL="$4"
-PPP_REMOTE="$5"
-PPP_IPPARAM="$6"
-export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
-
-# as an additional convenience, $PPP_TTYNAME is set to the tty name,
-# stripped of /dev/ (if present) for easier matching.
-PPP_TTYNAME=`/usr/bin/basename "$2"`
-export PPP_TTYNAME 
-
-# Main Script starts here
-
-run-parts /etc/ppp/ip-down.d
-
-# last line
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/ip-up b/recipes-connectivity/ppp/ppp-2.4.7/ip-up
deleted file mode 100755
index b78e688..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/ip-up
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# $Id: ip-up,v 1.2 1998/02/10 21:25:34 phil Exp $
-#
-# This script is run by the pppd after the link is established.
-# It uses run-parts to run scripts in /etc/ppp/ip-up.d, so to add routes,
-# set IP address, run the mailq etc. you should create script(s) there.
-#
-# Be aware that other packages may include /etc/ppp/ip-up.d scripts (named
-# after that package), so choose local script names with that in mind.
-#
-# This script is called with the following arguments:
-#    Arg  Name                          Example
-#    $1   Interface name                ppp0
-#    $2   The tty                       ttyS1
-#    $3   The link speed                38400
-#    $4   Local IP number               12.34.56.78
-#    $5   Peer  IP number               12.34.56.99
-#    $6   Optional ``ipparam'' value    foo
-
-# The  environment is cleared before executing this script
-# so the path must be reset
-PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin
-export PATH
-# These variables are for the use of the scripts run by run-parts
-PPP_IFACE="$1"
-PPP_TTY="$2"
-PPP_SPEED="$3"
-PPP_LOCAL="$4"
-PPP_REMOTE="$5"
-PPP_IPPARAM="$6"
-export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM
-
-
-# as an additional convenience, $PPP_TTYNAME is set to the tty name,
-# stripped of /dev/ (if present) for easier matching.
-PPP_TTYNAME=`/usr/bin/basename "$2"`
-export PPP_TTYNAME 
-
-# Main Script starts here
-
-run-parts /etc/ppp/ip-up.d
-
-# save timestamp
-linkuptime=$(cat /proc/uptime)
-linkuptime=${linkuptime%%.*}
-echo "$linkuptime" > /var/run/pppisup-$PPP_IFACE.sec
-
-# last line
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/makefile-remove-hard-usr-reference.patch b/recipes-connectivity/ppp/ppp-2.4.7/makefile-remove-hard-usr-reference.patch
deleted file mode 100644
index d59717e..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/makefile-remove-hard-usr-reference.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-The patch comes from OpenEmbedded.
-Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
-
-Updated from OE-Classic to include the pcap hunk.
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-
-Upstream-Status: Inappropriate [configuration]
-
-diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
---- ppp-2.4.5-orig/pppd/Makefile.linux	2010-06-30 15:51:12.043682063 +0800
-+++ ppp-2.4.5/pppd/Makefile.linux	2010-06-30 17:08:21.806363042 +0800
-@@ -117,10 +117,10 @@
- #LIBS     += -lshadow $(LIBS)
- endif
- 
--ifneq ($(wildcard /usr/include/crypt.h),)
-+#ifneq ($(wildcard /usr/include/crypt.h),)
- CFLAGS  += -DHAVE_CRYPT_H=1
- LIBS	+= -lcrypt
--endif
-+#endif
- 
- ifdef NEEDDES
- ifndef USE_CRYPT
-@@ -169,10 +169,10 @@
- endif
- 
- ifdef FILTER
--ifneq ($(wildcard /usr/include/pcap-bpf.h),)
-+#ifneq ($(wildcard /usr/include/pcap-bpf.h),)
- LIBS    += -lpcap
- CFLAGS  += -DPPP_FILTER
--endif
-+#endif
- endif
- 
- ifdef HAVE_INET6
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/makefile.patch b/recipes-connectivity/ppp/ppp-2.4.7/makefile.patch
deleted file mode 100644
index 2d09baf..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/makefile.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-The patch comes from OpenEmbedded
-Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
-
-Upstream-Status: Inappropriate [configuration]
-
-diff -ruN ppp-2.4.5-orig/chat/Makefile.linux ppp-2.4.5/chat/Makefile.linux
---- ppp-2.4.5-orig/chat/Makefile.linux	2010-06-30 15:51:12.050166398 +0800
-+++ ppp-2.4.5/chat/Makefile.linux	2010-06-30 15:51:30.450118446 +0800
-@@ -25,7 +25,7 @@
- 
- install: chat
- 	mkdir -p $(BINDIR) $(MANDIR)
--	$(INSTALL) -s -c chat $(BINDIR)
-+	$(INSTALL) -c chat $(BINDIR)
- 	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
- 
- clean:
-diff -ruN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
---- ppp-2.4.5-orig/pppd/Makefile.linux	2010-06-30 15:51:12.043682063 +0800
-+++ ppp-2.4.5/pppd/Makefile.linux	2010-06-30 15:52:11.214170607 +0800
-@@ -99,7 +99,7 @@
- CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
- LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
- TARGETS	+= srp-entry
--EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
-+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
- MANPAGES += srp-entry.8
- EXTRACLEAN += srp-entry.o
- NEEDDES=y
-@@ -200,7 +200,7 @@
- install: pppd
- 	mkdir -p $(BINDIR) $(MANDIR)
- 	$(EXTRAINSTALL)
--	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
-+	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
- 	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
- 	  chmod o-rx,u+s $(BINDIR)/pppd; fi
- 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
-diff -ruN ppp-2.4.5-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.5/pppd/plugins/radius/Makefile.linux
---- ppp-2.4.5-orig/pppd/plugins/radius/Makefile.linux	2010-06-30 15:51:12.047676187 +0800
-+++ ppp-2.4.5/pppd/plugins/radius/Makefile.linux	2010-06-30 15:53:47.750182267 +0800
-@@ -36,11 +36,11 @@
- 
- install: all
- 	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
--	$(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
--	$(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
--	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
--	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
-+	$(INSTALL) -c -m 755 radius.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 radattr.so $(LIBDIR)
-+	$(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
-+	$(INSTALL) -m 444 pppd-radius.8 $(MANDIR)
-+	$(INSTALL) -m 444 pppd-radattr.8 $(MANDIR)
- 
- radius.so: radius.o libradiusclient.a
- 	$(CC) -o radius.so -shared radius.o libradiusclient.a
-diff -ruN ppp-2.4.5-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux
---- ppp-2.4.5-orig/pppd/plugins/rp-pppoe/Makefile.linux	2010-06-30 15:51:12.047676187 +0800
-+++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux	2010-06-30 15:53:15.454486877 +0800
-@@ -43,9 +43,9 @@
- 
- install: all
- 	$(INSTALL) -d -m 755 $(LIBDIR)
--	$(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
-+	$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
- 	$(INSTALL) -d -m 755 $(BINDIR)
--	$(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
-+	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
- 
- clean:
- 	rm -f *.o *.so pppoe-discovery
-diff -ruN ppp-2.4.5-orig/pppdump/Makefile.linux ppp-2.4.5/pppdump/Makefile.linux
---- ppp-2.4.5-orig/pppdump/Makefile.linux	2010-06-30 15:51:12.058183383 +0800
-+++ ppp-2.4.5/pppdump/Makefile.linux	2010-06-30 15:52:25.762183537 +0800
-@@ -17,5 +17,5 @@
- 
- install:
- 	mkdir -p $(BINDIR) $(MANDIR)
--	$(INSTALL) -s -c pppdump $(BINDIR)
-+	$(INSTALL) -c pppdump $(BINDIR)
- 	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
-diff -ruN ppp-2.4.5-orig/pppstats/Makefile.linux ppp-2.4.5/pppstats/Makefile.linux
---- ppp-2.4.5-orig/pppstats/Makefile.linux	2010-06-30 15:51:12.058183383 +0800
-+++ ppp-2.4.5/pppstats/Makefile.linux	2010-06-30 15:52:42.486341081 +0800
-@@ -22,7 +22,7 @@
- 
- install: pppstats
- 	-mkdir -p $(MANDIR)
--	$(INSTALL) -s -c pppstats $(BINDIR)
-+	$(INSTALL) -c pppstats $(BINDIR)
- 	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
- 
- pppstats: $(PPPSTATSRCS)
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/pap b/recipes-connectivity/ppp/ppp-2.4.7/pap
deleted file mode 100644
index 093c326..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/pap
+++ /dev/null
@@ -1,22 +0,0 @@
-# You can use this script unmodified to connect to sites which allow
-# authentication via PAP, CHAP and similar protocols.
-# This script can be shared among different pppd peer configurations.
-# To use it, add something like this to your /etc/ppp/peers/ file:
-#
-# connect "/usr/sbin/chat -v -f /etc/chatscripts/pap -T PHONE-NUMBER"
-# user YOUR-USERNAME-IN-PAP-SECRETS
-# noauth
-
-# Uncomment the following line to see the connect speed.
-# It will be logged to stderr or to the file specified with the -r chat option.
-#REPORT		CONNECT
-
-ABORT		BUSY
-ABORT		VOICE
-ABORT		"NO CARRIER"
-ABORT		"NO DIALTONE"
-ABORT		"NO DIAL TONE"
-""		ATZ
-OK		ATDT\T
-CONNECT		""
-
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/poff b/recipes-connectivity/ppp/ppp-2.4.7/poff
deleted file mode 100644
index 0521a94..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/poff
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Lets see how many pppds are running....
-set -- `cat /var/run/ppp*.pid 2>/dev/null`
-
-case $# in
-  0) # pppd only creates a pid file once ppp is up, so let's try killing pppd
-     # on the assumption that we've not got that far yet.
-     killall pppd
-     ;;
-  1) # If only one was running then it can be killed (apparently killall
-     # caused problems for some, so lets try killing the pid from the file)
-     kill $1
-     ;;
-  *) # More than one! Aieehh.. Dont know which one to kill.
-     echo "More than one pppd running. None stopped"
-     exit 1
-     ;;
-esac
-
-if [ -r /var/run/ppp-quick ]
-then
-    rm -f /var/run/ppp-quick
-fi
-
-exit 0
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/pon b/recipes-connectivity/ppp/ppp-2.4.7/pon
deleted file mode 100644
index 91c0595..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/pon
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = "quick" ]
-then
-    touch /var/run/ppp-quick
-    shift
-fi
-
-/usr/sbin/pppd call ${1:-provider}
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/ppp_on_boot b/recipes-connectivity/ppp/ppp-2.4.7/ppp_on_boot
deleted file mode 100644
index 9793761..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/ppp_on_boot
+++ /dev/null
@@ -1,21 +0,0 @@
-###!/bin/sh
-#
-#   Rename this file to ppp_on_boot and pppd will be fired up as
-#   soon as the system comes up, connecting to `provider'.
-#
-#   If you also make this file executable, and replace the first line
-#   with just "#!/bin/sh", the commands below will be executed instead.
-#
-
-# The location of the ppp daemon itself (shouldn't need to be changed)
-PPPD=/usr/sbin/pppd
-
-# The default provider to connect to
-$PPPD call provider
-
-# Additional connections, which would just use settings from
-# /etc/ppp/options.<tty>
-#$PPPD ttyS0
-#$PPPD ttyS1
-#$PPPD ttyS2
-#$PPPD ttyS3
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/pppd-resolv-varrun.patch b/recipes-connectivity/ppp/ppp-2.4.7/pppd-resolv-varrun.patch
deleted file mode 100644
index a72414f..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/pppd-resolv-varrun.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-The patch comes from OpenEmbedded
-Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
-
-Upstream-Status: Inappropriate [embedded specific]
-
-diff -ruN ppp-2.4.5-orig/pppd/ipcp.c ppp-2.4.5/pppd/ipcp.c
---- ppp-2.4.5-orig/pppd/ipcp.c	2010-06-30 15:51:12.050166398 +0800
-+++ ppp-2.4.5/pppd/ipcp.c	2010-06-30 17:02:33.930393283 +0800
-@@ -55,6 +55,8 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
- 
- #include "pppd.h"
- #include "fsm.h"
-@@ -2095,6 +2097,14 @@
-     u_int32_t peerdns1, peerdns2;
- {
-     FILE *f;
-+    struct stat dirinfo;
-+
-+    if(stat(_PATH_OUTDIR, &dirinfo)) {
-+        if(mkdir(_PATH_OUTDIR, 0775)) {
-+            error("Failed to create directory %s: %m", _PATH_OUTDIR);
-+            return;
-+        }
-+    }
- 
-     f = fopen(_PATH_RESOLV, "w");
-     if (f == NULL) {
-diff -ruN ppp-2.4.5-orig/pppd/pathnames.h ppp-2.4.5/pppd/pathnames.h
---- ppp-2.4.5-orig/pppd/pathnames.h	2010-06-30 15:51:12.043682063 +0800
-+++ ppp-2.4.5/pppd/pathnames.h	2010-06-30 17:03:20.594371055 +0800
-@@ -30,7 +30,8 @@
- #define _PATH_TTYOPT	 _ROOT_PATH "/etc/ppp/options."
- #define _PATH_CONNERRS	 _ROOT_PATH "/etc/ppp/connect-errors"
- #define _PATH_PEERFILES	 _ROOT_PATH "/etc/ppp/peers/"
--#define _PATH_RESOLV	 _ROOT_PATH "/etc/ppp/resolv.conf"
-+#define _PATH_OUTDIR	_ROOT_PATH _PATH_VARRUN "/ppp"
-+#define _PATH_RESOLV	_PATH_OUTDIR "/resolv.conf"
- 
- #define _PATH_USEROPT	 ".ppprc"
- #define	_PATH_PSEUDONYM	 ".ppp_pseudonym"
diff --git a/recipes-connectivity/ppp/ppp-2.4.7/provider b/recipes-connectivity/ppp/ppp-2.4.7/provider
deleted file mode 100644
index e74d71a..0000000
--- a/recipes-connectivity/ppp/ppp-2.4.7/provider
+++ /dev/null
@@ -1,35 +0,0 @@
-# example configuration for a dialup connection authenticated with PAP or CHAP
-#
-# This is the default configuration used by pon(1) and poff(1).
-# See the manual page pppd(8) for information on all the options.
-
-# MUST CHANGE: replace myusername@realm with the PPP login name given to
-# your by your provider.
-# There should be a matching entry with the password in /etc/ppp/pap-secrets
-# and/or /etc/ppp/chap-secrets.
-user "myusername@realm"
-
-# MUST CHANGE: replace ******** with the phone number of your provider.
-# The /etc/chatscripts/pap chat script may be modified to change the
-# modem initialization string.
-connect "/usr/sbin/chat -v -f /etc/chatscripts/pap -T ********"
-
-# Serial device to which the modem is connected.
-/dev/modem
-
-# Speed of the serial line.
-115200
-
-# Assumes that your IP address is allocated dynamically by the ISP.
-noipdefault
-# Try to get the name server addresses from the ISP.
-usepeerdns
-# Use this connection as the default route.
-defaultroute
-
-# Makes pppd "dial again" when the connection is lost.
-persist
-
-# Do not ask the remote to authenticate.
-noauth
-
diff --git a/recipes-connectivity/ppp/ppp_2.4.7.bb b/recipes-connectivity/ppp/ppp_2.4.7.bb
deleted file mode 100644
index 4d9094c..0000000
--- a/recipes-connectivity/ppp/ppp_2.4.7.bb
+++ /dev/null
@@ -1,88 +0,0 @@
-SUMMARY = "Point-to-Point Protocol (PPP) support"
-DESCRIPTION = "ppp (Paul's PPP Package) is an open source package which implements \
-the Point-to-Point Protocol (PPP) on Linux and Solaris systems."
-SECTION = "console/network"
-HOMEPAGE = "http://samba.org/ppp/"
-BUGTRACKER = "http://ppp.samba.org/cgi-bin/ppp-bugs"
-DEPENDS = "libpcap"
-LICENSE = "BSD & GPLv2+ & LGPLv2+ & PD"
-LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77d87dc9c290a424dea \
-                    file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \
-                    file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
-                    file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2"
-PR = "r8"
-
-SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
-           file://makefile.patch \
-           file://cifdefroute.patch \
-           file://pppd-resolv-varrun.patch \
-           file://makefile-remove-hard-usr-reference.patch \
-           file://pon \
-           file://poff \
-           file://init \
-           file://ip-up \
-           file://ip-down \
-           file://08setupdns \
-           file://92removedns \
-           file://copts.patch \
-           file://pap \
-           file://ppp_on_boot \
-           file://provider \
-           file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \
-"
-
-SRC_URI[md5sum] = "78818f40e6d33a1d1de68a1551f6595a"
-SRC_URI[sha256sum] = "02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30"
-
-inherit autotools-brokensep
-
-TARGET_CC_ARCH += " ${LDFLAGS}"
-EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}"
-EXTRA_OECONF = "--disable-strip"
-
-# Package Makefile computes CFLAGS, referencing COPTS.
-# Typically hard-coded to '-O2 -g' in the Makefile's.
-#
-EXTRA_OEMAKE += ' COPTS="${CFLAGS}"'
-
-do_install_append () {
-	make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp
-	mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d
-	mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/
-	mkdir -p ${D}${sysconfdir}/ppp/ip-down.d/
-	install -m 0755 ${WORKDIR}/pon ${D}${bindir}/pon
-	install -m 0755 ${WORKDIR}/poff ${D}${bindir}/poff
-	install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ppp
-	install -m 0755 ${WORKDIR}/ip-up ${D}${sysconfdir}/ppp/
-	install -m 0755 ${WORKDIR}/ip-down ${D}${sysconfdir}/ppp/
-	install -m 0755 ${WORKDIR}/08setupdns ${D}${sysconfdir}/ppp/ip-up.d/
-	install -m 0755 ${WORKDIR}/92removedns ${D}${sysconfdir}/ppp/ip-down.d/
-	mkdir -p ${D}${sysconfdir}/chatscripts
-	mkdir -p ${D}${sysconfdir}/ppp/peers
-	install -m 0755 ${WORKDIR}/pap ${D}${sysconfdir}/chatscripts
-	install -m 0755 ${WORKDIR}/ppp_on_boot ${D}${sysconfdir}/ppp/ppp_on_boot
-	install -m 0755 ${WORKDIR}/provider ${D}${sysconfdir}/ppp/peers/provider
-	rm -rf ${D}/${mandir}/man8/man8
-	chmod u+s ${D}${sbindir}/pppd
-}
-
-CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
-PACKAGES =+ "${PN}-oa ${PN}-oe ${PN}-radius ${PN}-winbind ${PN}-minconn ${PN}-password ${PN}-l2tp ${PN}-tools"
-FILES_${PN}        = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd"
-FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug"
-FILES_${PN}-oa       = "${libdir}/pppd/${PV}/pppoatm.so"
-FILES_${PN}-oe       = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/rp-pppoe.so"
-FILES_${PN}-radius   = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so"
-FILES_${PN}-winbind  = "${libdir}/pppd/${PV}/winbind.so"
-FILES_${PN}-minconn  = "${libdir}/pppd/${PV}/minconn.so"
-FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so"
-FILES_${PN}-l2tp     = "${libdir}/pppd/${PV}/*l2tp.so"
-FILES_${PN}-tools    = "${sbindir}/pppstats ${sbindir}/pppdump"
-DESCRIPTION_${PN}-oa       = "Plugin for PPP needed for PPP-over-ATM"
-DESCRIPTION_${PN}-oe       = "Plugin for PPP needed for PPP-over-Ethernet"
-DESCRIPTION_${PN}-radius   = "Plugin for PPP that are related to RADIUS"
-DESCRIPTION_${PN}-winbind  = "Plugin for PPP to authenticate against Samba or Windows"
-DESCRIPTION_${PN}-minconn  = "Plugin for PPP to specify a minimum connect time before the idle timeout applies"
-DESCRIPTION_${PN}-password = "Plugin for PPP to get passwords via a pipe"
-DESCRIPTION_${PN}-l2tp     = "Plugin for PPP for l2tp support"
-DESCRIPTION_${PN}-tools    = "The pppdump and pppstats utitilities"
-- 
cgit v1.2.3


From aed2676069931f42b7f50d243d36048d05a5ed58 Mon Sep 17 00:00:00 2001
From: Jeff Hatch <jhatch@multitech.com>
Date: Tue, 9 May 2017 13:34:07 -0500
Subject: Fix build to run do_firmware after do_image_complete so that rootfs
 jffs2 file has been created before trying to copy it

---
 classes/mlinux-image.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass
index 3c3bcaa..df31a39 100644
--- a/classes/mlinux-image.bbclass
+++ b/classes/mlinux-image.bbclass
@@ -46,7 +46,6 @@ do_firmware () {
     cp at91bootstrap_pmecc_padded.bin bstrap.bin
     cp u-boot-${MACHINE}.bin uboot.bin
     cp uImage-${MACHINE}.bin uImage.bin
-    sleep 30
     cp ${IMAGE_BASENAME}-${MACHINE}.jffs2 rootfs.jffs2
 
     cat bstrap.bin | md5sum > bstrap.bin.md5
@@ -61,7 +60,7 @@ do_firmware () {
     rm -f bstrap.bin* uboot.bin* uImage.bin* rootfs.jffs2* model
 }
 
-addtask firmware after do_rootfs before do_build
+addtask firmware after do_image_complete before do_build
 
 # make links to images in TFTPBOOT_DIR for ease of development
 do_tftpboot_links() {
-- 
cgit v1.2.3


From d1cda173c40be99def22edabe1b19a20a610fc68 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 16 May 2017 12:59:44 -0500
Subject: Update mkfs.jffs2 MTS command update to match Morty

---
 classes/mlinux-image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass
index df31a39..580901d 100644
--- a/classes/mlinux-image.bbclass
+++ b/classes/mlinux-image.bbclass
@@ -1,6 +1,6 @@
 # redefine mkfs.jffs2 command and remove --faketime option so we get non-zero file times
 # having file mod times of zero confuses cron
-IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.jffs2 ${EXTRA_IMAGECMD}"
 
 # set specified mtadm password in image using ROOT_PASSWORD_HASH
 mlinux_set_root_password () {
-- 
cgit v1.2.3


From c0fb6e7ba04bcfeef9a6c288629bf2708144d3a9 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 17 May 2017 16:45:02 -0500
Subject: Fix busybox recipe to get base64 command for password code.

---
 recipes-core/busybox/busybox-1.22.1/defconfig | 1020 -------------------------
 recipes-core/busybox/busybox_%.bbappend       |    2 +-
 recipes-core/busybox/files/defconfig          | 1020 +++++++++++++++++++++++++
 3 files changed, 1021 insertions(+), 1021 deletions(-)
 delete mode 100644 recipes-core/busybox/busybox-1.22.1/defconfig
 create mode 100644 recipes-core/busybox/files/defconfig

diff --git a/recipes-core/busybox/busybox-1.22.1/defconfig b/recipes-core/busybox/busybox-1.22.1/defconfig
deleted file mode 100644
index aa1e514..0000000
--- a/recipes-core/busybox/busybox-1.22.1/defconfig
+++ /dev/null
@@ -1,1020 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.20.2
-# Mon Aug 20 17:01:45 2012
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_DESKTOP is not set
-# CONFIG_EXTRA_COMPAT is not set
-# CONFIG_INCLUDE_SUSv2 is not set
-# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_PLATFORM_LINUX=y
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-CONFIG_FEATURE_VERBOSE_USAGE=y
-CONFIG_FEATURE_COMPRESS_USAGE=y
-# CONFIG_FEATURE_INSTALLER is not set
-# CONFIG_INSTALL_NO_USR is not set
-# CONFIG_LOCALE_SUPPORT is not set
-# CONFIG_UNICODE_SUPPORT is not set
-# CONFIG_UNICODE_USING_LOCALE is not set
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
-CONFIG_SUBST_WCHAR=0
-CONFIG_LAST_SUPPORTED_WCHAR=0
-# CONFIG_UNICODE_COMBINING_WCHARS is not set
-# CONFIG_UNICODE_WIDE_WCHARS is not set
-# CONFIG_UNICODE_BIDI_SUPPORT is not set
-# CONFIG_UNICODE_NEUTRAL_TABLE is not set
-# CONFIG_UNICODE_PRESERVE_BROKEN is not set
-CONFIG_LONG_OPTS=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_UTMP=y
-# CONFIG_FEATURE_WTMP is not set
-CONFIG_FEATURE_PIDFILE=y
-CONFIG_FEATURE_SUID=y
-CONFIG_FEATURE_SUID_CONFIG=y
-CONFIG_FEATURE_SUID_CONFIG_QUIET=y
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
-CONFIG_FEATURE_SYSLOG=y
-CONFIG_FEATURE_HAVE_RPC=y
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-# CONFIG_CROSS_COMPILER_PREFIX is not set
-CONFIG_SYSROOT=""
-# CONFIG_EXTRA_CFLAGS is not set
-CONFIG_EXTRA_LDFLAGS=""
-CONFIG_EXTRA_LDLIBS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-
-#
-# Installation Options ("make install" behavior)
-#
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-CONFIG_FEATURE_SYSTEMD=y
-CONFIG_FEATURE_RTMINMAX=y
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SMALL=1
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-CONFIG_FEATURE_USE_TERMIOS=y
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=64
-CONFIG_FEATURE_EDITING_SAVEHISTORY=y
-# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
-# CONFIG_FEATURE_REVERSE_SEARCH is not set
-CONFIG_FEATURE_TAB_COMPLETION=y
-CONFIG_FEATURE_USERNAME_COMPLETION=y
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_FEATURE_SKIP_ROOTFS=y
-CONFIG_MONOTONIC_SYSCALL=y
-CONFIG_IOCTL_HEX2STR_ERROR=y
-CONFIG_FEATURE_HWIB=y
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-CONFIG_FEATURE_SEAMLESS_XZ=y
-CONFIG_FEATURE_SEAMLESS_LZMA=y
-CONFIG_FEATURE_SEAMLESS_BZ2=y
-CONFIG_FEATURE_SEAMLESS_GZ=y
-CONFIG_FEATURE_SEAMLESS_Z=y
-CONFIG_AR=y
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-CONFIG_FEATURE_AR_CREATE=y
-CONFIG_BUNZIP2=y
-CONFIG_BZIP2=y
-CONFIG_CPIO=y
-# CONFIG_FEATURE_CPIO_O is not set
-# CONFIG_FEATURE_CPIO_P is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
-CONFIG_GZIP=y
-CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
-CONFIG_GZIP_FAST=0
-CONFIG_LZOP=y
-# CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-CONFIG_TAR=y
-CONFIG_FEATURE_TAR_CREATE=y
-CONFIG_FEATURE_TAR_AUTODETECT=y
-CONFIG_FEATURE_TAR_FROM=y
-CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
-# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
-CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
-CONFIG_FEATURE_TAR_TO_COMMAND=y
-CONFIG_FEATURE_TAR_UNAME_GNAME=y
-CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
-# CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNCOMPRESS is not set
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-# CONFIG_LZMA is not set
-CONFIG_UNXZ=y
-CONFIG_XZ=y
-CONFIG_UNZIP=y
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-CONFIG_CAT=y
-CONFIG_DATE=y
-CONFIG_FEATURE_DATE_ISOFMT=y
-# CONFIG_FEATURE_DATE_NANO is not set
-CONFIG_FEATURE_DATE_COMPAT=y
-# CONFIG_HOSTID is not set
-CONFIG_ID=y
-CONFIG_GROUPS=y
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-CONFIG_FEATURE_TOUCH_SUSV3=y
-CONFIG_TR=y
-CONFIG_FEATURE_TR_CLASSES=y
-# CONFIG_FEATURE_TR_EQUIV is not set
-CONFIG_BASE64=y
-CONFIG_WHO=y
-CONFIG_USERS=y
-# CONFIG_CAL is not set
-# CONFIG_CATV is not set
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
-CONFIG_CHROOT=y
-# CONFIG_CKSUM is not set
-# CONFIG_COMM is not set
-CONFIG_CP=y
-CONFIG_FEATURE_CP_LONG_OPTIONS=y
-CONFIG_CUT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
-# CONFIG_FEATURE_DD_IBS_OBS is not set
-CONFIG_DF=y
-CONFIG_FEATURE_DF_FANCY=y
-CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-# CONFIG_UNIX2DOS is not set
-CONFIG_DU=y
-CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_FEATURE_ENV_LONG_OPTIONS=y
-# CONFIG_EXPAND is not set
-# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-CONFIG_FSYNC=y
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-# CONFIG_INSTALL is not set
-# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
-CONFIG_LN=y
-CONFIG_LOGNAME=y
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_FEATURE_MV_LONG_OPTIONS=y
-CONFIG_NICE=y
-CONFIG_NOHUP=y
-CONFIG_OD=y
-# CONFIG_PRINTENV is not set
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-CONFIG_REALPATH=y
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
-CONFIG_SEQ=y
-# CONFIG_SHA1SUM is not set
-CONFIG_SHA256SUM=y
-CONFIG_SHA512SUM=y
-CONFIG_SLEEP=y
-CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_BIG=y
-# CONFIG_SPLIT is not set
-# CONFIG_FEATURE_SPLIT_FANCY is not set
-CONFIG_STAT=y
-CONFIG_FEATURE_STAT_FORMAT=y
-CONFIG_STTY=y
-# CONFIG_SUM is not set
-CONFIG_SYNC=y
-# CONFIG_TAC is not set
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TEE=y
-CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TRUE=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-# CONFIG_UNEXPAND is not set
-# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
-CONFIG_UNIQ=y
-CONFIG_USLEEP=y
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-CONFIG_WC=y
-# CONFIG_FEATURE_WC_LARGE is not set
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-CONFIG_CHVT=y
-# CONFIG_FGCONSOLE is not set
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-# CONFIG_KBD_MODE is not set
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-# CONFIG_RESIZE is not set
-# CONFIG_FEATURE_RESIZE_PRINT is not set
-CONFIG_SETCONSOLE=y
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-# CONFIG_SETFONT is not set
-# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
-CONFIG_DEFAULT_SETFONT_DIR=""
-# CONFIG_SETKEYCODES is not set
-# CONFIG_SETLOGCONS is not set
-# CONFIG_SHOWKEY is not set
-
-#
-# Common options for loadfont and setfont
-#
-# CONFIG_FEATURE_LOADFONT_PSF2 is not set
-# CONFIG_FEATURE_LOADFONT_RAW is not set
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-CONFIG_RUN_PARTS=y
-CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
-CONFIG_FEATURE_RUN_PARTS_FANCY=y
-CONFIG_START_STOP_DAEMON=y
-CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
-CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_PATCH=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=1024
-CONFIG_FEATURE_VI_8BIT=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_REGEX_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-# CONFIG_FEATURE_VI_READONLY is not set
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_LIBM=y
-CONFIG_CMP=y
-CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
-CONFIG_FEATURE_DIFF_DIR=y
-# CONFIG_ED is not set
-CONFIG_SED=y
-CONFIG_FEATURE_ALLOW_EXEC=y
-
-#
-# Finding Utilities
-#
-CONFIG_FIND=y
-CONFIG_FEATURE_FIND_PRINT0=y
-CONFIG_FEATURE_FIND_MTIME=y
-CONFIG_FEATURE_FIND_MMIN=y
-CONFIG_FEATURE_FIND_PERM=y
-CONFIG_FEATURE_FIND_TYPE=y
-CONFIG_FEATURE_FIND_XDEV=y
-CONFIG_FEATURE_FIND_MAXDEPTH=y
-CONFIG_FEATURE_FIND_NEWER=y
-CONFIG_FEATURE_FIND_INUM=y
-CONFIG_FEATURE_FIND_EXEC=y
-CONFIG_FEATURE_FIND_USER=y
-CONFIG_FEATURE_FIND_GROUP=y
-CONFIG_FEATURE_FIND_NOT=y
-CONFIG_FEATURE_FIND_DEPTH=y
-CONFIG_FEATURE_FIND_PAREN=y
-CONFIG_FEATURE_FIND_SIZE=y
-CONFIG_FEATURE_FIND_PRUNE=y
-CONFIG_FEATURE_FIND_DELETE=y
-CONFIG_FEATURE_FIND_PATH=y
-CONFIG_FEATURE_FIND_REGEX=y
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-CONFIG_FEATURE_FIND_LINKS=y
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-CONFIG_FEATURE_GREP_FGREP_ALIAS=y
-CONFIG_FEATURE_GREP_CONTEXT=y
-CONFIG_XARGS=y
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
-CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
-CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
-
-#
-# Init Utilities
-#
-# CONFIG_BOOTCHARTD is not set
-# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
-# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
-CONFIG_HALT=y
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
-# CONFIG_INIT is not set
-# CONFIG_FEATURE_USE_INITTAB is not set
-# CONFIG_FEATURE_KILL_REMOVED is not set
-CONFIG_FEATURE_KILL_DELAY=0
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_INIT_SYSLOG is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INITRD is not set
-CONFIG_INIT_TERMINAL_TYPE=""
-# CONFIG_MESG is not set
-# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL is not set
-# CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_USE_BB_SHADOW is not set
-CONFIG_USE_BB_CRYPT=y
-# CONFIG_USE_BB_CRYPT_SHA is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_FIRST_SYSTEM_ID=100
-CONFIG_LAST_SYSTEM_ID=999
-# CONFIG_ADDGROUP is not set
-# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-# CONFIG_DELUSER is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_GETTY is not set
-# CONFIG_LOGIN is not set
-# CONFIG_LOGIN_SESSION_AS_CHILD is not set
-# CONFIG_PAM is not set
-# CONFIG_LOGIN_SCRIPTS is not set
-# CONFIG_FEATURE_NOLOGIN is not set
-# CONFIG_FEATURE_SECURETTY is not set
-# CONFIG_PASSWD is not set
-# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
-# CONFIG_CRYPTPW is not set
-# CONFIG_CHPASSWD is not set
-CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
-# CONFIG_SU is not set
-# CONFIG_FEATURE_SU_SYSLOG is not set
-# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
-
-#
-# Linux Ext2 FS Progs
-#
-CONFIG_CHATTR=y
-CONFIG_FSCK=y
-# CONFIG_LSATTR is not set
-# CONFIG_TUNE2FS is not set
-
-#
-# Linux Module Utilities
-#
-# CONFIG_MODINFO is not set
-# CONFIG_MODPROBE_SMALL is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-CONFIG_INSMOD=y
-CONFIG_RMMOD=y
-CONFIG_LSMOD=y
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-CONFIG_MODPROBE=y
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-CONFIG_DEPMOD=y
-
-#
-# Options common to multiple modutils
-#
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_FEATURE_MODUTILS_ALIAS=y
-CONFIG_FEATURE_MODUTILS_SYMBOLS=y
-CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
-
-#
-# Linux System Utilities
-#
-# CONFIG_BLOCKDEV is not set
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_FEATURE_MDEV_RENAME is not set
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-# CONFIG_FEATURE_MDEV_EXEC is not set
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
-# CONFIG_REV is not set
-# CONFIG_ACPID is not set
-# CONFIG_FEATURE_ACPID_COMPAT is not set
-# CONFIG_BLKID is not set
-# CONFIG_FEATURE_BLKID_TYPE is not set
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
-CONFIG_FBSET=y
-CONFIG_FEATURE_FBSET_FANCY=y
-CONFIG_FEATURE_FBSET_READMODE=y
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-CONFIG_FDISK=y
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-CONFIG_FEATURE_FDISK_WRITABLE=y
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_GPT_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FINDFS is not set
-CONFIG_FLOCK=y
-# CONFIG_FREERAMDISK is not set
-CONFIG_FSCK_MINIX=y
-# CONFIG_MKFS_EXT2 is not set
-CONFIG_MKFS_MINIX=y
-CONFIG_FEATURE_MINIX2=y
-# CONFIG_MKFS_REISER is not set
-# CONFIG_MKFS_VFAT is not set
-CONFIG_GETOPT=y
-CONFIG_FEATURE_GETOPT_LONG=y
-CONFIG_HEXDUMP=y
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
-# CONFIG_HD is not set
-CONFIG_HWCLOCK=y
-CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
-CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-CONFIG_IPCRM=y
-CONFIG_IPCS=y
-CONFIG_LOSETUP=y
-# CONFIG_LSPCI is not set
-# CONFIG_LSUSB is not set
-CONFIG_MKSWAP=y
-# CONFIG_FEATURE_MKSWAP_UUID is not set
-CONFIG_MORE=y
-CONFIG_MOUNT=y
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-# CONFIG_FEATURE_MOUNT_LABEL is not set
-CONFIG_FEATURE_MOUNT_NFS=y
-# CONFIG_FEATURE_MOUNT_CIFS is not set
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
-CONFIG_PIVOT_ROOT=y
-CONFIG_RDATE=y
-# CONFIG_RDEV is not set
-# CONFIG_READPROFILE is not set
-# CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
-# CONFIG_SCRIPTREPLAY is not set
-# CONFIG_SETARCH is not set
-CONFIG_SWAPONOFF=y
-CONFIG_FEATURE_SWAPON_PRI=y
-CONFIG_SWITCH_ROOT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-# CONFIG_VOLUMEID is not set
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_CONSPY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
-# CONFIG_NANDWRITE is not set
-# CONFIG_NANDDUMP is not set
-# CONFIG_SETSERIAL is not set
-# CONFIG_UBIATTACH is not set
-# CONFIG_UBIDETACH is not set
-# CONFIG_UBIMKVOL is not set
-# CONFIG_UBIRMVOL is not set
-# CONFIG_UBIRSVOL is not set
-# CONFIG_UBIUPDATEVOL is not set
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
-# CONFIG_BEEP is not set
-CONFIG_FEATURE_BEEP_FREQ=0
-CONFIG_FEATURE_BEEP_LENGTH_MS=0
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-# CONFIG_CHRT is not set
-# CONFIG_CROND is not set
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR=""
-# CONFIG_CRONTAB is not set
-CONFIG_DC=y
-# CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_DEVMEM is not set
-# CONFIG_EJECT is not set
-# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
-# CONFIG_FLASHCP is not set
-# CONFIG_FLASH_LOCK is not set
-# CONFIG_FLASH_UNLOCK is not set
-# CONFIG_FLASH_ERASEALL is not set
-# CONFIG_IONICE is not set
-# CONFIG_INOTIFYD is not set
-# CONFIG_LAST is not set
-# CONFIG_FEATURE_LAST_SMALL is not set
-# CONFIG_FEATURE_LAST_FANCY is not set
-# CONFIG_HDPARM is not set
-# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
-# CONFIG_MAN is not set
-CONFIG_MICROCOM=y
-# CONFIG_MOUNTPOINT is not set
-# CONFIG_MT is not set
-# CONFIG_RAIDAUTORUN is not set
-# CONFIG_READAHEAD is not set
-CONFIG_RFKILL=y
-# CONFIG_RUNLEVEL is not set
-# CONFIG_RX is not set
-# CONFIG_SETSID is not set
-CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-CONFIG_TIME=y
-# CONFIG_TIMEOUT is not set
-# CONFIG_TTYSIZE is not set
-# CONFIG_VOLNAME is not set
-# CONFIG_WALL is not set
-# CONFIG_WATCHDOG is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
-# CONFIG_NBDCLIENT is not set
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-CONFIG_NC_EXTRA=y
-# CONFIG_NC_110_COMPAT is not set
-CONFIG_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_WHOIS is not set
-CONFIG_FEATURE_IPV6=y
-# CONFIG_FEATURE_UNIX_LOCAL is not set
-CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
-# CONFIG_ARP is not set
-# CONFIG_ARPING is not set
-# CONFIG_BRCTL is not set
-# CONFIG_FEATURE_BRCTL_FANCY is not set
-# CONFIG_FEATURE_BRCTL_SHOW is not set
-# CONFIG_DNSD is not set
-# CONFIG_ETHER_WAKE is not set
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPD is not set
-# CONFIG_FEATURE_FTP_WRITE is not set
-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-CONFIG_HOSTNAME=y
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
-# CONFIG_FEATURE_HTTPD_PROXY is not set
-# CONFIG_FEATURE_HTTPD_GZIP is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-# CONFIG_FEATURE_IFCONFIG_SLIP is not set
-# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
-CONFIG_FEATURE_IFCONFIG_HW=y
-# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
-# CONFIG_IFENSLAVE is not set
-# CONFIG_IFPLUGD is not set
-CONFIG_IFUPDOWN=y
-CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
-CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y
-CONFIG_FEATURE_IFUPDOWN_IPV4=y
-CONFIG_FEATURE_IFUPDOWN_IPV6=y
-CONFIG_FEATURE_IFUPDOWN_MAPPING=y
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-# CONFIG_INETD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-# CONFIG_FEATURE_IP_RULE is not set
-# CONFIG_FEATURE_IP_SHORT_FORMS is not set
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
-# CONFIG_IPRULE is not set
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-CONFIG_NETSTAT=y
-CONFIG_FEATURE_NETSTAT_WIDE=y
-CONFIG_FEATURE_NETSTAT_PRG=y
-CONFIG_NSLOOKUP=y
-# CONFIG_NTPD is not set
-# CONFIG_FEATURE_NTPD_SERVER is not set
-# CONFIG_PSCAN is not set
-CONFIG_ROUTE=y
-# CONFIG_SLATTACH is not set
-# CONFIG_TCPSVD is not set
-CONFIG_TELNET=y
-# CONFIG_FEATURE_TELNET_TTYPE is not set
-CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
-# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
-CONFIG_TFTP=y
-# CONFIG_TFTPD is not set
-
-#
-# Common options for tftp/tftpd
-#
-CONFIG_FEATURE_TFTP_GET=y
-CONFIG_FEATURE_TFTP_PUT=y
-CONFIG_FEATURE_TFTP_BLOCKSIZE=y
-CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
-# CONFIG_TFTP_DEBUG is not set
-CONFIG_TRACEROUTE=y
-CONFIG_TRACEROUTE6=y
-CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
-CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
-CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
-CONFIG_TUNCTL=y
-CONFIG_FEATURE_TUNCTL_UG=y
-# CONFIG_UDHCPC6 is not set
-CONFIG_UDHCPD=y
-# CONFIG_DHCPRELAY is not set
-CONFIG_DUMPLEASES=y
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
-CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
-CONFIG_UDHCPC=y
-CONFIG_FEATURE_UDHCPC_ARPING=y
-# CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_UDHCP_DEBUG=0
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-# CONFIG_FEATURE_UDHCP_8021Q is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
-# CONFIG_UDPSVD is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-CONFIG_FEATURE_WGET_TIMEOUT=y
-# CONFIG_ZCIP is not set
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-# CONFIG_LPR is not set
-# CONFIG_LPQ is not set
-
-#
-# Mail Utilities
-#
-# CONFIG_MAKEMIME is not set
-CONFIG_FEATURE_MIME_CHARSET=""
-# CONFIG_POPMAILDIR is not set
-# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
-# CONFIG_REFORMIME is not set
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
-# CONFIG_SENDMAIL is not set
-
-#
-# Process Utilities
-#
-# CONFIG_IOSTAT is not set
-# CONFIG_LSOF is not set
-# CONFIG_MPSTAT is not set
-# CONFIG_NMETER is not set
-# CONFIG_PMAP is not set
-# CONFIG_POWERTOP is not set
-# CONFIG_PSTREE is not set
-# CONFIG_PWDX is not set
-# CONFIG_SMEMCAP is not set
-CONFIG_UPTIME=y
-# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
-CONFIG_FREE=y
-CONFIG_FUSER=y
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-# CONFIG_KILLALL5 is not set
-# CONFIG_PGREP is not set
-CONFIG_PIDOF=y
-CONFIG_FEATURE_PIDOF_SINGLE=y
-CONFIG_FEATURE_PIDOF_OMIT=y
-# CONFIG_PKILL is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-CONFIG_FEATURE_PS_LONG=y
-# CONFIG_FEATURE_PS_TIME is not set
-CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-CONFIG_RENICE=y
-CONFIG_BB_SYSCTL=y
-CONFIG_TOP=y
-CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
-CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
-# CONFIG_FEATURE_SHOW_THREADS is not set
-CONFIG_WATCH=y
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_ASH=y
-CONFIG_ASH_BASH_COMPAT=y
-# CONFIG_ASH_IDLE_TIMEOUT is not set
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_GETOPTS=y
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-# CONFIG_ASH_CMDCMD is not set
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-CONFIG_ASH_EXPAND_PRMT=y
-# CONFIG_CTTYHACK is not set
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_SAVEHISTORY is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-# CONFIG_FEATURE_BASH_IS_ASH is not set
-# CONFIG_FEATURE_BASH_IS_HUSH is not set
-CONFIG_FEATURE_BASH_IS_NONE=y
-CONFIG_SH_MATH_SUPPORT=y
-CONFIG_SH_MATH_SUPPORT_64=y
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-CONFIG_FEATURE_SH_HISTFILESIZE=y
-
-#
-# System Logging Utilities
-#
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-CONFIG_FEATURE_REMOTE_LOG=y
-CONFIG_FEATURE_SYSLOGD_DUP=y
-CONFIG_FEATURE_SYSLOGD_CFG=y
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
-CONFIG_FEATURE_IPC_SYSLOG=y
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64
-CONFIG_LOGREAD=y
-CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
-CONFIG_KLOGD=y
-CONFIG_FEATURE_KLOGD_KLOGCTL=y
-CONFIG_LOGGER=y
diff --git a/recipes-core/busybox/busybox_%.bbappend b/recipes-core/busybox/busybox_%.bbappend
index 40094e9..4c6e752 100644
--- a/recipes-core/busybox/busybox_%.bbappend
+++ b/recipes-core/busybox/busybox_%.bbappend
@@ -1,6 +1,6 @@
 PR .= ".mlinux1"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:${THISDIR}/files:"
+FILESEXTRAPATHS_prepend := ":${THISDIR}/files:"
 
 SRC_URI += "file://udhcpd.conf.example"
 
diff --git a/recipes-core/busybox/files/defconfig b/recipes-core/busybox/files/defconfig
new file mode 100644
index 0000000..aa1e514
--- /dev/null
+++ b/recipes-core/busybox/files/defconfig
@@ -0,0 +1,1020 @@
+#
+# Automatically generated make config: don't edit
+# Busybox version: 1.20.2
+# Mon Aug 20 17:01:45 2012
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
+#
+# Busybox Settings
+#
+
+#
+# General Configuration
+#
+# CONFIG_DESKTOP is not set
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_INCLUDE_SUSv2 is not set
+# CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+CONFIG_SHOW_USAGE=y
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_INSTALL_NO_USR is not set
+# CONFIG_LOCALE_SUPPORT is not set
+# CONFIG_UNICODE_SUPPORT is not set
+# CONFIG_UNICODE_USING_LOCALE is not set
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=0
+CONFIG_LAST_SUPPORTED_WCHAR=0
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
+# CONFIG_UNICODE_BIDI_SUPPORT is not set
+# CONFIG_UNICODE_NEUTRAL_TABLE is not set
+# CONFIG_UNICODE_PRESERVE_BROKEN is not set
+CONFIG_LONG_OPTS=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_UTMP=y
+# CONFIG_FEATURE_WTMP is not set
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
+CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
+CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
+
+#
+# Build Options
+#
+# CONFIG_STATIC is not set
+# CONFIG_PIE is not set
+# CONFIG_NOMMU is not set
+# CONFIG_BUILD_LIBBUSYBOX is not set
+# CONFIG_FEATURE_INDIVIDUAL is not set
+# CONFIG_FEATURE_SHARED_BUSYBOX is not set
+CONFIG_LFS=y
+# CONFIG_CROSS_COMPILER_PREFIX is not set
+CONFIG_SYSROOT=""
+# CONFIG_EXTRA_CFLAGS is not set
+CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
+
+#
+# Debugging Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
+# CONFIG_DMALLOC is not set
+# CONFIG_EFENCE is not set
+
+#
+# Installation Options ("make install" behavior)
+#
+CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
+# CONFIG_INSTALL_APPLET_DONT is not set
+# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
+# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
+# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
+CONFIG_PREFIX="./_install"
+
+#
+# Busybox Library Tuning
+#
+CONFIG_FEATURE_SYSTEMD=y
+CONFIG_FEATURE_RTMINMAX=y
+CONFIG_PASSWORD_MINLEN=6
+CONFIG_MD5_SMALL=1
+CONFIG_FEATURE_FAST_TOP=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+# CONFIG_FEATURE_EDITING_VI is not set
+CONFIG_FEATURE_EDITING_HISTORY=64
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
+# CONFIG_FEATURE_REVERSE_SEARCH is not set
+CONFIG_FEATURE_TAB_COMPLETION=y
+CONFIG_FEATURE_USERNAME_COMPLETION=y
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
+CONFIG_FEATURE_NON_POSIX_CP=y
+CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
+CONFIG_FEATURE_COPYBUF_KB=4
+CONFIG_FEATURE_SKIP_ROOTFS=y
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
+CONFIG_FEATURE_HWIB=y
+
+#
+# Applets
+#
+
+#
+# Archival Utilities
+#
+CONFIG_FEATURE_SEAMLESS_XZ=y
+CONFIG_FEATURE_SEAMLESS_LZMA=y
+CONFIG_FEATURE_SEAMLESS_BZ2=y
+CONFIG_FEATURE_SEAMLESS_GZ=y
+CONFIG_FEATURE_SEAMLESS_Z=y
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+CONFIG_FEATURE_AR_CREATE=y
+CONFIG_BUNZIP2=y
+CONFIG_BZIP2=y
+CONFIG_CPIO=y
+# CONFIG_FEATURE_CPIO_O is not set
+# CONFIG_FEATURE_CPIO_P is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
+CONFIG_GUNZIP=y
+CONFIG_GZIP=y
+CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
+CONFIG_GZIP_FAST=0
+CONFIG_LZOP=y
+# CONFIG_LZOP_COMPR_HIGH is not set
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+CONFIG_FEATURE_TAR_CREATE=y
+CONFIG_FEATURE_TAR_AUTODETECT=y
+CONFIG_FEATURE_TAR_FROM=y
+CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_FEATURE_TAR_TO_COMMAND=y
+CONFIG_FEATURE_TAR_UNAME_GNAME=y
+CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
+# CONFIG_FEATURE_TAR_SELINUX is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNLZMA is not set
+# CONFIG_FEATURE_LZMA_FAST is not set
+# CONFIG_LZMA is not set
+CONFIG_UNXZ=y
+CONFIG_XZ=y
+CONFIG_UNZIP=y
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+CONFIG_CAT=y
+CONFIG_DATE=y
+CONFIG_FEATURE_DATE_ISOFMT=y
+# CONFIG_FEATURE_DATE_NANO is not set
+CONFIG_FEATURE_DATE_COMPAT=y
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+CONFIG_GROUPS=y
+CONFIG_TEST=y
+CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_SUSV3=y
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_BASE64=y
+CONFIG_WHO=y
+CONFIG_USERS=y
+# CONFIG_CAL is not set
+# CONFIG_CATV is not set
+CONFIG_CHGRP=y
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
+CONFIG_CHROOT=y
+# CONFIG_CKSUM is not set
+# CONFIG_COMM is not set
+CONFIG_CP=y
+CONFIG_FEATURE_CP_LONG_OPTIONS=y
+CONFIG_CUT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
+# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_DF=y
+CONFIG_FEATURE_DF_FANCY=y
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+# CONFIG_UNIX2DOS is not set
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_FEATURE_ENV_LONG_OPTIONS=y
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
+CONFIG_EXPR=y
+CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FALSE=y
+# CONFIG_FOLD is not set
+CONFIG_FSYNC=y
+CONFIG_HEAD=y
+CONFIG_FEATURE_FANCY_HEAD=y
+# CONFIG_INSTALL is not set
+# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+CONFIG_LN=y
+CONFIG_LOGNAME=y
+CONFIG_LS=y
+CONFIG_FEATURE_LS_FILETYPES=y
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+CONFIG_FEATURE_LS_COLOR=y
+# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
+CONFIG_MKNOD=y
+CONFIG_MV=y
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+# CONFIG_PRINTENV is not set
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
+CONFIG_SEQ=y
+# CONFIG_SHA1SUM is not set
+CONFIG_SHA256SUM=y
+CONFIG_SHA512SUM=y
+CONFIG_SLEEP=y
+CONFIG_FEATURE_FANCY_SLEEP=y
+CONFIG_FEATURE_FLOAT_SLEEP=y
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
+CONFIG_STAT=y
+CONFIG_FEATURE_STAT_FORMAT=y
+CONFIG_STTY=y
+# CONFIG_SUM is not set
+CONFIG_SYNC=y
+# CONFIG_TAC is not set
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+CONFIG_WC=y
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHOAMI=y
+CONFIG_YES=y
+
+#
+# Common options for cp and mv
+#
+# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
+
+#
+# Common options for ls, more and telnet
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Common options for md5sum, sha1sum, sha256sum, sha512sum
+#
+CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
+
+#
+# Console Utilities
+#
+CONFIG_CHVT=y
+# CONFIG_FGCONSOLE is not set
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+# CONFIG_KBD_MODE is not set
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
+CONFIG_SETCONSOLE=y
+# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
+# CONFIG_SETFONT is not set
+# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
+CONFIG_DEFAULT_SETFONT_DIR=""
+# CONFIG_SETKEYCODES is not set
+# CONFIG_SETLOGCONS is not set
+# CONFIG_SHOWKEY is not set
+
+#
+# Common options for loadfont and setfont
+#
+# CONFIG_FEATURE_LOADFONT_PSF2 is not set
+# CONFIG_FEATURE_LOADFONT_RAW is not set
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+# CONFIG_PIPE_PROGRESS is not set
+CONFIG_RUN_PARTS=y
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+CONFIG_FEATURE_RUN_PARTS_FANCY=y
+CONFIG_START_STOP_DAEMON=y
+CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_PATCH=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=1024
+CONFIG_FEATURE_VI_8BIT=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_REGEX_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+# CONFIG_FEATURE_VI_READONLY is not set
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_ASK_TERMINAL=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_LIBM=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_ED is not set
+CONFIG_SED=y
+CONFIG_FEATURE_ALLOW_EXEC=y
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_PRINT0=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_MMIN=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
+CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+CONFIG_FEATURE_FIND_DELETE=y
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
+CONFIG_FEATURE_FIND_LINKS=y
+CONFIG_GREP=y
+CONFIG_FEATURE_GREP_EGREP_ALIAS=y
+CONFIG_FEATURE_GREP_FGREP_ALIAS=y
+CONFIG_FEATURE_GREP_CONTEXT=y
+CONFIG_XARGS=y
+# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
+CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
+CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
+CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
+
+#
+# Init Utilities
+#
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
+# CONFIG_INIT is not set
+# CONFIG_FEATURE_USE_INITTAB is not set
+# CONFIG_FEATURE_KILL_REMOVED is not set
+CONFIG_FEATURE_KILL_DELAY=0
+# CONFIG_FEATURE_INIT_SCTTY is not set
+# CONFIG_FEATURE_INIT_SYSLOG is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
+CONFIG_INIT_TERMINAL_TYPE=""
+# CONFIG_MESG is not set
+# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_USE_BB_SHADOW is not set
+CONFIG_USE_BB_CRYPT=y
+# CONFIG_USE_BB_CRYPT_SHA is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_FIRST_SYSTEM_ID=100
+CONFIG_LAST_SYSTEM_ID=999
+# CONFIG_ADDGROUP is not set
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
+# CONFIG_DELUSER is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
+# CONFIG_GETTY is not set
+# CONFIG_LOGIN is not set
+# CONFIG_LOGIN_SESSION_AS_CHILD is not set
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+# CONFIG_FEATURE_NOLOGIN is not set
+# CONFIG_FEATURE_SECURETTY is not set
+# CONFIG_PASSWD is not set
+# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
+CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
+# CONFIG_SU is not set
+# CONFIG_FEATURE_SU_SYSLOG is not set
+# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Linux Ext2 FS Progs
+#
+CONFIG_CHATTR=y
+CONFIG_FSCK=y
+# CONFIG_LSATTR is not set
+# CONFIG_TUNE2FS is not set
+
+#
+# Linux Module Utilities
+#
+# CONFIG_MODINFO is not set
+# CONFIG_MODPROBE_SMALL is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
+CONFIG_INSMOD=y
+CONFIG_RMMOD=y
+CONFIG_LSMOD=y
+# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
+CONFIG_MODPROBE=y
+# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
+CONFIG_DEPMOD=y
+
+#
+# Options common to multiple modutils
+#
+# CONFIG_FEATURE_2_4_MODULES is not set
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+CONFIG_FEATURE_MODUTILS_ALIAS=y
+CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+
+#
+# Linux System Utilities
+#
+# CONFIG_BLOCKDEV is not set
+# CONFIG_MDEV is not set
+# CONFIG_FEATURE_MDEV_CONF is not set
+# CONFIG_FEATURE_MDEV_RENAME is not set
+# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
+# CONFIG_FEATURE_MDEV_EXEC is not set
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+# CONFIG_REV is not set
+# CONFIG_ACPID is not set
+# CONFIG_FEATURE_ACPID_COMPAT is not set
+# CONFIG_BLKID is not set
+# CONFIG_FEATURE_BLKID_TYPE is not set
+CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_FBSET=y
+CONFIG_FEATURE_FBSET_FANCY=y
+CONFIG_FEATURE_FBSET_READMODE=y
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDFORMAT is not set
+CONFIG_FDISK=y
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
+CONFIG_FEATURE_FDISK_WRITABLE=y
+# CONFIG_FEATURE_AIX_LABEL is not set
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
+# CONFIG_FEATURE_GPT_LABEL is not set
+# CONFIG_FEATURE_FDISK_ADVANCED is not set
+# CONFIG_FINDFS is not set
+CONFIG_FLOCK=y
+# CONFIG_FREERAMDISK is not set
+CONFIG_FSCK_MINIX=y
+# CONFIG_MKFS_EXT2 is not set
+CONFIG_MKFS_MINIX=y
+CONFIG_FEATURE_MINIX2=y
+# CONFIG_MKFS_REISER is not set
+# CONFIG_MKFS_VFAT is not set
+CONFIG_GETOPT=y
+CONFIG_FEATURE_GETOPT_LONG=y
+CONFIG_HEXDUMP=y
+# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
+# CONFIG_HD is not set
+CONFIG_HWCLOCK=y
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
+CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
+CONFIG_LOSETUP=y
+# CONFIG_LSPCI is not set
+# CONFIG_LSUSB is not set
+CONFIG_MKSWAP=y
+# CONFIG_FEATURE_MKSWAP_UUID is not set
+CONFIG_MORE=y
+CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+# CONFIG_FEATURE_MOUNT_LABEL is not set
+CONFIG_FEATURE_MOUNT_NFS=y
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_PIVOT_ROOT=y
+CONFIG_RDATE=y
+# CONFIG_RDEV is not set
+# CONFIG_READPROFILE is not set
+# CONFIG_RTCWAKE is not set
+# CONFIG_SCRIPT is not set
+# CONFIG_SCRIPTREPLAY is not set
+# CONFIG_SETARCH is not set
+CONFIG_SWAPONOFF=y
+CONFIG_FEATURE_SWAPON_PRI=y
+CONFIG_SWITCH_ROOT=y
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+# CONFIG_VOLUMEID is not set
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NTFS is not set
+# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
+# CONFIG_FEATURE_VOLUMEID_UDF is not set
+# CONFIG_FEATURE_VOLUMEID_LUKS is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
+# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
+# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SYSV is not set
+# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
+# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_CONSPY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
+# CONFIG_FEATURE_LESS_DASHCMD is not set
+# CONFIG_FEATURE_LESS_LINENUMS is not set
+# CONFIG_NANDWRITE is not set
+# CONFIG_NANDDUMP is not set
+# CONFIG_SETSERIAL is not set
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
+# CONFIG_ADJTIMEX is not set
+# CONFIG_BBCONFIG is not set
+# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
+# CONFIG_BEEP is not set
+CONFIG_FEATURE_BEEP_FREQ=0
+CONFIG_FEATURE_BEEP_LENGTH_MS=0
+# CONFIG_CHAT is not set
+# CONFIG_FEATURE_CHAT_NOFAIL is not set
+# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
+# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
+# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
+# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
+# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
+# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
+# CONFIG_CHRT is not set
+# CONFIG_CROND is not set
+# CONFIG_FEATURE_CROND_D is not set
+# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
+CONFIG_FEATURE_CROND_DIR=""
+# CONFIG_CRONTAB is not set
+CONFIG_DC=y
+# CONFIG_FEATURE_DC_LIBM is not set
+# CONFIG_DEVFSD is not set
+# CONFIG_DEVFSD_MODLOAD is not set
+# CONFIG_DEVFSD_FG_NP is not set
+# CONFIG_DEVFSD_VERBOSE is not set
+# CONFIG_FEATURE_DEVFS is not set
+# CONFIG_DEVMEM is not set
+# CONFIG_EJECT is not set
+# CONFIG_FEATURE_EJECT_SCSI is not set
+# CONFIG_FBSPLASH is not set
+# CONFIG_FLASHCP is not set
+# CONFIG_FLASH_LOCK is not set
+# CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASH_ERASEALL is not set
+# CONFIG_IONICE is not set
+# CONFIG_INOTIFYD is not set
+# CONFIG_LAST is not set
+# CONFIG_FEATURE_LAST_SMALL is not set
+# CONFIG_FEATURE_LAST_FANCY is not set
+# CONFIG_HDPARM is not set
+# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
+# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
+# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
+# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
+# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MAN is not set
+CONFIG_MICROCOM=y
+# CONFIG_MOUNTPOINT is not set
+# CONFIG_MT is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
+CONFIG_RFKILL=y
+# CONFIG_RUNLEVEL is not set
+# CONFIG_RX is not set
+# CONFIG_SETSID is not set
+CONFIG_STRINGS=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
+CONFIG_TIME=y
+# CONFIG_TIMEOUT is not set
+# CONFIG_TTYSIZE is not set
+# CONFIG_VOLNAME is not set
+# CONFIG_WALL is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Networking Utilities
+#
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
+# CONFIG_NBDCLIENT is not set
+CONFIG_NC=y
+CONFIG_NC_SERVER=y
+CONFIG_NC_EXTRA=y
+# CONFIG_NC_110_COMPAT is not set
+CONFIG_PING=y
+CONFIG_PING6=y
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_WHOIS is not set
+CONFIG_FEATURE_IPV6=y
+# CONFIG_FEATURE_UNIX_LOCAL is not set
+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+# CONFIG_ARPING is not set
+# CONFIG_BRCTL is not set
+# CONFIG_FEATURE_BRCTL_FANCY is not set
+# CONFIG_FEATURE_BRCTL_SHOW is not set
+# CONFIG_DNSD is not set
+# CONFIG_ETHER_WAKE is not set
+# CONFIG_FAKEIDENTD is not set
+# CONFIG_FTPD is not set
+# CONFIG_FEATURE_FTP_WRITE is not set
+# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
+CONFIG_HOSTNAME=y
+# CONFIG_HTTPD is not set
+# CONFIG_FEATURE_HTTPD_RANGES is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
+# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
+# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
+# CONFIG_FEATURE_HTTPD_GZIP is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set
+CONFIG_FEATURE_IFCONFIG_HW=y
+# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
+# CONFIG_IFENSLAVE is not set
+# CONFIG_IFPLUGD is not set
+CONFIG_IFUPDOWN=y
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+# CONFIG_FEATURE_IFUPDOWN_IP is not set
+# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
+CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y
+CONFIG_FEATURE_IFUPDOWN_IPV4=y
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
+# CONFIG_INETD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
+# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
+# CONFIG_FEATURE_INETD_RPC is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+# CONFIG_FEATURE_IP_RULE is not set
+# CONFIG_FEATURE_IP_SHORT_FORMS is not set
+# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_IPRULE is not set
+# CONFIG_IPCALC is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
+# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_NETSTAT=y
+CONFIG_FEATURE_NETSTAT_WIDE=y
+CONFIG_FEATURE_NETSTAT_PRG=y
+CONFIG_NSLOOKUP=y
+# CONFIG_NTPD is not set
+# CONFIG_FEATURE_NTPD_SERVER is not set
+# CONFIG_PSCAN is not set
+CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
+# CONFIG_TCPSVD is not set
+CONFIG_TELNET=y
+# CONFIG_FEATURE_TELNET_TTYPE is not set
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+# CONFIG_TELNETD is not set
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
+# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
+CONFIG_TFTP=y
+# CONFIG_TFTPD is not set
+
+#
+# Common options for tftp/tftpd
+#
+CONFIG_FEATURE_TFTP_GET=y
+CONFIG_FEATURE_TFTP_PUT=y
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
+# CONFIG_TFTP_DEBUG is not set
+CONFIG_TRACEROUTE=y
+CONFIG_TRACEROUTE6=y
+CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
+CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y
+CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
+CONFIG_TUNCTL=y
+CONFIG_FEATURE_TUNCTL_UG=y
+# CONFIG_UDHCPC6 is not set
+CONFIG_UDHCPD=y
+# CONFIG_DHCPRELAY is not set
+CONFIG_DUMPLEASES=y
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
+CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+# CONFIG_FEATURE_UDHCP_PORT is not set
+CONFIG_UDHCP_DEBUG=0
+# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+# CONFIG_FEATURE_UDHCP_8021Q is not set
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
+# CONFIG_UDPSVD is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
+# CONFIG_ZCIP is not set
+
+#
+# Print Utilities
+#
+# CONFIG_LPD is not set
+# CONFIG_LPR is not set
+# CONFIG_LPQ is not set
+
+#
+# Mail Utilities
+#
+# CONFIG_MAKEMIME is not set
+CONFIG_FEATURE_MIME_CHARSET=""
+# CONFIG_POPMAILDIR is not set
+# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
+# CONFIG_REFORMIME is not set
+# CONFIG_FEATURE_REFORMIME_COMPAT is not set
+# CONFIG_SENDMAIL is not set
+
+#
+# Process Utilities
+#
+# CONFIG_IOSTAT is not set
+# CONFIG_LSOF is not set
+# CONFIG_MPSTAT is not set
+# CONFIG_NMETER is not set
+# CONFIG_PMAP is not set
+# CONFIG_POWERTOP is not set
+# CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
+# CONFIG_SMEMCAP is not set
+CONFIG_UPTIME=y
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
+CONFIG_FREE=y
+CONFIG_FUSER=y
+CONFIG_KILL=y
+CONFIG_KILLALL=y
+# CONFIG_KILLALL5 is not set
+# CONFIG_PGREP is not set
+CONFIG_PIDOF=y
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
+# CONFIG_PKILL is not set
+CONFIG_PS=y
+CONFIG_FEATURE_PS_WIDE=y
+CONFIG_FEATURE_PS_LONG=y
+# CONFIG_FEATURE_PS_TIME is not set
+CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
+# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_RENICE=y
+CONFIG_BB_SYSCTL=y
+CONFIG_TOP=y
+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_SMP_CPU is not set
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
+# CONFIG_FEATURE_SHOW_THREADS is not set
+CONFIG_WATCH=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_FEATURE_RUNSVDIR_LOG is not set
+# CONFIG_SV is not set
+CONFIG_SV_DEFAULT_SERVICE_DIR=""
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+# CONFIG_SETSEBOOL is not set
+# CONFIG_SESTATUS is not set
+
+#
+# Shells
+#
+CONFIG_ASH=y
+CONFIG_ASH_BASH_COMPAT=y
+# CONFIG_ASH_IDLE_TIMEOUT is not set
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_CTTYHACK is not set
+# CONFIG_HUSH is not set
+# CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
+# CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_LOCAL is not set
+# CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_MODE_X is not set
+# CONFIG_MSH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+# CONFIG_FEATURE_BASH_IS_ASH is not set
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
+CONFIG_FEATURE_BASH_IS_NONE=y
+CONFIG_SH_MATH_SUPPORT=y
+CONFIG_SH_MATH_SUPPORT_64=y
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
+CONFIG_FEATURE_SH_HISTFILESIZE=y
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+CONFIG_FEATURE_ROTATE_LOGFILE=y
+CONFIG_FEATURE_REMOTE_LOG=y
+CONFIG_FEATURE_SYSLOGD_DUP=y
+CONFIG_FEATURE_SYSLOGD_CFG=y
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
+CONFIG_FEATURE_IPC_SYSLOG=y
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
+CONFIG_LOGGER=y
-- 
cgit v1.2.3


From b67581be5b5e373199aea42c2ac8a3ded49065c8 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Fri, 19 May 2017 15:36:48 -0500
Subject: Remove debug code

---
 recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb
index c0510e9..d06be09 100644
--- a/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb
+++ b/recipes-ruby/ruby-serialport/ruby-serialport_1.3.1.bb
@@ -18,9 +18,7 @@ S = "${WORKDIR}/git"
 B = "${S}"
 
 do_compile() {
-  ls -d ${STAGING_INCDIR}/ruby-* >/tmp/ruby.txt
   rp=$(ls -d ${STAGING_INCDIR}/ruby-* | head -1)
-  echo ${rp} >/tmp/ruby2.txt
   ${CC} -v ${CFLAGS} ${LDFLAGS} -Iext/native -I${rp} -I${rp}/arm-linux-gnueabi -c ext/native/*.c
   ${CC} -v ${CFLAGS} ${LDFLAGS} --shared -o ext/native/serialport.so serialport.o posix_serialport_impl.o
 }
-- 
cgit v1.2.3


From 91f95c2126d2cd948a3cd9777e975645a3b32f2b Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 22 May 2017 17:27:03 -0500
Subject: Add bash dependency to gpsd

---
 recipes-navigation/gpsd/gpsd_3.16.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-navigation/gpsd/gpsd_3.16.bb b/recipes-navigation/gpsd/gpsd_3.16.bb
index baeeb0b..4a428fc 100644
--- a/recipes-navigation/gpsd/gpsd_3.16.bb
+++ b/recipes-navigation/gpsd/gpsd_3.16.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools"
 PROVIDES = "virtual/gpsd"
 PR="m2"
+RDEPENDS_gpsd-conf += "bash"
 
 EXTRANATIVEPATH += "chrpath-native"
 
-- 
cgit v1.2.3


From 7dbffc765fb05ca158f28d8535dcd6ff67290a4d Mon Sep 17 00:00:00 2001
From: Jeff Hatch <jhatch@multitech.com>
Date: Tue, 23 May 2017 13:52:38 -0500
Subject: Add PACKAGECONFIG_append_pn-boost = python to build boost-python

---
 contrib/local.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/local.conf b/contrib/local.conf
index 6740f14..7bfed06 100644
--- a/contrib/local.conf
+++ b/contrib/local.conf
@@ -64,3 +64,4 @@ IMAGE_FSTYPES =+ "jffs2 tar.gz"
 # OpenJDK Zero VM (run with 'java -zero')
 # IMAGE_INSTALL += "openjdk-7-vm-zero"
 
+PACKAGECONFIG_append_pn-boost = " python"
-- 
cgit v1.2.3


From bfa85930fd6694122b8c71fbfe40515e90582aae Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 23 May 2017 17:14:37 -0500
Subject: Fix missing colon in _prepend variable and add debug

---
 recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
index 5249571..9d000d6 100644
--- a/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
+++ b/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
@@ -4,10 +4,9 @@ SRC_URI += "file://bonding.pre-up \
            file://bonding.up \
            file://bonding.post-down"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
 do_install_append () {
-	echo JAK workdir ${WORKDIR} sysconfdir ${D}${sysconfdir}
 	install -m 0755 ${WORKDIR}/bonding.pre-up ${D}${sysconfdir}/network/if-pre-up.d/bonding
 	install -m 0755 ${WORKDIR}/bonding.up ${D}${sysconfdir}/network/if-up.d/bonding
 	install -m 0755 ${WORKDIR}/bonding.post-down ${D}${sysconfdir}/network/if-post-down.d/bonding
-- 
cgit v1.2.3


From 85759f713be88f7b4bf4d81be946be0e0bbc6313 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 23 May 2017 18:33:31 -0500
Subject: Set correct version for Morty mLinux

---
 conf/distro/mlinux.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index aa4b1ea..a47f931 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,7 +1,7 @@
 DISTRO = "mlinux"
 DISTRO_NAME = "mLinux"
-DISTRO_BASE_VERSION = "3.3"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.7"
+DISTRO_BASE_VERSION = "4.0"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.Beta"
 DISTRO_CODENAME = ""
 SDK_VENDOR = "-mlinux"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
-- 
cgit v1.2.3


From b899b63783a7e8fe431f2661d449f98e4555f16a Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 23 May 2017 18:36:33 -0500
Subject: eglibc is removed

---
 recipes-core/eglibc/eglibc_%.bbappend          | 3 ---
 recipes-core/eglibc/eglibc_%.bbappend.obsolete | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 recipes-core/eglibc/eglibc_%.bbappend
 create mode 100644 recipes-core/eglibc/eglibc_%.bbappend.obsolete

diff --git a/recipes-core/eglibc/eglibc_%.bbappend b/recipes-core/eglibc/eglibc_%.bbappend
deleted file mode 100644
index 68af86e..0000000
--- a/recipes-core/eglibc/eglibc_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
-SRC_URI += "file://cvs-gethostbyname4-memory-leak.patch"
-PR = "r2"
diff --git a/recipes-core/eglibc/eglibc_%.bbappend.obsolete b/recipes-core/eglibc/eglibc_%.bbappend.obsolete
new file mode 100644
index 0000000..68af86e
--- /dev/null
+++ b/recipes-core/eglibc/eglibc_%.bbappend.obsolete
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}"
+SRC_URI += "file://cvs-gethostbyname4-memory-leak.patch"
+PR = "r2"
-- 
cgit v1.2.3


From 7cfb6251023585a9501a62a6b1f7b0114538fbc6 Mon Sep 17 00:00:00 2001
From: Jason Reiss <jreiss@multitech.com>
Date: Wed, 24 May 2017 08:22:01 -0500
Subject: lora: update lora-packet-forwarder init script to create symlinks
 correctly

---
 .../mtcdt/lora-packet-forwarder.init               | 42 +++++++++++++++-------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init
index 510f171..396b291 100755
--- a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init
+++ b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init
@@ -33,20 +33,38 @@ read_card_info() {
     lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null)
 }
 
-
-card_found() {
-    if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then
-        ln -sf /dev/spidev32766.2 /dev/spidev0.0
+card_found() {                                                           
+    if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then  
+        ln -sf /dev/spidev32766.2 /dev/spidev0.0                         
     elif [ -d $port2 ] && [[ $(cat $port2/hw-version) = $lora_hw ]]; then
         ln -sf /dev/spidev32765.2 /dev/spidev0.0
-    fi
-    
-    if [[ "$lora_id" =~ "$lora_mtac_id" ]]; then
-        return 0
-    else
-        return 1
-    fi
-}
+    fi                                                      
+                                                                                
+    if [[ "$lora_id" =~ "$lora_mtac_id" ]]; then                                
+        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_0                    
+        if [ "$lora_hw" = "$lora_1_0_hw" ] && [[ ! "$lora_id" =~ .*-SPI ]]; then
+            ln -sf /opt/lora/basic_pkt_fwd-usb $pkt_fwd             
+        else                                                        
+            if [ "$lora_hw" = "$lora_1_5_h_hw" ]; then              
+                GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_5
+            fi                                    
+            ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd
+        fi                             
+                                                                
+        # ignore error of diff command                          
+        set +e                                                  
+        diff $GLOBAL_CONF /opt/lora/global_conf.json 1>/dev/null
+        if [ $? -ne 0 ]; then                         
+            cp $GLOBAL_CONF /opt/lora/global_conf.json
+        fi                            
+        set -e                        
+                                   
+        return 0                   
+    else                           
+        echo MTAC_LORA not detected                          
+        return 1                                       
+    fi                 
+} 
 
 
 do_start() {
-- 
cgit v1.2.3


From 673ebb0b688ec837a9951bebe08ca34f3da79eac Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 24 May 2017 17:18:26 -0500
Subject: New libmts-io add LE910NA1 Radio Support

---
 recipes-support/multitech/libmts-io_0.6.bb   | 30 ----------------------------
 recipes-support/multitech/libmts-io_1.0.0.bb | 30 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 recipes-support/multitech/libmts-io_0.6.bb
 create mode 100644 recipes-support/multitech/libmts-io_1.0.0.bb

diff --git a/recipes-support/multitech/libmts-io_0.6.bb b/recipes-support/multitech/libmts-io_0.6.bb
deleted file mode 100644
index 34115be..0000000
--- a/recipes-support/multitech/libmts-io_0.6.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "MultiTech IO C++ Library"
-HOMEPAGE = "http://www.multitech.net/"
-LICENSE = "LGPL-2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
-
-DEPENDS = "libmts jsoncpp cmake-native cppunit"
-BBCLASSEXTEND = "native"
-
-PR = "r0"
-SRCREV = "${PV}"
-SRC_URI = "git://git.multitech.net/libmts-io;branch=master"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-	oe_runmake
-}
-
-# build and run tests for native recipe
-do_compile_append_virtclass-native() {
-	cd test
-	cmake .
-	oe_runmake
-	./TestRunnerClient
-}
-
-do_install() {
-	oe_runmake install DESTDIR=${D}
-}
-
diff --git a/recipes-support/multitech/libmts-io_1.0.0.bb b/recipes-support/multitech/libmts-io_1.0.0.bb
new file mode 100644
index 0000000..34115be
--- /dev/null
+++ b/recipes-support/multitech/libmts-io_1.0.0.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "MultiTech IO C++ Library"
+HOMEPAGE = "http://www.multitech.net/"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = "libmts jsoncpp cmake-native cppunit"
+BBCLASSEXTEND = "native"
+
+PR = "r0"
+SRCREV = "${PV}"
+SRC_URI = "git://git.multitech.net/libmts-io;branch=master"
+
+S = "${WORKDIR}/git"
+
+do_compile() {
+	oe_runmake
+}
+
+# build and run tests for native recipe
+do_compile_append_virtclass-native() {
+	cd test
+	cmake .
+	oe_runmake
+	./TestRunnerClient
+}
+
+do_install() {
+	oe_runmake install DESTDIR=${D}
+}
+
-- 
cgit v1.2.3


From 7c234cb8efc9d4f76f9cb45fb97ae9529db4166f Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 24 May 2017 18:01:34 -0500
Subject: Add mlinux-version back into the core build

---
 conf/distro/mlinux.conf                    |  2 +-
 recipes-core/mlinux/mlinux-version.bb      | 22 ++++++++++++++++++++++
 recipes-core/mlinux/mlinux-version.bb.orig | 22 ----------------------
 3 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 recipes-core/mlinux/mlinux-version.bb
 delete mode 100644 recipes-core/mlinux/mlinux-version.bb.orig

diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index a47f931..9e54052 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -30,7 +30,7 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_MLINUX}"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 # extra packages to add to images
-#DISTRO_EXTRA_RDEPENDS += "mlinux-version"
+DISTRO_EXTRA_RDEPENDS += "mlinux-version"
 
 # add mlinux source mirror
 INHERIT += "mlinux-mirrors"
diff --git a/recipes-core/mlinux/mlinux-version.bb b/recipes-core/mlinux/mlinux-version.bb
new file mode 100644
index 0000000..f2debe1
--- /dev/null
+++ b/recipes-core/mlinux/mlinux-version.bb
@@ -0,0 +1,22 @@
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+inherit mlinux_metadata_scm
+
+# always parse this file so PV can change automatically
+__BB_DONT_CACHE = "1"
+
+PV = "${DISTRO_VERSION}_${MLINUX_METADATA_REVISION}"
+PR = "r2"
+PE = "1"
+
+PACKAGES = "${PN}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_install() {
+	mkdir -p ${D}${sysconfdir}
+	echo "mLinux ${DISTRO_VERSION}" > ${D}${sysconfdir}/mlinux-version
+	echo "Built from branch: ${MLINUX_METADATA_BRANCH}" >> ${D}${sysconfdir}/mlinux-version
+	echo "Revision: ${MLINUX_METADATA_REVISION}" >> ${D}${sysconfdir}/mlinux-version
+	echo "${MLINUX_LAYERS}" > ${D}${sysconfdir}/mlinux-layers
+}
diff --git a/recipes-core/mlinux/mlinux-version.bb.orig b/recipes-core/mlinux/mlinux-version.bb.orig
deleted file mode 100644
index f2debe1..0000000
--- a/recipes-core/mlinux/mlinux-version.bb.orig
+++ /dev/null
@@ -1,22 +0,0 @@
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-inherit mlinux_metadata_scm
-
-# always parse this file so PV can change automatically
-__BB_DONT_CACHE = "1"
-
-PV = "${DISTRO_VERSION}_${MLINUX_METADATA_REVISION}"
-PR = "r2"
-PE = "1"
-
-PACKAGES = "${PN}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_install() {
-	mkdir -p ${D}${sysconfdir}
-	echo "mLinux ${DISTRO_VERSION}" > ${D}${sysconfdir}/mlinux-version
-	echo "Built from branch: ${MLINUX_METADATA_BRANCH}" >> ${D}${sysconfdir}/mlinux-version
-	echo "Revision: ${MLINUX_METADATA_REVISION}" >> ${D}${sysconfdir}/mlinux-version
-	echo "${MLINUX_LAYERS}" > ${D}${sysconfdir}/mlinux-layers
-}
-- 
cgit v1.2.3


From 497fb088cc000e900bc270003766c20333fbdcb6 Mon Sep 17 00:00:00 2001
From: Jeff Hatch <jhatch@multitech.com>
Date: Fri, 26 May 2017 08:57:15 -0500
Subject: Lock down mlinux versio of lighttpd so that AEP can use it's own
 config file

---
 recipes-extended/lighttpd/lighttpd_%.bbappend      | 21 ---------------------
 recipes-extended/lighttpd/lighttpd_1.4.39.bbappend | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 recipes-extended/lighttpd/lighttpd_%.bbappend
 create mode 100644 recipes-extended/lighttpd/lighttpd_1.4.39.bbappend

diff --git a/recipes-extended/lighttpd/lighttpd_%.bbappend b/recipes-extended/lighttpd/lighttpd_%.bbappend
deleted file mode 100644
index 8171f17..0000000
--- a/recipes-extended/lighttpd/lighttpd_%.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-PR .= ".mlinux1"
-
-# build with openssl support
-DEPENDS += " openssl "
-RDEPENDS_${PN} += " openssl logrotate "
-
-EXTRA_OECONF += "--with-openssl"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://lighttpd.logrotate.conf \
-			file://lighttpd.default"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/logrotate.d
-	install -d ${D}${sysconfdir}/default
-	install -m 0644 ${WORKDIR}/lighttpd.logrotate.conf ${D}${sysconfdir}/logrotate.d/lighttpd.conf
-	install -m 0644 ${WORKDIR}/lighttpd.default ${D}${sysconfdir}/default/lighttpd
-}
-
-CONFFILES_${PN} += "${sysconfdir}/default/lighttpd ${sysconfdir}/logrotate.d/lighttpd.conf"
diff --git a/recipes-extended/lighttpd/lighttpd_1.4.39.bbappend b/recipes-extended/lighttpd/lighttpd_1.4.39.bbappend
new file mode 100644
index 0000000..8171f17
--- /dev/null
+++ b/recipes-extended/lighttpd/lighttpd_1.4.39.bbappend
@@ -0,0 +1,21 @@
+PR .= ".mlinux1"
+
+# build with openssl support
+DEPENDS += " openssl "
+RDEPENDS_${PN} += " openssl logrotate "
+
+EXTRA_OECONF += "--with-openssl"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://lighttpd.logrotate.conf \
+			file://lighttpd.default"
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/logrotate.d
+	install -d ${D}${sysconfdir}/default
+	install -m 0644 ${WORKDIR}/lighttpd.logrotate.conf ${D}${sysconfdir}/logrotate.d/lighttpd.conf
+	install -m 0644 ${WORKDIR}/lighttpd.default ${D}${sysconfdir}/default/lighttpd
+}
+
+CONFFILES_${PN} += "${sysconfdir}/default/lighttpd ${sysconfdir}/logrotate.d/lighttpd.conf"
-- 
cgit v1.2.3


From 5d7686064960f8e239563832a194aa208e351455 Mon Sep 17 00:00:00 2001
From: Jeff Hatch <jhatch@multitech.com>
Date: Fri, 26 May 2017 09:04:24 -0500
Subject: Sync up bbappedn with yocto-2.2 version of lighttpd

---
 recipes-extended/lighttpd/lighttpd_1.4.39.bbappend | 21 ---------------------
 recipes-extended/lighttpd/lighttpd_1.4.41.bbappend | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 recipes-extended/lighttpd/lighttpd_1.4.39.bbappend
 create mode 100644 recipes-extended/lighttpd/lighttpd_1.4.41.bbappend

diff --git a/recipes-extended/lighttpd/lighttpd_1.4.39.bbappend b/recipes-extended/lighttpd/lighttpd_1.4.39.bbappend
deleted file mode 100644
index 8171f17..0000000
--- a/recipes-extended/lighttpd/lighttpd_1.4.39.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-PR .= ".mlinux1"
-
-# build with openssl support
-DEPENDS += " openssl "
-RDEPENDS_${PN} += " openssl logrotate "
-
-EXTRA_OECONF += "--with-openssl"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://lighttpd.logrotate.conf \
-			file://lighttpd.default"
-
-do_install_append() {
-	install -d ${D}${sysconfdir}/logrotate.d
-	install -d ${D}${sysconfdir}/default
-	install -m 0644 ${WORKDIR}/lighttpd.logrotate.conf ${D}${sysconfdir}/logrotate.d/lighttpd.conf
-	install -m 0644 ${WORKDIR}/lighttpd.default ${D}${sysconfdir}/default/lighttpd
-}
-
-CONFFILES_${PN} += "${sysconfdir}/default/lighttpd ${sysconfdir}/logrotate.d/lighttpd.conf"
diff --git a/recipes-extended/lighttpd/lighttpd_1.4.41.bbappend b/recipes-extended/lighttpd/lighttpd_1.4.41.bbappend
new file mode 100644
index 0000000..8171f17
--- /dev/null
+++ b/recipes-extended/lighttpd/lighttpd_1.4.41.bbappend
@@ -0,0 +1,21 @@
+PR .= ".mlinux1"
+
+# build with openssl support
+DEPENDS += " openssl "
+RDEPENDS_${PN} += " openssl logrotate "
+
+EXTRA_OECONF += "--with-openssl"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://lighttpd.logrotate.conf \
+			file://lighttpd.default"
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/logrotate.d
+	install -d ${D}${sysconfdir}/default
+	install -m 0644 ${WORKDIR}/lighttpd.logrotate.conf ${D}${sysconfdir}/logrotate.d/lighttpd.conf
+	install -m 0644 ${WORKDIR}/lighttpd.default ${D}${sysconfdir}/default/lighttpd
+}
+
+CONFFILES_${PN} += "${sysconfdir}/default/lighttpd ${sysconfdir}/logrotate.d/lighttpd.conf"
-- 
cgit v1.2.3


From ffc8eb97709544e1ee5cc8652e7c3a160de55c06 Mon Sep 17 00:00:00 2001
From: Jeff Hatch <jhatch@multitech.com>
Date: Tue, 30 May 2017 15:55:58 -0500
Subject: Fix jsparser recipe to install jsparser binary in morty

---
 recipes-support/multitech/jsparser_0.3.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-support/multitech/jsparser_0.3.bb b/recipes-support/multitech/jsparser_0.3.bb
index e5e2687..a7a4645 100644
--- a/recipes-support/multitech/jsparser_0.3.bb
+++ b/recipes-support/multitech/jsparser_0.3.bb
@@ -13,6 +13,7 @@ SRC_URI = "git://git.multitech.net/jsparser;branch=master \
 S = "${WORKDIR}/git"
 
 do_install_append() {
+    oe_runmake install DESTDIR=${D}
     install -d ${D}/usr/bin
     install -m 755 ${WORKDIR}/jspp ${D}/usr/bin/jspp
 }
-- 
cgit v1.2.3


From c1c2f0d8be1db3300a26a8083cdc0983076d6b63 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 30 May 2017 18:29:08 -0500
Subject: Add mLinux ntp configuration and NTP time test program

---
 recipes-support/ntp/files/logtime.patch   | 58 +++++++++++++---------------
 recipes-support/ntp/files/ntp.conf.patch  |  8 ++--
 recipes-support/ntp/files/ntpd-init.patch | 63 ++++++++++++-------------------
 recipes-support/ntp/ntp_%.bbappend        |  3 ++
 4 files changed, 58 insertions(+), 74 deletions(-)

diff --git a/recipes-support/ntp/files/logtime.patch b/recipes-support/ntp/files/logtime.patch
index 6b104ce..bb253f4 100644
--- a/recipes-support/ntp/files/logtime.patch
+++ b/recipes-support/ntp/files/logtime.patch
@@ -1,13 +1,9 @@
-  Create a test to log time since boot MONOTONIC_RAW or uptime
-  and the REALTIME clock (UTC)
-  Not real sure how the build should work.  To build logtime
-  do bitbake -c devshell ntp
-  Then cd clockstuff, and to:
-  make logtime
-==============================================================
-diff -Naur old/clockstuff/logtime.c new/clockstuff/logtime.c
---- old/clockstuff/logtime.c	1969-12-31 18:00:00.000000000 -0600
-+++ new/clockstuff/logtime.c	2017-01-27 16:55:46.420307603 -0600
+# The logtime test is used to compare the kernel realtime
+# clock and the kernel monotonic clock, so that leap
+# second may be observed.
+diff -Naru old/tests/ntpd/logtime.c new/tests/ntpd/logtime.c
+--- old/tests/ntpd/logtime.c	1969-12-31 18:00:00.000000000 -0600
++++ new/tests/ntpd/logtime.c	2017-05-30 13:22:11.827179154 -0500
 @@ -0,0 +1,44 @@
 +#include <time.h>
 +#include <stdio.h>
@@ -53,27 +49,25 @@ diff -Naur old/clockstuff/logtime.c new/clockstuff/logtime.c
 +	}	
 +
 +}
-diff -Naur old/clockstuff/Makefile.am new/clockstuff/Makefile.am
---- old/clockstuff/Makefile.am	2017-01-27 16:50:58.929973639 -0600
-+++ new/clockstuff/Makefile.am	2017-01-27 16:53:22.625139584 -0600
-@@ -1,7 +1,7 @@
- #AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
- AUTOMAKE_OPTIONS = 
--noinst_PROGRAMS = @PROPDELAY@ @CHUTEST@ @CLKTEST@
--EXTRA_PROGRAMS = propdelay chutest clktest
-+noinst_PROGRAMS = @PROPDELAY@ @CHUTEST@ @CLKTEST@ @LOGTIME@
-+EXTRA_PROGRAMS = propdelay chutest clktest logtime
+diff -Naru old/tests/ntpd/Makefile.am new/tests/ntpd/Makefile.am
+--- old/tests/ntpd/Makefile.am	2017-05-30 13:31:45.124160267 -0500
++++ new/tests/ntpd/Makefile.am	2017-05-30 16:53:59.784755988 -0500
+@@ -29,6 +29,7 @@
+ 	test-ntp_restrict	\
+ 	test-ntp_scanner	\
+ 	test-ntp_signd		\
++        logtime		        \
+ 	$(NULL)
  
- INCLUDES = -I$(top_srcdir)/include
- # We need -lm (and perhaps $(COMPAT) for propdelay, -lntp for {chu,clk}test
-diff -Naur old/configure.ac new/configure.ac
---- old/configure.ac	2017-01-27 17:59:46.940532782 -0600
-+++ new/configure.ac	2017-01-27 17:55:26.626841232 -0600
-@@ -4115,6 +4115,7 @@
- AC_SUBST([PROPDELAY])	dnl Set to "propdelay"
- AC_SUBST([CHUTEST])	dnl Set to "chutest"
- AC_SUBST([CLKTEST])	dnl Set to "clktest"
-+AC_SUBST([LOGTIME])	dnl Set to "logtime"
  
- AC_SUBST([MAKE_ADJTIMED])
- AC_MSG_CHECKING([if we want HP-UX adjtimed support])
+@@ -191,8 +192,8 @@
+ ## check-libntp.mf - automake fragment
+ ## slightly adapted for deeper directory
+ 
+-BUILT_SOURCES	+= check-libntpd check-libntp check-libunity
+-CLEANFILES	+= check-libntpd check-libntp check-libunity
++BUILT_SOURCES	+= check-libntpd check-libntp check-libunity logtime
++CLEANFILES	+= check-libntpd check-libntp check-libunity logtime
+ 
+ check-libntpd: ../../ntpd/libntpd.a
+ 	@echo stamp > $@
diff --git a/recipes-support/ntp/files/ntp.conf.patch b/recipes-support/ntp/files/ntp.conf.patch
index bb1dcfe..1a40d24 100644
--- a/recipes-support/ntp/files/ntp.conf.patch
+++ b/recipes-support/ntp/files/ntp.conf.patch
@@ -1,11 +1,11 @@
-diff -Naur old/ntp.conf new/ntp.conf
---- old/ntp.conf	2017-02-02 19:09:54.524791189 -0600
-+++ new/ntp.conf	2017-02-02 19:06:41.744669788 -0600
+diff -Naru orig.new/ntp.conf up/ntp.conf
+--- orig.new/ntp.conf	2017-05-30 10:44:16.311034239 -0500
++++ up/ntp.conf	2017-05-30 10:37:42.837793409 -0500
 @@ -1,16 +1,47 @@
 -# This is the most basic ntp configuration file
  # The driftfile must remain in a place specific to this
  # machine - it records the machine specific clock error
--driftfile /etc/ntp.drift
+-driftfile /var/lib/ntp/drift
 +# Driftfile must be in a directory owned by ntp
 +driftfile /var/lib/ntp/ntp.drift
 +
diff --git a/recipes-support/ntp/files/ntpd-init.patch b/recipes-support/ntp/files/ntpd-init.patch
index 2ef7e0b..1890e07 100644
--- a/recipes-support/ntp/files/ntpd-init.patch
+++ b/recipes-support/ntp/files/ntpd-init.patch
@@ -1,17 +1,23 @@
-diff -Naur old/ntpd new/ntpd
---- old/ntpd	2017-02-06 09:21:52.607908299 -0600
-+++ new/ntpd	2017-02-06 09:22:52.417169090 -0600
-@@ -1,6 +1,8 @@
+diff -Naru old/ntpd up/ntpd
+--- old/ntpd	2017-05-30 11:08:30.368920821 -0500
++++ up/ntpd	2017-05-30 11:52:42.965527343 -0500
+@@ -1,4 +1,4 @@
 -#! /bin/sh
 +#! /bin/bash
- #
+ 
+ ### BEGIN INIT INFO
+ # Provides:        ntp
+@@ -9,7 +9,9 @@
+ # Short-Description: Start NTP daemon
+ ### END INIT INFO
+ 
 +. /etc/default/ntpd
  PATH=/sbin:/bin:/usr/bin:/usr/sbin
 +GNSSRST=/sys/devices/platform/mts-io/gnss-reset
  
- # ntpd	init.d script for ntpdc from ntp.isc.org
- test -x /usr/sbin/ntpd -a -r /etc/ntp.conf || exit 0
-@@ -18,13 +20,29 @@
+ DAEMON=/usr/sbin/ntpd
+ PIDFILE=/var/run/ntpd.pid
+@@ -34,13 +36,35 @@
  	}
  }
  startdaemon(){
@@ -20,7 +26,7 @@ diff -Naur old/ntpd new/ntpd
 -	# this.  If ntpd seems to disappear after a while assume TICKADJ
 -	# above is set to a totally incorrect value.
 -	echo -n "Starting ntpd: "
--	start-stop-daemon --start -x /usr/sbin/ntpd -- -u ntp:ntp -p /var/run/ntp.pid "$@"
+-	start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -u ntp:ntp -p $PIDFILE "$@"
 -	echo "done"
 +	/usr/sbin/start-stop-daemon -N -20 --start -x /usr/sbin/ntpd --test -- -u ntp:ntp -p /var/run/ntp.pid "$@" \
 +	  || return 1
@@ -32,7 +38,7 @@ diff -Naur old/ntpd new/ntpd
 +		   # use the ntpd one shot option to get to less than
 +		   # 250mS error so that we don't waste time adjusting the clock.
 +		   /usr/sbin/ntpd -gq
-+		   /usr/sbin/start-stop-daemon -N -20 --start -x /usr/sbin/ntpd -- -u ntp:ntp -p /var/run/ntp.pid "$@"
++		   start-stop-daemon -N -20 --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -u ntp:ntp -p $PIDFILE "$@"
 +		else
 +		  # Need a GPS fix before startint ntp.  Try again later.
 +		  /usr/sbin/start-stop-daemon -b -n z1e9d3qb -N -20 --start -x /bin/bash -- -c "sleep $GPSD_WAIT_TIME;/etc/init.d/ntpd start"
@@ -43,17 +49,21 @@ diff -Naur old/ntpd new/ntpd
 +	    ntpd -gq
 +	    shift
 +	  fi
-+	  /usr/sbin/start-stop-daemon -N -20 --start -x /usr/sbin/ntpd -- -u ntp:ntp -p /var/run/ntp.pid "$@"
++	  # The -g option allows ntpd to step the time to correct it just
++	  # once.  The daemon will exit if the clock drifts too much after
++	  # this.  If ntpd seems to disappear after a while assume TICKADJ
++	  # above is set to a totally incorrect value.
++	  echo -n "Starting ntpd: "
++	  start-stop-daemon -N -20 --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- -u ntp:ntp -p $PIDFILE "$@"
++	  echo "done"
 +	fi
  }
  stopdaemon(){
  	echo -n "Stopping ntpd: "
-@@ -34,24 +52,38 @@
+@@ -50,6 +74,20 @@
  
  case "$1" in
    start)
--  	settick
--	startdaemon -g
 +	if ! [[ $ENABLED =~ ^[yY][eE][sS]$ ]] ; then
 +		exit 0
 +	fi
@@ -68,29 +78,6 @@ diff -Naur old/ntpd new/ntpd
 +			chown ntp:ntp ${STATSDIR} >/dev/null 2>&1
 +		fi
 +	fi
-+	settick
-+	startdaemon -g $CONFIGOPT
- 	;;
-   stop)
--  	stopdaemon
-+	stopdaemon
- 	;;
-   force-reload)
--  	stopdaemon
--  	settick
-+	stopdaemon
-+	settick
+   	settick
  	startdaemon -g
  	;;
-   restart)
--  	# Don't reset the tick here
-+	# Don't reset the tick here
- 	stopdaemon
- 	startdaemon -g
- 	;;
-   reload)
--  	# Must do this by hand, but don't do -g
-+	# Must do this by hand, but don't do -g
- 	stopdaemon
- 	startdaemon
- 	;;
diff --git a/recipes-support/ntp/ntp_%.bbappend b/recipes-support/ntp/ntp_%.bbappend
index c8e094d..6c75feb 100644
--- a/recipes-support/ntp/ntp_%.bbappend
+++ b/recipes-support/ntp/ntp_%.bbappend
@@ -1,6 +1,9 @@
 PR .= ".mlinux2"
 
 SRC_URI += " file://ntpd-default \
+    file://ntp.conf.patch;patchdir=.. \
+    file://ntpd-init.patch;patchdir=.. \
+    file://logtime.patch \
 		"
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-- 
cgit v1.2.3


From 1e7aee83532a588395155fd83c1616b3c7cf1971 Mon Sep 17 00:00:00 2001
From: Mykyta Dorokhin <mykyta.dorokhin@globallogic.com>
Date: Thu, 25 May 2017 10:13:35 -0500
Subject: mtcap: initial support for MTCAP-LORA-US915 card

---
 .../lora-network-server/lora-network-server.init   |  22 +-
 .../lora-network-server/lora-network-server.init~  | 105 ---------
 ...obal_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic | 195 -----------------
 ...obal_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic | 195 +++++++++++++++++
 ...obal_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic | 240 +++++++++++++++++++++
 .../mtcap/lora-packet-forwarder.init               | 107 +++++++--
 .../lora/lora-packet-forwarder_3.1.0.bb            |   6 +-
 7 files changed, 543 insertions(+), 327 deletions(-)
 delete mode 100755 recipes-connectivity/lora/lora-network-server/lora-network-server.init~
 delete mode 100644 recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic
 create mode 100644 recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic
 create mode 100644 recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic

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 70cc1f9..9dc8f7a 100755
--- a/recipes-connectivity/lora/lora-network-server/lora-network-server.init
+++ b/recipes-connectivity/lora/lora-network-server/lora-network-server.init
@@ -33,6 +33,8 @@ lora_1_0_hw="MTAC-LORA-1.0"
 lora_1_5_h_hw="MTAC-LORA-1.5"
 
 lora_mtcap_id="MTCAP-LORA"
+lora_mtcap_id868="MTCAP-LORA-868"
+lora_mtcap_id915="MTCAP-LORA-915"
 
 read_lora_hw_info() {
     # product-id of first lora card
@@ -70,8 +72,21 @@ hardware_found() {
 
         return 0
     elif [[ "$lora_id" =~ "$lora_mtcap_id" ]]; then
-        # currently only one valid global_conf.json
+        if [ "$lora_id" = "$lora_mtcap_id868" ]; then
+            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.EU868
+        elif [ "$lora_id" = "$lora_mtcap_id915" ]; then
+            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.US915
+        else
+            return 1
+        fi
+
         ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd
+
+        diff $GLOBAL_CONF /opt/lora/global_conf.json &> /dev/null
+        if [ $? -ne 0 ]; then
+            cp $GLOBAL_CONF /opt/lora/global_conf.json
+        fi
+
         return 0
     else
         echo Lora hardware not detected
@@ -81,8 +96,10 @@ hardware_found() {
 
 
 do_start() {
-
+    # create run directory
     mkdir -p $run_dir/1
+    rm -rf $run_dir/1/*
+
     read_lora_hw_info
 
     if ! [ -f $conf_file ]; then
@@ -90,7 +107,6 @@ do_start() {
         exit 1
     fi
 
-
     if hardware_found; then
         echo "Found $lora_id with $lora_hw hardware"
     else
diff --git a/recipes-connectivity/lora/lora-network-server/lora-network-server.init~ b/recipes-connectivity/lora/lora-network-server/lora-network-server.init~
deleted file mode 100755
index 4b80dc7..0000000
--- a/recipes-connectivity/lora/lora-network-server/lora-network-server.init~
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/bash
-
-NAME="lora-network-server"
-ENABLED="yes"
-
-[ -f /etc/default/$NAME ] && source /etc/default/$NAME
-
-run_dir=/var/run/lora
-conf_dir=/var/config/lora
-conf_file=$conf_dir/lora-network-server.conf
-conf_db=$conf_dir/lora-network-server.db
-
-net_server=/opt/lora/lora-network-server
-net_server_log=/var/log/lora-network-server.log
-net_server_pidfile=$run_dir/$NAME.pid
-
-pkt_fwd=/opt/lora/basic_pkt_fwd
-pkt_fwd_log=/var/log/lora-pkt-fwd-1.log
-pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid
-
-lora_us_id="MTAC-LORA-915"
-lora_eu_id="MTAC-LORA-868"
-
-read_card_info() {
-    # product-id of first lora card
-    lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null)
-    lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null)
-    # remove all colons
-    lora_eui_raw=${lora_eui//:/}
-}
-
-card_found() {
-    if [ "$lora_id" = "$lora_us_id" ] || [ "$lora_id" = "$lora_eu_id" ]; then
-        echo "Found lora card $lora_id"
-        return 0
-    else 
-        return 1
-    fi
-}
-
-do_start() {
-    read_card_info
-
-    if ! [ -f $conf_file ]; then
-        echo "$0: $conf_file missing"
-        exit 1
-    fi
-
-    if ! card_found; then
-        echo "$0: MTAC-LORA not detected"
-        exit 1
-    fi
-
-    echo -n "Starting $NAME: "
-    mkdir -p $run_dir/1
-    # start network server
-    start-stop-daemon --start --background --make-pidfile \
-        --pidfile $net_server_pidfile --startas /bin/bash -- -c "exec $net_server \
-        -c $conf_file --lora-eui $lora_eui --lora-path $run_dir --db $conf_db \
-        --noconsole -l $net_server_log  >> $net_server_log 2>&1"
-    sleep 2
-    # start packet forwarder
-    start-stop-daemon --start --background --make-pidfile \
-        --pidfile $pkt_fwd_pidfile --exec $pkt_fwd -- \
-        -c $run_dir/1
-
-    renice -n -20 -p $(pgrep lora-network-se)
-    renice -n -20 -p $(pgrep $(basename $pkt_fwd))
-
-    echo "OK"
-}
-
-do_stop() {
-    echo -n "Stopping $NAME: "
-    start-stop-daemon --stop --quiet --oknodo --pidfile $net_server_pidfile --retry 15
-    start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5
-    rm -f $net_server_pidfile $pkt_fwd_pidfile
-    echo "OK"
-}
-
-if [ "$ENABLED" != "yes" ]; then
-    echo "$NAME: disabled in /etc/default"
-    exit
-fi
-
-case "$1" in
-    "start")
-        do_start
-        ;;
-    "stop")
-        do_stop
-        ;;
-    "restart")
-        ## Stop the service and regardless of whether it was
-        ## running or not, start it again.
-        do_stop
-        do_start
-        ;;
-    *)
-        ## If no parameters are given, print which are avaiable.
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-        ;;
-esac
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic
deleted file mode 100644
index e29b1f1..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-    "SX1301_conf": {
-        "lorawan_public": true,
-        "clksrc": 0,
-        "lbt_cfg": {
-            "enable": false,
-            "rssi_target": 160,
-            "nb_channel": 1,
-            "start_freq": 869525000,
-            "scan_time_us": 5000,
-            "tx_delay_1ch_us": 4000000,
-            "tx_delay_2ch_us": 4000000
-        },
-        "antenna_gain": 1.4,
-        "radio_0": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 867500000,
-            "rssi_offset": -165.0,
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000
-        },
-        "radio_1": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 868500000,
-            "rssi_offset": -165.0,
-            "tx_enable": false
-        },
-        "chan_multiSF_0": {
-            "enable": true,
-            "radio": 1,
-            "if": -400000
-        },
-        "chan_multiSF_1": {
-            "enable": true,
-            "radio": 1,
-            "if": -200000
-        },
-        "chan_multiSF_2": {
-            "enable": true,
-            "radio": 1,
-            "if": 0
-        },
-        "chan_multiSF_3": {
-            "enable": true,
-            "radio": 0,
-            "if": -400000
-        },
-        "chan_multiSF_4": {
-            "enable": true,
-            "radio": 0,
-            "if": -200000
-        },
-        "chan_multiSF_5": {
-            "enable": true,
-            "radio": 0,
-            "if": 0
-        },
-        "chan_multiSF_6": {
-            "enable": true,
-            "radio": 0,
-            "if": 200000
-        },
-        "chan_multiSF_7": {
-            "enable": true,
-            "radio": 0,
-            "if": 400000
-        },
-        "chan_Lora_std": {
-            "enable": true,
-            "radio": 1,
-            "if": -200000,
-            "bandwidth": 250000,
-            "spread_factor": 7
-        },
-        "chan_FSK": {
-            "enable": true,
-            "radio": 1,
-            "if": 300000,
-            "bandwidth": 125000,
-            "datarate": 50000
-        },
-        "tx_lut_0": {
-            "pa_gain": 0,
-            "mix_gain": 9,
-            "rf_power": -6,
-            "dig_gain": 1
-        },
-        "tx_lut_1": {
-            "pa_gain": 0,
-            "mix_gain": 12,
-            "rf_power": -3,
-            "dig_gain": 1
-        },
-        "tx_lut_2": {
-            "pa_gain": 1,
-            "mix_gain": 8,
-            "rf_power": 0,
-            "dig_gain": 2
-        },
-        "tx_lut_3": {
-            "pa_gain": 1,
-            "mix_gain": 11,
-            "rf_power": 3,
-            "dig_gain": 3
-        },
-        "tx_lut_4": {
-            "pa_gain": 1,
-            "mix_gain": 10,
-            "rf_power": 6,
-            "dig_gain": 0
-        },
-        "tx_lut_5": {
-            "pa_gain": 2,
-            "mix_gain": 11,
-            "rf_power": 10,
-            "dig_gain": 3
-        },
-        "tx_lut_6": {
-            "pa_gain": 2,
-            "mix_gain": 9,
-            "rf_power": 11,
-            "dig_gain": 1
-        },
-        "tx_lut_7": {
-            "pa_gain": 2,
-            "mix_gain": 9,
-            "rf_power": 12,
-            "dig_gain": 0
-        },
-        "tx_lut_8": {
-            "pa_gain": 2,
-            "mix_gain": 11,
-            "rf_power": 13,
-            "dig_gain": 2
-        },
-        "tx_lut_9": {
-            "pa_gain": 2,
-            "mix_gain": 11,
-            "rf_power": 14,
-            "dig_gain": 1
-        },
-        "tx_lut_10": {
-            "pa_gain": 2,
-            "mix_gain": 12,
-            "rf_power": 16,
-            "dig_gain": 0
-        },
-        "tx_lut_11": {
-            "pa_gain": 3,
-            "mix_gain": 10,
-            "rf_power": 20,
-            "dig_gain": 3
-        },
-        "tx_lut_12": {
-            "pa_gain": 3,
-            "mix_gain": 9,
-            "rf_power": 23,
-            "dig_gain": 0
-        },
-        "tx_lut_13": {
-            "pa_gain": 3,
-            "mix_gain": 12,
-            "rf_power": 25,
-            "dig_gain": 2
-        },
-        "tx_lut_14": {
-            "pa_gain": 3,
-            "mix_gain": 13,
-            "rf_power": 26,
-            "dig_gain": 0
-        },
-        "tx_lut_15": {
-            "pa_gain": 3,
-            "mix_gain": 15,
-            "rf_power": 27,
-            "dig_gain": 0
-        }
-    },
-    "gateway_conf": {
-        "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
-        "server_address": "localhost",
-        "serv_port_up": 1680,
-        "serv_port_down": 1680,
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false
-    }
-}
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic
new file mode 100644
index 0000000..e29b1f1
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic
@@ -0,0 +1,195 @@
+{
+    "SX1301_conf": {
+        "lorawan_public": true,
+        "clksrc": 0,
+        "lbt_cfg": {
+            "enable": false,
+            "rssi_target": 160,
+            "nb_channel": 1,
+            "start_freq": 869525000,
+            "scan_time_us": 5000,
+            "tx_delay_1ch_us": 4000000,
+            "tx_delay_2ch_us": 4000000
+        },
+        "antenna_gain": 1.4,
+        "radio_0": {
+            "enable": true,
+            "type": "SX1257",
+            "freq": 867500000,
+            "rssi_offset": -165.0,
+            "tx_enable": true,
+            "tx_freq_min": 863000000,
+            "tx_freq_max": 870000000
+        },
+        "radio_1": {
+            "enable": true,
+            "type": "SX1257",
+            "freq": 868500000,
+            "rssi_offset": -165.0,
+            "tx_enable": false
+        },
+        "chan_multiSF_0": {
+            "enable": true,
+            "radio": 1,
+            "if": -400000
+        },
+        "chan_multiSF_1": {
+            "enable": true,
+            "radio": 1,
+            "if": -200000
+        },
+        "chan_multiSF_2": {
+            "enable": true,
+            "radio": 1,
+            "if": 0
+        },
+        "chan_multiSF_3": {
+            "enable": true,
+            "radio": 0,
+            "if": -400000
+        },
+        "chan_multiSF_4": {
+            "enable": true,
+            "radio": 0,
+            "if": -200000
+        },
+        "chan_multiSF_5": {
+            "enable": true,
+            "radio": 0,
+            "if": 0
+        },
+        "chan_multiSF_6": {
+            "enable": true,
+            "radio": 0,
+            "if": 200000
+        },
+        "chan_multiSF_7": {
+            "enable": true,
+            "radio": 0,
+            "if": 400000
+        },
+        "chan_Lora_std": {
+            "enable": true,
+            "radio": 1,
+            "if": -200000,
+            "bandwidth": 250000,
+            "spread_factor": 7
+        },
+        "chan_FSK": {
+            "enable": true,
+            "radio": 1,
+            "if": 300000,
+            "bandwidth": 125000,
+            "datarate": 50000
+        },
+        "tx_lut_0": {
+            "pa_gain": 0,
+            "mix_gain": 9,
+            "rf_power": -6,
+            "dig_gain": 1
+        },
+        "tx_lut_1": {
+            "pa_gain": 0,
+            "mix_gain": 12,
+            "rf_power": -3,
+            "dig_gain": 1
+        },
+        "tx_lut_2": {
+            "pa_gain": 1,
+            "mix_gain": 8,
+            "rf_power": 0,
+            "dig_gain": 2
+        },
+        "tx_lut_3": {
+            "pa_gain": 1,
+            "mix_gain": 11,
+            "rf_power": 3,
+            "dig_gain": 3
+        },
+        "tx_lut_4": {
+            "pa_gain": 1,
+            "mix_gain": 10,
+            "rf_power": 6,
+            "dig_gain": 0
+        },
+        "tx_lut_5": {
+            "pa_gain": 2,
+            "mix_gain": 11,
+            "rf_power": 10,
+            "dig_gain": 3
+        },
+        "tx_lut_6": {
+            "pa_gain": 2,
+            "mix_gain": 9,
+            "rf_power": 11,
+            "dig_gain": 1
+        },
+        "tx_lut_7": {
+            "pa_gain": 2,
+            "mix_gain": 9,
+            "rf_power": 12,
+            "dig_gain": 0
+        },
+        "tx_lut_8": {
+            "pa_gain": 2,
+            "mix_gain": 11,
+            "rf_power": 13,
+            "dig_gain": 2
+        },
+        "tx_lut_9": {
+            "pa_gain": 2,
+            "mix_gain": 11,
+            "rf_power": 14,
+            "dig_gain": 1
+        },
+        "tx_lut_10": {
+            "pa_gain": 2,
+            "mix_gain": 12,
+            "rf_power": 16,
+            "dig_gain": 0
+        },
+        "tx_lut_11": {
+            "pa_gain": 3,
+            "mix_gain": 10,
+            "rf_power": 20,
+            "dig_gain": 3
+        },
+        "tx_lut_12": {
+            "pa_gain": 3,
+            "mix_gain": 9,
+            "rf_power": 23,
+            "dig_gain": 0
+        },
+        "tx_lut_13": {
+            "pa_gain": 3,
+            "mix_gain": 12,
+            "rf_power": 25,
+            "dig_gain": 2
+        },
+        "tx_lut_14": {
+            "pa_gain": 3,
+            "mix_gain": 13,
+            "rf_power": 26,
+            "dig_gain": 0
+        },
+        "tx_lut_15": {
+            "pa_gain": 3,
+            "mix_gain": 15,
+            "rf_power": 27,
+            "dig_gain": 0
+        }
+    },
+    "gateway_conf": {
+        "gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
+        "server_address": "localhost",
+        "serv_port_up": 1680,
+        "serv_port_down": 1680,
+        "keepalive_interval": 10,
+        "stat_interval": 30,
+        "push_timeout_ms": 100,
+        "forward_crc_valid": true,
+        "forward_crc_error": false,
+        "forward_crc_disabled": false
+    }
+}
+
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic
new file mode 100644
index 0000000..6d56f3b
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic
@@ -0,0 +1,240 @@
+{
+	"SX1301_conf" : 
+	{
+		"antenna_gain" : 0, /* antenna gain, in dBi */
+		"chan_FSK" : 
+		{
+			"bandwidth" : 125000,
+			"datarate" : 50000,
+			"enable" : false,
+			"if" : 300000,
+			"radio" : 0
+		},
+		"chan_Lora_std" : 
+		{
+			"bandwidth" : 500000,
+			"enable" : true,
+			"if" : 300000,
+			"radio" : 0,
+			"spread_factor" : 8
+		},
+		"chan_multiSF_0" : 
+		{
+			"enable" : true,
+			"if" : -400000,
+			"radio" : 0
+		},
+		"chan_multiSF_1" : 
+		{
+			"enable" : true,
+			"if" : -200000,
+			"radio" : 0
+		},
+		"chan_multiSF_2" : 
+		{
+			"enable" : true,
+			"if" : 0,
+			"radio" : 0
+		},
+		"chan_multiSF_3" : 
+		{
+			"enable" : true,
+			"if" : 200000,
+			"radio" : 0
+		},
+		"chan_multiSF_4" : 
+		{
+			"enable" : true,
+			"if" : -400000,
+			"radio" : 1
+		},
+		"chan_multiSF_5" : 
+		{
+			"enable" : true,
+			"if" : -200000,
+			"radio" : 1
+		},
+		"chan_multiSF_6" : 
+		{
+			"enable" : true,
+			"if" : 0,
+			"radio" : 1
+		},
+		"chan_multiSF_7" : 
+		{
+			"enable" : true,
+			"if" : 200000,
+			"radio" : 1
+		},
+		"clksrc" : 0,
+		"lbt_cfg" : 
+		{
+			"enable" : false,
+			"nb_channel" : 1,
+			"rssi_target" : 160, /* rssi in dBm = -lbt_rssi_target/2 */
+			"scan_time_us" : 5000,
+			"start_freq" : 869525000,
+			"tx_delay_1ch_us" : 4000000,
+			"tx_delay_2ch_us" : 4000000
+		},
+		"lorawan_public" : true,
+		"radio_0" : 
+		{
+			"enable" : true,
+			"freq" : 902700000,
+			"rssi_offset" : -162,
+			"tx_enable" : true,
+			"tx_freq_max" : 928000000,
+			"tx_freq_min" : 902000000,
+			"type" : "SX1257"
+		},
+		"radio_1" : 
+		{
+			"enable" : true,
+			"freq" : 903500000,
+			"rssi_offset" : -162,
+			"tx_enable" : false,
+			"type" : "SX1257"
+		},
+		"tx_lut_0" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 11,
+			/* TX gain table, index 0 */
+			"pa_gain" : 0,
+			"rf_power" : -6
+		},
+		"tx_lut_1" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 13,
+			/* TX gain table, index 1 */
+			"pa_gain" : 0,
+			"rf_power" : -3
+		},
+		"tx_lut_10" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 15,
+			/* TX gain table, index 10 */
+			"pa_gain" : 2,
+			"rf_power" : 16
+		},
+		"tx_lut_11" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 10,
+			/* TX gain table, index 11 */
+			"pa_gain" : 3,
+			"rf_power" : 20
+		},
+		"tx_lut_12" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 12,
+			/* TX gain table, index 12 */
+			"pa_gain" : 3,
+			"rf_power" : 23
+		},
+		"tx_lut_13" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 13,
+			/* TX gain table, index 13 */
+			"pa_gain" : 3,
+			"rf_power" : 25
+		},
+		"tx_lut_14" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 15,
+			/* TX gain table, index 14 */
+			"pa_gain" : 3,
+			"rf_power" : 26
+		},
+		"tx_lut_15" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 15,
+			/* TX gain table, index 15 */
+			"pa_gain" : 3,
+			"rf_power" : 27
+		},
+		"tx_lut_2" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 9,
+			/* TX gain table, index 2 */
+			"pa_gain" : 1,
+			"rf_power" : 0
+		},
+		"tx_lut_3" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 10,
+			/* TX gain table, index 3 */
+			"pa_gain" : 1,
+			"rf_power" : 3
+		},
+		"tx_lut_4" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 12,
+			/* TX gain table, index 4 */
+			"pa_gain" : 1,
+			"rf_power" : 6
+		},
+		"tx_lut_5" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 10,
+			/* TX gain table, index 5 */
+			"pa_gain" : 2,
+			"rf_power" : 10
+		},
+		"tx_lut_6" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 11,
+			/* TX gain table, index 6 */
+			"pa_gain" : 2,
+			"rf_power" : 11
+		},
+		"tx_lut_7" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 11,
+			/* TX gain table, index 7 */
+			"pa_gain" : 2,
+			"rf_power" : 12
+		},
+		"tx_lut_8" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 12,
+			/* TX gain table, index 8 */
+			"pa_gain" : 2,
+			"rf_power" : 13
+		},
+		"tx_lut_9" : 
+		{
+			"dig_gain" : 0,
+			"mix_gain" : 13,
+			/* TX gain table, index 9 */
+			"pa_gain" : 2,
+			"rf_power" : 14
+		}
+	},
+	"gateway_conf": {
+		"gateway_ID": "<WILL-BE-AUTO-REPLACED-WITH-LORA-EUI>",
+		"server_address": "localhost",
+		"serv_port_up": 1680,
+		"serv_port_down": 1680,
+		"keepalive_interval": 10,
+		"stat_interval": 30,
+		"push_timeout_ms": 100,
+		"forward_crc_valid": true,
+		"forward_crc_error": false,
+		"forward_crc_disabled": false
+	}
+}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.init
index 9ffaf6d..b17a3d8 100755
--- a/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.init
+++ b/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.init
@@ -3,58 +3,122 @@
 NAME="lora-packet-forwarder"
 ENABLED="yes"
 
-START_STOP_DAEMON="/usr/sbin/start-stop-daemon"
-
 [ -f /etc/default/$NAME ] && source /etc/default/$NAME
 
 run_dir=/var/run/lora
-pkt_fwd=/opt/lora/lora_pkt_fwd
-pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid
+conf_file=/var/config/lora/global_conf.json
+conf_file_local=/var/config/lora/local_conf.json
+opt_conf_file=/opt/lora/global_conf.json
+opt_conf_file_local=/opt/lora/local_conf.json
 log_file=/var/log/lora-pkt-fwd.log
-cfg_file=/opt/lora/global_conf.json
+
+pkt_fwd=$run_dir/1/lora_pkt_fwd
+pkt_fwd_log=/var/log/lora-pkt-fwd-1.log
+pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid
+
+lora_mtcap_id="MTCAP-LORA"
+lora_mtcap_id868="MTCAP-LORA-868"
+lora_mtcap_id915="MTCAP-LORA-915"
+
+read_lora_hw_info() {
+    # product-id of first lora card
+    lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null)
+    lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null)
+    # remove all colons
+    lora_eui_raw=${lora_eui//:/}
+    lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null)
+}
+
+hardware_found() {
+    if [[ "$lora_id" =~ "$lora_mtcap_id" ]]; then
+        #
+        # create /opt/lora/global_conf.json based on detected LORA card
+        #
+        if [ "$lora_id" = "$lora_mtcap_id868" ]; then
+            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.EU868
+        elif [ "$lora_id" = "$lora_mtcap_id915" ]; then
+            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.US915
+        else
+            return 1
+        fi
+
+        cp $GLOBAL_CONF $opt_conf_file
+        echo "Setting gateway_id in $opt_conf_file to $lora_eui_raw"
+        sed -i "s/\"gateway_ID\": \".*\"/\"gateway_ID\": \"$lora_eui_raw\"/" $opt_conf_file
+
+        #
+        # copy global_json.conf and local_json.conf files to /var/config/ if it is not there yet
+        #
+        if ! [ -f $conf_file ]; then
+            mkdir -p /var/config/lora/
+            cp $opt_conf_file $conf_file
+            cp $opt_conf_file_local $conf_file_local
+        fi
+
+        ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd
+    else
+        return 1
+    fi
+
+}
 
 do_start() {
-    echo "Starting $NAME: "
+    # create run directory
+    mkdir -p $run_dir/1
+    rm -rf $run_dir/1/*
+
+    read_lora_hw_info
+
+    if hardware_found; then
+        echo "Found $lora_id with $lora_hw hardware"
+    else
+        echo "$0: LORA not detected"
+        exit 1
+    fi
 
-    eui=$(mts-io-sysfs show lora/eui)
-    # Remove colons
-    clean_eui="${eui//:/}"
-    echo "Setting gateway_id in $cfg_file to $clean_eui"
-    sed -i "s/\"gateway_ID\": \".*\"/\"gateway_ID\": \"$clean_eui\"/" $cfg_file
+    # copy conf files to the run directory
+    if [ -f $conf_file ]; then
+        cp $conf_file $run_dir/1/
+    fi
 
-    mkdir -p $run_dir
+    if [ -f $conf_file_local ]; then
+        cp $conf_file_local $run_dir/1/
+    fi
 
     # start packet forwarder
-    $START_STOP_DAEMON --start --background --make-pidfile \
-        --pidfile $pkt_fwd_pidfile --startas /bin/bash --chdir "/opt/lora/" \
-        -- -c "exec $pkt_fwd > $log_file 2>&1"
+    echo -n "Starting $NAME: "
+    /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \
+        --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd > $log_file 2>&1"
 
     renice -n -20 -p $(pgrep $(basename $pkt_fwd))
 
     echo "OK"
 }
 
+
 do_stop() {
     echo -n "Stopping $NAME: "
-    $START_STOP_DAEMON --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5
+    start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5
     rm -f $pkt_fwd_pidfile
     echo "OK"
 }
 
+
 if [ "$ENABLED" != "yes" ]; then
-    echo "$NAME: disabled in /etc/default/$NAME"
+    echo "$NAME: disabled in /etc/default"
     exit
 fi
 
+
 case "$1" in
     "start")
-        do_start
+    do_start
         ;;
     "stop")
-        do_stop
+    do_stop
         ;;
     "restart")
-        ## Stop the service and regardless of whether it was
+    ## Stop the service and regardless of whether it was
         ## running or not, start it again.
         do_stop
         do_start
@@ -63,7 +127,6 @@ case "$1" in
         ## If no parameters are given, print which are avaiable.
         echo "Usage: $0 {start|stop|restart}"
         exit 1
-        ;;
+    ;;
 esac
 
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
index b536309..ceda0b5 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
@@ -20,7 +20,8 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
            file://global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 \
            file://global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 \
            file://global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic \
+           file://global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic \
+           file://global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic \
            file://local_conf.json \
            file://lora-packet-forwarder-add-spi-dev-path.patch \
            file://lora-packet-forwarder-remove-jit-power-check.patch \
@@ -69,7 +70,8 @@ do_install_append_mtcdt() {
 }
 
 do_install_append_mtcap() {
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTCAP-LORA-1-5.EU868.basic ${D}${LORA_DIR}/global_conf.json
+  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.EU868
+  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic ${D}${LORA_DIR}/global_conf.json.MTCAP_LORA_1_5.US915
 }
 
 FILES_${PN} += "${LORA_DIR}"
-- 
cgit v1.2.3


From 538a395e1754c31ecff6888a4a22aee29b5eea50 Mon Sep 17 00:00:00 2001
From: Jason Reiss <jreiss@multitech.com>
Date: Thu, 25 May 2017 14:18:48 -0500
Subject: lora: network server update to 1.0.34, update global_conf files for
 3.1.0 packet forwarder

---
 .../lora/lora-network-server_1.0.32.bb             |  49 -----
 .../lora/lora-network-server_1.0.34.bb             |  49 +++++
 ...nf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 | 225 ---------------------
 ...nf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 | 192 ------------------
 ...nf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 | 225 ---------------------
 ...nf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 | 192 ------------------
 ...nf.json.3.1.0.MTAC_LORA_1_0.EU868.basic.clksrc0 | 225 +++++++++++++++++++++
 ...nf.json.3.1.0.MTAC_LORA_1_0.US915.basic.clksrc0 | 192 ++++++++++++++++++
 ...nf.json.3.1.0.MTAC_LORA_1_5.EU868.basic.clksrc0 | 225 +++++++++++++++++++++
 ...nf.json.3.1.0.MTAC_LORA_1_5.US915.basic.clksrc0 | 192 ++++++++++++++++++
 .../mtcdt/lora-packet-forwarder.init               |  42 ++--
 .../lora/lora-packet-forwarder_3.1.0.bb            |  22 +-
 12 files changed, 909 insertions(+), 921 deletions(-)
 delete mode 100644 recipes-connectivity/lora/lora-network-server_1.0.32.bb
 create mode 100644 recipes-connectivity/lora/lora-network-server_1.0.34.bb
 delete mode 100644 recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0
 delete mode 100644 recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0
 delete mode 100644 recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0
 delete mode 100644 recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0
 create mode 100644 recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.EU868.basic.clksrc0
 create mode 100644 recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.US915.basic.clksrc0
 create mode 100644 recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.EU868.basic.clksrc0
 create mode 100644 recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.US915.basic.clksrc0

diff --git a/recipes-connectivity/lora/lora-network-server_1.0.32.bb b/recipes-connectivity/lora/lora-network-server_1.0.32.bb
deleted file mode 100644
index 3038f85..0000000
--- a/recipes-connectivity/lora/lora-network-server_1.0.32.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-DESCRIPTION = "MultiTech LoRa Network Server"
-PRIORITY = "optional"
-SECTION = "console/utils"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7ffae4666a986c4ccf45e99e464f8402"
-DEPENDS = "jsoncpp libmts mosquitto sqlite3"
-RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash"
-PR = "r1"
-
-SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \
-           file://lora-network-server.init \
-           file://lora-network-server.default \
-           file://lora-network-server.logrotate.conf \
-          "
-
-SRC_URI[md5sum] = "1cf05bddf4f56f190259b9a6569be953"
-SRC_URI[sha256sum] = "1be5bcc311b5600aa36a969b057c76c2f16d3819f8abb791558ce697a801099a"
-
-# 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 ${D}${LORA_DIR}/
-    install -m 0644 lora-network-server.conf.sample ${D}${LORA_DIR}/lora-network-server.conf.sample
-
-    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
-    install -d ${D}${sysconfdir}/logrotate.d
-    install -m 0644 ${WORKDIR}/lora-network-server.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-network-server.conf
-}
-
-CONFFILES_${PN} = "${sysconfdir}/default/lora-network-server"
-FILES_${PN} += "${LORA_DIR}"
-FILES_${PN}-dbg += "${LORA_DIR}/.debug"
diff --git a/recipes-connectivity/lora/lora-network-server_1.0.34.bb b/recipes-connectivity/lora/lora-network-server_1.0.34.bb
new file mode 100644
index 0000000..f2b377b
--- /dev/null
+++ b/recipes-connectivity/lora/lora-network-server_1.0.34.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "MultiTech LoRa Network Server"
+PRIORITY = "optional"
+SECTION = "console/utils"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7ffae4666a986c4ccf45e99e464f8402"
+DEPENDS = "jsoncpp libmts mosquitto sqlite3"
+RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash"
+PR = "r1"
+
+SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \
+           file://lora-network-server.init \
+           file://lora-network-server.default \
+           file://lora-network-server.logrotate.conf \
+          "
+
+SRC_URI[md5sum] = "efc72db6ea064c6dcb867e83682d84d2"
+SRC_URI[sha256sum] = "73f22ff5cadc5565450a2a3d1f2231b002552ecac254717b68b526d3f261986c"
+
+# 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 ${D}${LORA_DIR}/
+    install -m 0644 lora-network-server.conf.sample ${D}${LORA_DIR}/lora-network-server.conf.sample
+
+    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
+    install -d ${D}${sysconfdir}/logrotate.d
+    install -m 0644 ${WORKDIR}/lora-network-server.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-network-server.conf
+}
+
+CONFFILES_${PN} = "${sysconfdir}/default/lora-network-server"
+FILES_${PN} += "${LORA_DIR}"
+FILES_${PN}-dbg += "${LORA_DIR}/.debug"
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0
deleted file mode 100644
index 5e8bec0..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-    "SX1301_conf": {
-        "lorawan_public": true,
-        "clksrc": 0, /* radio_1 provides clock to concentrator */
-        "lbt_cfg": {
-            "enable": false,
-            "rssi_target": 160, /* rssi in dBm = -lbt_rssi_target/2 */
-            "nb_channel": 1,
-            "start_freq": 869525000,
-            "scan_time_us": 5000,
-            "tx_delay_1ch_us": 4000000,
-            "tx_delay_2ch_us": 4000000
-        },
-        "antenna_gain": 0, /* antenna gain, in dBi */
-        "radio_0": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 867500000,
-            "rssi_offset": -165.0,
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000
-        },
-        "radio_1": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 868500000,
-            "rssi_offset": -165.0,
-            "tx_enable": false
-        },
-        "chan_multiSF_0": {
-            /* Lora MAC channel, 125kHz, all SF, 868.1 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -400000
-        },
-        "chan_multiSF_1": {
-            /* Lora MAC channel, 125kHz, all SF, 868.3 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -200000
-        },
-        "chan_multiSF_2": {
-            /* Lora MAC channel, 125kHz, all SF, 868.5 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 0
-        },
-        "chan_multiSF_3": {
-            /* Lora MAC channel, 125kHz, all SF, 867.1 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -400000
-        },
-        "chan_multiSF_4": {
-            /* Lora MAC channel, 125kHz, all SF, 867.3 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -200000
-        },
-        "chan_multiSF_5": {
-            /* Lora MAC channel, 125kHz, all SF, 867.5 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 0
-        },
-        "chan_multiSF_6": {
-            /* Lora MAC channel, 125kHz, all SF, 867.7 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 200000
-        },
-        "chan_multiSF_7": {
-            /* Lora MAC channel, 125kHz, all SF, 867.9 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 400000
-        },
-        "chan_Lora_std": {
-            /* Lora MAC channel, 250kHz, SF7, 868.3 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -200000,
-            "bandwidth": 250000,
-            "spread_factor": 7
-        },
-        "chan_FSK": {
-            /* FSK 50kbps channel, 868.8 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 300000,
-            "bandwidth": 125000,
-            "datarate": 50000
-        },
-        "tx_lut_0": {
-            /* TX gain table, index 0 */
-            "pa_gain": 0,
-            "mix_gain": 8,
-            "rf_power": -6,
-            "dig_gain": 3
-        },
-        "tx_lut_1": {
-            /* TX gain table, index 1 */
-            "pa_gain": 0,
-            "mix_gain": 10,
-            "rf_power": -3,
-            "dig_gain": 3
-        },
-        "tx_lut_2": {
-            /* TX gain table, index 2 */
-            "pa_gain": 0,
-            "mix_gain": 12,
-            "rf_power": 0,
-            "dig_gain": 3
-        },
-        "tx_lut_3": {
-            /* TX gain table, index 3 */
-            "pa_gain": 1,
-            "mix_gain": 8,
-            "rf_power": 3,
-            "dig_gain": 3
-        },
-        "tx_lut_4": {
-            /* TX gain table, index 4 */
-            "pa_gain": 1,
-            "mix_gain": 10,
-            "rf_power": 6,
-            "dig_gain": 3
-        },
-        "tx_lut_5": {
-            /* TX gain table, index 5 */
-            "pa_gain": 1,
-            "mix_gain": 12,
-            "rf_power": 10,
-            "dig_gain": 3
-        },
-        "tx_lut_6": {
-            /* TX gain table, index 6 */
-            "pa_gain": 1,
-            "mix_gain": 12,
-            "rf_power": 11,
-            "dig_gain": 3
-        },
-        "tx_lut_7": {
-            /* TX gain table, index 7 */
-            "pa_gain": 2,
-            "mix_gain": 9,
-            "rf_power": 12,
-            "dig_gain": 3
-        },
-        "tx_lut_8": {
-            /* TX gain table, index 8 */
-            "pa_gain": 1,
-            "mix_gain": 15,
-            "rf_power": 13,
-            "dig_gain": 3
-        },
-        "tx_lut_9": {
-            /* TX gain table, index 9 */
-            "pa_gain": 2,
-            "mix_gain": 10,
-            "rf_power": 14,
-            "dig_gain": 3
-        },
-        "tx_lut_10": {
-            /* TX gain table, index 10 */
-            "pa_gain": 2,
-            "mix_gain": 11,
-            "rf_power": 16,
-            "dig_gain": 3
-        },
-        "tx_lut_11": {
-            /* TX gain table, index 11 */
-            "pa_gain": 3,
-            "mix_gain": 10,
-            "rf_power": 20,
-            "dig_gain": 3
-        },
-        "tx_lut_12": {
-            /* TX gain table, index 12 */
-            "pa_gain": 3,
-            "mix_gain": 11,
-            "rf_power": 23,
-            "dig_gain": 3
-        },
-        "tx_lut_13": {
-            /* TX gain table, index 13 */
-            "pa_gain": 3,
-            "mix_gain": 12,
-            "rf_power": 24,
-            "dig_gain": 3
-        },
-        "tx_lut_14": {
-            /* TX gain table, index 14 */
-            "pa_gain": 3,
-            "mix_gain": 13,
-            "rf_power": 25,
-            "dig_gain": 3
-        },
-        "tx_lut_15": {
-            /* TX gain table, index 15 */
-            "pa_gain": 3,
-            "mix_gain": 15,
-            "rf_power": 26,
-            "dig_gain": 3
-        }
-    },
-
-    "gateway_conf": {
-        "gateway_ID": "AA555A0000000000",
-        /* change with default server address/ports, or overwrite in local_conf.json */
-        "server_address": "localhost",
-        "serv_port_up": 1680,
-        "serv_port_down": 1680,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false
-    }
-}
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0
deleted file mode 100644
index ab3597e..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-	"SX1301_conf": {
-		"lorawan_public": true,
-		"antenna_gain": 0,
-		"clksrc": 0,
-		"radio_0": {
-			"enable": true,
-			"freq": 902600000,
-			"rssi_offset": -165,
-			"tx_enable": true,
-			"tx_freq_max": 902000000,
-			"tx_freq_min": 928000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 903400000,
-			"rssi_offset": -165,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"chan_FSK": {
-			"enable": false,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 500000,
-			"enable": true,
-			"if": 400000,
-			"radio": 0,
-			"spread_factor": 8
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -300000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -100000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 100000,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": 300000,
-			"radio": 0
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -300000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": -100000,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 100000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 300000,
-			"radio": 1
-		},
-		"lbt_cfg": {
-			"enable": false,
-			"nb_channel": 1,
-			"rssi_target": 160,
-			"scan_time_us": 5000,
-			"start_freq": 869525000,
-			"tx_delay_1ch_us": 4000000,
-			"tx_delay_2ch_us": 4000000
-		},
-        "tx_lut_0": {                           
-            "pa_gain": 0,               
-            "mix_gain": 8,                                   
-            "rf_power": -6,             
-            "dig_gain": 3               
-        },                              
-        "tx_lut_1": {                   
-            "pa_gain": 0,                                    
-            "mix_gain": 10,             
-            "rf_power": -3,             
-            "dig_gain": 3               
-        },                              
-        "tx_lut_2": {                   
-            "pa_gain": 0,               
-            "mix_gain": 12,             
-            "rf_power": 0,              
-            "dig_gain": 3               
-        },                              
-        "tx_lut_3": {                   
-            "pa_gain": 1,                      
-            "mix_gain": 8,              
-            "rf_power": 3,              
-            "dig_gain": 3                                    
-        },                              
-        "tx_lut_4": {                   
-            "pa_gain": 1,               
-            "mix_gain": 10,             
-            "rf_power": 6,                                   
-            "dig_gain": 3               
-        },                              
-        "tx_lut_5": {                   
-            "pa_gain": 1,               
-            "mix_gain": 12,                                  
-            "rf_power": 10,             
-            "dig_gain": 3               
-        },                              
-        "tx_lut_6": {                    
-            "pa_gain": 1,                                    
-            "mix_gain": 12,              
-            "rf_power": 11,             
-            "dig_gain": 3               
-        },     
-        "tx_lut_7": {                   
-            "pa_gain": 2,                                    
-            "mix_gain": 9,                                       
-            "rf_power": 12,             
-            "dig_gain": 3               
-        },                                                            
-        "tx_lut_8": {                   
-            "pa_gain": 1,               
-            "mix_gain": 15,             
-            "rf_power": 13,             
-            "dig_gain": 3               
-        },                                           
-        "tx_lut_9": {                                        
-            "pa_gain": 2,               
-            "mix_gain": 10,              
-            "rf_power": 14,              
-            "dig_gain": 3                
-        },                                                
-        "tx_lut_10": {                   
-            "pa_gain": 2,               
-            "mix_gain": 11,              
-            "rf_power": 16,              
-            "dig_gain": 3                
-        },                               
-        "tx_lut_11": {                         
-            "pa_gain": 3,               
-            "mix_gain": 10,                                  
-            "rf_power": 20,              
-            "dig_gain": 3                
-        },                               
-        "tx_lut_12": {                   
-            "pa_gain": 3,                                    
-            "mix_gain": 11,              
-            "rf_power": 23,              
-            "dig_gain": 3                
-        },                               
-        "tx_lut_13": {                   
-            "pa_gain": 3,               
-            "mix_gain": 12,              
-            "rf_power": 24,              
-            "dig_gain": 3                
-        },                               
-        "tx_lut_14": {                                       
-            "pa_gain": 3,               
-            "mix_gain": 13,              
-            "rf_power": 25,              
-            "dig_gain": 3                
-        },                                                   
-        "tx_lut_15": {                                        
-            "pa_gain": 3,                                     
-            "mix_gain": 15,                                   
-            "rf_power": 26,                                   
-            "dig_gain": 3                
-        } 
-	},
-	"gateway_conf": {
-		"forward_crc_disabled": false,
-		"forward_crc_error": false,
-		"forward_crc_valid": true,
-		"gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>",
-		"keepalive_interval": 12,
-		"push_timeout_ms": 120,
-		"serv_port_down": 1780,
-		"serv_port_up": 1780,
-		"server_address": "us01-iot.semtech.com",
-		"stat_interval": 20,
-		"synch_word": 52
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0
deleted file mode 100644
index 4c388a4..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-    "SX1301_conf": {
-        "lorawan_public": true,
-        "clksrc": 0, /* radio_1 provides clock to concentrator */
-        "lbt_cfg": {
-            "enable": false,
-            "rssi_target": 160, /* rssi in dBm = -lbt_rssi_target/2 */
-            "nb_channel": 1,
-            "start_freq": 869525000,
-            "scan_time_us": 5000,
-            "tx_delay_1ch_us": 4000000,
-            "tx_delay_2ch_us": 4000000
-        },
-        "antenna_gain": 0, /* antenna gain, in dBi */
-        "radio_0": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 867500000,
-            "rssi_offset": -165.0,
-            "tx_enable": true,
-            "tx_freq_min": 863000000,
-            "tx_freq_max": 870000000
-        },
-        "radio_1": {
-            "enable": true,
-            "type": "SX1257",
-            "freq": 868500000,
-            "rssi_offset": -165.0,
-            "tx_enable": false
-        },
-        "chan_multiSF_0": {
-            /* Lora MAC channel, 125kHz, all SF, 868.1 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -400000
-        },
-        "chan_multiSF_1": {
-            /* Lora MAC channel, 125kHz, all SF, 868.3 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -200000
-        },
-        "chan_multiSF_2": {
-            /* Lora MAC channel, 125kHz, all SF, 868.5 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 0
-        },
-        "chan_multiSF_3": {
-            /* Lora MAC channel, 125kHz, all SF, 867.1 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -400000
-        },
-        "chan_multiSF_4": {
-            /* Lora MAC channel, 125kHz, all SF, 867.3 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": -200000
-        },
-        "chan_multiSF_5": {
-            /* Lora MAC channel, 125kHz, all SF, 867.5 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 0
-        },
-        "chan_multiSF_6": {
-            /* Lora MAC channel, 125kHz, all SF, 867.7 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 200000
-        },
-        "chan_multiSF_7": {
-            /* Lora MAC channel, 125kHz, all SF, 867.9 MHz */
-            "enable": true,
-            "radio": 0,
-            "if": 400000
-        },
-        "chan_Lora_std": {
-            /* Lora MAC channel, 250kHz, SF7, 868.3 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": -200000,
-            "bandwidth": 250000,
-            "spread_factor": 7
-        },
-        "chan_FSK": {
-            /* FSK 50kbps channel, 868.8 MHz */
-            "enable": true,
-            "radio": 1,
-            "if": 300000,
-            "bandwidth": 125000,
-            "datarate": 50000
-        },
-        "tx_lut_0": {
-            /* TX gain table, index 0 */
-            "pa_gain": 0,
-            "mix_gain": 11,
-            "rf_power": -6,
-            "dig_gain": 0
-        },
-        "tx_lut_1": {
-            /* TX gain table, index 1 */
-            "pa_gain": 0,
-            "mix_gain": 13,
-            "rf_power": -3,
-            "dig_gain": 0
-        },
-        "tx_lut_2": {
-            /* TX gain table, index 2 */
-            "pa_gain": 1,
-            "mix_gain": 9,
-            "rf_power": 0,
-            "dig_gain": 0
-        },
-        "tx_lut_3": {
-            /* TX gain table, index 3 */
-            "pa_gain": 1,
-            "mix_gain": 10,
-            "rf_power": 3,
-            "dig_gain": 0
-        },
-        "tx_lut_4": {
-            /* TX gain table, index 4 */
-            "pa_gain": 1,
-            "mix_gain": 12,
-            "rf_power": 6,
-            "dig_gain": 0
-        },
-        "tx_lut_5": {
-            /* TX gain table, index 5 */
-            "pa_gain": 2,
-            "mix_gain": 10,
-            "rf_power": 10,
-            "dig_gain": 0
-        },
-        "tx_lut_6": {
-            /* TX gain table, index 6 */
-            "pa_gain": 2,
-            "mix_gain": 11,
-            "rf_power": 11,
-            "dig_gain": 0
-        },
-        "tx_lut_7": {
-            /* TX gain table, index 7 */
-            "pa_gain": 2,
-            "mix_gain": 11,
-            "rf_power": 12,
-            "dig_gain": 0
-        },
-        "tx_lut_8": {
-            /* TX gain table, index 8 */
-            "pa_gain": 2,
-            "mix_gain": 12,
-            "rf_power": 13,
-            "dig_gain": 0
-        },
-        "tx_lut_9": {
-            /* TX gain table, index 9 */
-            "pa_gain": 2,
-            "mix_gain": 13,
-            "rf_power": 14,
-            "dig_gain": 0
-        },
-        "tx_lut_10": {
-            /* TX gain table, index 10 */
-            "pa_gain": 2,
-            "mix_gain": 15,
-            "rf_power": 16,
-            "dig_gain": 0
-        },
-        "tx_lut_11": {
-            /* TX gain table, index 11 */
-            "pa_gain": 3,
-            "mix_gain": 10,
-            "rf_power": 20,
-            "dig_gain": 0
-        },
-        "tx_lut_12": {
-            /* TX gain table, index 12 */
-            "pa_gain": 3,
-            "mix_gain": 12,
-            "rf_power": 23,
-            "dig_gain": 0
-        },
-        "tx_lut_13": {
-            /* TX gain table, index 13 */
-            "pa_gain": 3,
-            "mix_gain": 13,
-            "rf_power": 25,
-            "dig_gain": 0
-        },
-        "tx_lut_14": {
-            /* TX gain table, index 14 */
-            "pa_gain": 3,
-            "mix_gain": 15,
-            "rf_power": 26,
-            "dig_gain": 0
-        },
-        "tx_lut_15": {
-            /* TX gain table, index 15 */
-            "pa_gain": 3,
-            "mix_gain": 15,
-            "rf_power": 27,
-            "dig_gain": 0
-        }
-    },
-
-    "gateway_conf": {
-        "gateway_ID": "AA555A0000000000",
-        /* change with default server address/ports, or overwrite in local_conf.json */
-        "server_address": "localhost",
-        "serv_port_up": 1680,
-        "serv_port_down": 1680,
-        /* adjust the following parameters for your network */
-        "keepalive_interval": 10,
-        "stat_interval": 30,
-        "push_timeout_ms": 100,
-        /* forward only valid packets */
-        "forward_crc_valid": true,
-        "forward_crc_error": false,
-        "forward_crc_disabled": false
-    }
-}
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0
deleted file mode 100644
index 2b3f8d2..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0
+++ /dev/null
@@ -1,192 +0,0 @@
-{
-	"SX1301_conf": {
-		"lorawan_public": true,
-		"antenna_gain": 0,
-		"clksrc": 0,
-		"radio_0": {
-			"enable": true,
-			"freq": 902600000,
-			"rssi_offset": -165,
-			"tx_enable": true,
-			"tx_freq_max": 902000000,
-			"tx_freq_min": 928000000,
-			"type": "SX1257"
-		},
-		"radio_1": {
-			"enable": true,
-			"freq": 903400000,
-			"rssi_offset": -165,
-			"tx_enable": false,
-			"type": "SX1257"
-		},
-		"chan_FSK": {
-			"enable": false,
-			"radio": 0
-		},
-		"chan_Lora_std": {
-			"bandwidth": 500000,
-			"enable": true,
-			"if": 400000,
-			"radio": 0,
-			"spread_factor": 8
-		},
-		"chan_multiSF_0": {
-			"enable": true,
-			"if": -300000,
-			"radio": 0
-		},
-		"chan_multiSF_1": {
-			"enable": true,
-			"if": -100000,
-			"radio": 0
-		},
-		"chan_multiSF_2": {
-			"enable": true,
-			"if": 100000,
-			"radio": 0
-		},
-		"chan_multiSF_3": {
-			"enable": true,
-			"if": 300000,
-			"radio": 0
-		},
-		"chan_multiSF_4": {
-			"enable": true,
-			"if": -300000,
-			"radio": 1
-		},
-		"chan_multiSF_5": {
-			"enable": true,
-			"if": -100000,
-			"radio": 1
-		},
-		"chan_multiSF_6": {
-			"enable": true,
-			"if": 100000,
-			"radio": 1
-		},
-		"chan_multiSF_7": {
-			"enable": true,
-			"if": 300000,
-			"radio": 1
-		},
-		"lbt_cfg": {
-			"enable": false,
-			"nb_channel": 1,
-			"rssi_target": 160,
-			"scan_time_us": 5000,
-			"start_freq": 869525000,
-			"tx_delay_1ch_us": 4000000,
-			"tx_delay_2ch_us": 4000000
-		},
-		"tx_lut_0": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 0,
-			"rf_power": -6
-		},
-		"tx_lut_1": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 0,
-			"rf_power": -3
-		},
-		"tx_lut_2": {
-			"dig_gain": 0,
-			"mix_gain": 9,
-			"pa_gain": 1,
-			"rf_power": 0
-		},
-		"tx_lut_3": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 1,
-			"rf_power": 3
-		},
-		"tx_lut_4": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 1,
-			"rf_power": 6
-		},
-		"tx_lut_5": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 2,
-			"rf_power": 10
-		},
-		"tx_lut_6": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 11
-		},
-		"tx_lut_7": {
-			"dig_gain": 0,
-			"mix_gain": 11,
-			"pa_gain": 2,
-			"rf_power": 12
-		},
-		"tx_lut_8": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 2,
-			"rf_power": 13
-		},
-		"tx_lut_9": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 2,
-			"rf_power": 14
-		},
-		"tx_lut_10": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 2,
-			"rf_power": 16
-		},
-		"tx_lut_11": {
-			"dig_gain": 0,
-			"mix_gain": 10,
-			"pa_gain": 3,
-			"rf_power": 20
-		},
-		"tx_lut_12": {
-			"dig_gain": 0,
-			"mix_gain": 12,
-			"pa_gain": 3,
-			"rf_power": 23
-		},
-		"tx_lut_13": {
-			"dig_gain": 0,
-			"mix_gain": 13,
-			"pa_gain": 3,
-			"rf_power": 25
-		},
-		"tx_lut_14": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 26
-		},
-		"tx_lut_15": {
-			"dig_gain": 0,
-			"mix_gain": 15,
-			"pa_gain": 3,
-			"rf_power": 27
-		}
-	},
-	"gateway_conf": {
-		"forward_crc_disabled": false,
-		"forward_crc_error": false,
-		"forward_crc_valid": true,
-		"gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>",
-		"keepalive_interval": 12,
-		"push_timeout_ms": 120,
-		"serv_port_down": 1780,
-		"serv_port_up": 1780,
-		"server_address": "us01-iot.semtech.com",
-		"stat_interval": 20,
-		"synch_word": 52
-	}
-}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.EU868.basic.clksrc0
new file mode 100644
index 0000000..5e8bec0
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.EU868.basic.clksrc0
@@ -0,0 +1,225 @@
+{
+    "SX1301_conf": {
+        "lorawan_public": true,
+        "clksrc": 0, /* radio_1 provides clock to concentrator */
+        "lbt_cfg": {
+            "enable": false,
+            "rssi_target": 160, /* rssi in dBm = -lbt_rssi_target/2 */
+            "nb_channel": 1,
+            "start_freq": 869525000,
+            "scan_time_us": 5000,
+            "tx_delay_1ch_us": 4000000,
+            "tx_delay_2ch_us": 4000000
+        },
+        "antenna_gain": 0, /* antenna gain, in dBi */
+        "radio_0": {
+            "enable": true,
+            "type": "SX1257",
+            "freq": 867500000,
+            "rssi_offset": -165.0,
+            "tx_enable": true,
+            "tx_freq_min": 863000000,
+            "tx_freq_max": 870000000
+        },
+        "radio_1": {
+            "enable": true,
+            "type": "SX1257",
+            "freq": 868500000,
+            "rssi_offset": -165.0,
+            "tx_enable": false
+        },
+        "chan_multiSF_0": {
+            /* Lora MAC channel, 125kHz, all SF, 868.1 MHz */
+            "enable": true,
+            "radio": 1,
+            "if": -400000
+        },
+        "chan_multiSF_1": {
+            /* Lora MAC channel, 125kHz, all SF, 868.3 MHz */
+            "enable": true,
+            "radio": 1,
+            "if": -200000
+        },
+        "chan_multiSF_2": {
+            /* Lora MAC channel, 125kHz, all SF, 868.5 MHz */
+            "enable": true,
+            "radio": 1,
+            "if": 0
+        },
+        "chan_multiSF_3": {
+            /* Lora MAC channel, 125kHz, all SF, 867.1 MHz */
+            "enable": true,
+            "radio": 0,
+            "if": -400000
+        },
+        "chan_multiSF_4": {
+            /* Lora MAC channel, 125kHz, all SF, 867.3 MHz */
+            "enable": true,
+            "radio": 0,
+            "if": -200000
+        },
+        "chan_multiSF_5": {
+            /* Lora MAC channel, 125kHz, all SF, 867.5 MHz */
+            "enable": true,
+            "radio": 0,
+            "if": 0
+        },
+        "chan_multiSF_6": {
+            /* Lora MAC channel, 125kHz, all SF, 867.7 MHz */
+            "enable": true,
+            "radio": 0,
+            "if": 200000
+        },
+        "chan_multiSF_7": {
+            /* Lora MAC channel, 125kHz, all SF, 867.9 MHz */
+            "enable": true,
+            "radio": 0,
+            "if": 400000
+        },
+        "chan_Lora_std": {
+            /* Lora MAC channel, 250kHz, SF7, 868.3 MHz */
+            "enable": true,
+            "radio": 1,
+            "if": -200000,
+            "bandwidth": 250000,
+            "spread_factor": 7
+        },
+        "chan_FSK": {
+            /* FSK 50kbps channel, 868.8 MHz */
+            "enable": true,
+            "radio": 1,
+            "if": 300000,
+            "bandwidth": 125000,
+            "datarate": 50000
+        },
+        "tx_lut_0": {
+            /* TX gain table, index 0 */
+            "pa_gain": 0,
+            "mix_gain": 8,
+            "rf_power": -6,
+            "dig_gain": 3
+        },
+        "tx_lut_1": {
+            /* TX gain table, index 1 */
+            "pa_gain": 0,
+            "mix_gain": 10,
+            "rf_power": -3,
+            "dig_gain": 3
+        },
+        "tx_lut_2": {
+            /* TX gain table, index 2 */
+            "pa_gain": 0,
+            "mix_gain": 12,
+            "rf_power": 0,
+            "dig_gain": 3
+        },
+        "tx_lut_3": {
+            /* TX gain table, index 3 */
+            "pa_gain": 1,
+            "mix_gain": 8,
+            "rf_power": 3,
+            "dig_gain": 3
+        },
+        "tx_lut_4": {
+            /* TX gain table, index 4 */
+            "pa_gain": 1,
+            "mix_gain": 10,
+            "rf_power": 6,
+            "dig_gain": 3
+        },
+        "tx_lut_5": {
+            /* TX gain table, index 5 */
+            "pa_gain": 1,
+            "mix_gain": 12,
+            "rf_power": 10,
+            "dig_gain": 3
+        },
+        "tx_lut_6": {
+            /* TX gain table, index 6 */
+            "pa_gain": 1,
+            "mix_gain": 12,
+            "rf_power": 11,
+            "dig_gain": 3
+        },
+        "tx_lut_7": {
+            /* TX gain table, index 7 */
+            "pa_gain": 2,
+            "mix_gain": 9,
+            "rf_power": 12,
+            "dig_gain": 3
+        },
+        "tx_lut_8": {
+            /* TX gain table, index 8 */
+            "pa_gain": 1,
+            "mix_gain": 15,
+            "rf_power": 13,
+            "dig_gain": 3
+        },
+        "tx_lut_9": {
+            /* TX gain table, index 9 */
+            "pa_gain": 2,
+            "mix_gain": 10,
+            "rf_power": 14,
+            "dig_gain": 3
+        },
+        "tx_lut_10": {
+            /* TX gain table, index 10 */
+            "pa_gain": 2,
+            "mix_gain": 11,
+            "rf_power": 16,
+            "dig_gain": 3
+        },
+        "tx_lut_11": {
+            /* TX gain table, index 11 */
+            "pa_gain": 3,
+            "mix_gain": 10,
+            "rf_power": 20,
+            "dig_gain": 3
+        },
+        "tx_lut_12": {
+            /* TX gain table, index 12 */
+            "pa_gain": 3,
+            "mix_gain": 11,
+            "rf_power": 23,
+            "dig_gain": 3
+        },
+        "tx_lut_13": {
+            /* TX gain table, index 13 */
+            "pa_gain": 3,
+            "mix_gain": 12,
+            "rf_power": 24,
+            "dig_gain": 3
+        },
+        "tx_lut_14": {
+            /* TX gain table, index 14 */
+            "pa_gain": 3,
+            "mix_gain": 13,
+            "rf_power": 25,
+            "dig_gain": 3
+        },
+        "tx_lut_15": {
+            /* TX gain table, index 15 */
+            "pa_gain": 3,
+            "mix_gain": 15,
+            "rf_power": 26,
+            "dig_gain": 3
+        }
+    },
+
+    "gateway_conf": {
+        "gateway_ID": "AA555A0000000000",
+        /* change with default server address/ports, or overwrite in local_conf.json */
+        "server_address": "localhost",
+        "serv_port_up": 1680,
+        "serv_port_down": 1680,
+        /* adjust the following parameters for your network */
+        "keepalive_interval": 10,
+        "stat_interval": 30,
+        "push_timeout_ms": 100,
+        /* forward only valid packets */
+        "forward_crc_valid": true,
+        "forward_crc_error": false,
+        "forward_crc_disabled": false
+    }
+}
+
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.US915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.US915.basic.clksrc0
new file mode 100644
index 0000000..e70b8ba
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_0.US915.basic.clksrc0
@@ -0,0 +1,192 @@
+{
+	"SX1301_conf": {
+		"lorawan_public": true,
+		"antenna_gain": 0,
+		"clksrc": 0,
+		"radio_0": {
+			"enable": true,
+			"freq": 902700000,
+			"rssi_offset": -165,
+			"tx_enable": true,
+			"tx_freq_max": 928000000,
+			"tx_freq_min": 902000000,
+			"type": "SX1257"
+		},
+		"radio_1": {
+			"enable": true,
+			"freq": 903500000,
+			"rssi_offset": -165,
+			"tx_enable": false,
+			"type": "SX1257"
+		},
+		"chan_FSK": {
+			"enable": false,
+			"radio": 0
+		},
+		"chan_Lora_std": {
+			"bandwidth": 500000,
+			"enable": true,
+			"if": 300000,
+			"radio": 0,
+			"spread_factor": 8
+		},
+		"chan_multiSF_0": {
+			"enable": true,
+			"if": -400000,
+			"radio": 0
+		},
+		"chan_multiSF_1": {
+			"enable": true,
+			"if": -200000,
+			"radio": 0
+		},
+		"chan_multiSF_2": {
+			"enable": true,
+			"if": 0,
+			"radio": 0
+		},
+		"chan_multiSF_3": {
+			"enable": true,
+			"if": 200000,
+			"radio": 0
+		},
+		"chan_multiSF_4": {
+			"enable": true,
+			"if": -400000,
+			"radio": 1
+		},
+		"chan_multiSF_5": {
+			"enable": true,
+			"if": -200000,
+			"radio": 1
+		},
+		"chan_multiSF_6": {
+			"enable": true,
+			"if": 0,
+			"radio": 1
+		},
+		"chan_multiSF_7": {
+			"enable": true,
+			"if": 200000,
+			"radio": 1
+		},
+		"lbt_cfg": {
+			"enable": false,
+			"nb_channel": 1,
+			"rssi_target": 160,
+			"scan_time_us": 5000,
+			"start_freq": 869525000,
+			"tx_delay_1ch_us": 4000000,
+			"tx_delay_2ch_us": 4000000
+		},
+		"tx_lut_0": {
+			"pa_gain": 0,
+			"mix_gain": 8,
+			"rf_power": -6,
+			"dig_gain": 3
+		},
+		"tx_lut_1": {
+			"pa_gain": 0,
+			"mix_gain": 10,
+			"rf_power": -3,
+			"dig_gain": 3
+		},
+		"tx_lut_2": {
+			"pa_gain": 0,
+			"mix_gain": 12,
+			"rf_power": 0,
+			"dig_gain": 3
+		},
+		"tx_lut_3": {
+			"pa_gain": 1,
+			"mix_gain": 8,
+			"rf_power": 3,
+			"dig_gain": 3
+		},
+		"tx_lut_4": {
+			"pa_gain": 1,
+			"mix_gain": 10,
+			"rf_power": 6,
+			"dig_gain": 3
+		},
+		"tx_lut_5": {
+			"pa_gain": 1,
+			"mix_gain": 12,
+			"rf_power": 10,
+			"dig_gain": 3
+		},
+		"tx_lut_6": {
+			"pa_gain": 1,
+			"mix_gain": 12,
+			"rf_power": 11,
+			"dig_gain": 3
+		},
+		"tx_lut_7": {
+			"pa_gain": 2,
+			"mix_gain": 9,
+			"rf_power": 12,
+			"dig_gain": 3
+		},
+		"tx_lut_8": {
+			"pa_gain": 1,
+			"mix_gain": 15,
+			"rf_power": 13,
+			"dig_gain": 3
+		},
+		"tx_lut_9": {
+			"pa_gain": 2,
+			"mix_gain": 10,
+			"rf_power": 14,
+			"dig_gain": 3
+		},
+		"tx_lut_10": {
+			"pa_gain": 2,
+			"mix_gain": 11,
+			"rf_power": 16,
+			"dig_gain": 3
+		},
+		"tx_lut_11": {
+			"pa_gain": 3,
+			"mix_gain": 10,
+			"rf_power": 20,
+			"dig_gain": 3
+		},
+		"tx_lut_12": {
+			"pa_gain": 3,
+			"mix_gain": 11,
+			"rf_power": 23,
+			"dig_gain": 3
+		},
+		"tx_lut_13": {
+			"pa_gain": 3,
+			"mix_gain": 12,
+			"rf_power": 24,
+			"dig_gain": 3
+		},
+		"tx_lut_14": {
+			"pa_gain": 3,
+			"mix_gain": 13,
+			"rf_power": 25,
+			"dig_gain": 3
+		},
+		"tx_lut_15": {
+			"pa_gain": 3,
+			"mix_gain": 15,
+			"rf_power": 26,
+			"dig_gain": 3
+		}
+	},
+	"gateway_conf": {
+		"forward_crc_disabled": false,
+		"forward_crc_error": false,
+		"forward_crc_valid": true,
+		"gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>",
+		"keepalive_interval": 12,
+		"push_timeout_ms": 120,
+		"serv_port_down": 1780,
+		"serv_port_up": 1780,
+		"server_address": "us01-iot.semtech.com",
+		"stat_interval": 20,
+		"synch_word": 52
+	}
+}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.EU868.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.EU868.basic.clksrc0
new file mode 100644
index 0000000..4c388a4
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.EU868.basic.clksrc0
@@ -0,0 +1,225 @@
+{
+    "SX1301_conf": {
+        "lorawan_public": true,
+        "clksrc": 0, /* radio_1 provides clock to concentrator */
+        "lbt_cfg": {
+            "enable": false,
+            "rssi_target": 160, /* rssi in dBm = -lbt_rssi_target/2 */
+            "nb_channel": 1,
+            "start_freq": 869525000,
+            "scan_time_us": 5000,
+            "tx_delay_1ch_us": 4000000,
+            "tx_delay_2ch_us": 4000000
+        },
+        "antenna_gain": 0, /* antenna gain, in dBi */
+        "radio_0": {
+            "enable": true,
+            "type": "SX1257",
+            "freq": 867500000,
+            "rssi_offset": -165.0,
+            "tx_enable": true,
+            "tx_freq_min": 863000000,
+            "tx_freq_max": 870000000
+        },
+        "radio_1": {
+            "enable": true,
+            "type": "SX1257",
+            "freq": 868500000,
+            "rssi_offset": -165.0,
+            "tx_enable": false
+        },
+        "chan_multiSF_0": {
+            /* Lora MAC channel, 125kHz, all SF, 868.1 MHz */
+            "enable": true,
+            "radio": 1,
+            "if": -400000
+        },
+        "chan_multiSF_1": {
+            /* Lora MAC channel, 125kHz, all SF, 868.3 MHz */
+            "enable": true,
+            "radio": 1,
+            "if": -200000
+        },
+        "chan_multiSF_2": {
+            /* Lora MAC channel, 125kHz, all SF, 868.5 MHz */
+            "enable": true,
+            "radio": 1,
+            "if": 0
+        },
+        "chan_multiSF_3": {
+            /* Lora MAC channel, 125kHz, all SF, 867.1 MHz */
+            "enable": true,
+            "radio": 0,
+            "if": -400000
+        },
+        "chan_multiSF_4": {
+            /* Lora MAC channel, 125kHz, all SF, 867.3 MHz */
+            "enable": true,
+            "radio": 0,
+            "if": -200000
+        },
+        "chan_multiSF_5": {
+            /* Lora MAC channel, 125kHz, all SF, 867.5 MHz */
+            "enable": true,
+            "radio": 0,
+            "if": 0
+        },
+        "chan_multiSF_6": {
+            /* Lora MAC channel, 125kHz, all SF, 867.7 MHz */
+            "enable": true,
+            "radio": 0,
+            "if": 200000
+        },
+        "chan_multiSF_7": {
+            /* Lora MAC channel, 125kHz, all SF, 867.9 MHz */
+            "enable": true,
+            "radio": 0,
+            "if": 400000
+        },
+        "chan_Lora_std": {
+            /* Lora MAC channel, 250kHz, SF7, 868.3 MHz */
+            "enable": true,
+            "radio": 1,
+            "if": -200000,
+            "bandwidth": 250000,
+            "spread_factor": 7
+        },
+        "chan_FSK": {
+            /* FSK 50kbps channel, 868.8 MHz */
+            "enable": true,
+            "radio": 1,
+            "if": 300000,
+            "bandwidth": 125000,
+            "datarate": 50000
+        },
+        "tx_lut_0": {
+            /* TX gain table, index 0 */
+            "pa_gain": 0,
+            "mix_gain": 11,
+            "rf_power": -6,
+            "dig_gain": 0
+        },
+        "tx_lut_1": {
+            /* TX gain table, index 1 */
+            "pa_gain": 0,
+            "mix_gain": 13,
+            "rf_power": -3,
+            "dig_gain": 0
+        },
+        "tx_lut_2": {
+            /* TX gain table, index 2 */
+            "pa_gain": 1,
+            "mix_gain": 9,
+            "rf_power": 0,
+            "dig_gain": 0
+        },
+        "tx_lut_3": {
+            /* TX gain table, index 3 */
+            "pa_gain": 1,
+            "mix_gain": 10,
+            "rf_power": 3,
+            "dig_gain": 0
+        },
+        "tx_lut_4": {
+            /* TX gain table, index 4 */
+            "pa_gain": 1,
+            "mix_gain": 12,
+            "rf_power": 6,
+            "dig_gain": 0
+        },
+        "tx_lut_5": {
+            /* TX gain table, index 5 */
+            "pa_gain": 2,
+            "mix_gain": 10,
+            "rf_power": 10,
+            "dig_gain": 0
+        },
+        "tx_lut_6": {
+            /* TX gain table, index 6 */
+            "pa_gain": 2,
+            "mix_gain": 11,
+            "rf_power": 11,
+            "dig_gain": 0
+        },
+        "tx_lut_7": {
+            /* TX gain table, index 7 */
+            "pa_gain": 2,
+            "mix_gain": 11,
+            "rf_power": 12,
+            "dig_gain": 0
+        },
+        "tx_lut_8": {
+            /* TX gain table, index 8 */
+            "pa_gain": 2,
+            "mix_gain": 12,
+            "rf_power": 13,
+            "dig_gain": 0
+        },
+        "tx_lut_9": {
+            /* TX gain table, index 9 */
+            "pa_gain": 2,
+            "mix_gain": 13,
+            "rf_power": 14,
+            "dig_gain": 0
+        },
+        "tx_lut_10": {
+            /* TX gain table, index 10 */
+            "pa_gain": 2,
+            "mix_gain": 15,
+            "rf_power": 16,
+            "dig_gain": 0
+        },
+        "tx_lut_11": {
+            /* TX gain table, index 11 */
+            "pa_gain": 3,
+            "mix_gain": 10,
+            "rf_power": 20,
+            "dig_gain": 0
+        },
+        "tx_lut_12": {
+            /* TX gain table, index 12 */
+            "pa_gain": 3,
+            "mix_gain": 12,
+            "rf_power": 23,
+            "dig_gain": 0
+        },
+        "tx_lut_13": {
+            /* TX gain table, index 13 */
+            "pa_gain": 3,
+            "mix_gain": 13,
+            "rf_power": 25,
+            "dig_gain": 0
+        },
+        "tx_lut_14": {
+            /* TX gain table, index 14 */
+            "pa_gain": 3,
+            "mix_gain": 15,
+            "rf_power": 26,
+            "dig_gain": 0
+        },
+        "tx_lut_15": {
+            /* TX gain table, index 15 */
+            "pa_gain": 3,
+            "mix_gain": 15,
+            "rf_power": 27,
+            "dig_gain": 0
+        }
+    },
+
+    "gateway_conf": {
+        "gateway_ID": "AA555A0000000000",
+        /* change with default server address/ports, or overwrite in local_conf.json */
+        "server_address": "localhost",
+        "serv_port_up": 1680,
+        "serv_port_down": 1680,
+        /* adjust the following parameters for your network */
+        "keepalive_interval": 10,
+        "stat_interval": 30,
+        "push_timeout_ms": 100,
+        /* forward only valid packets */
+        "forward_crc_valid": true,
+        "forward_crc_error": false,
+        "forward_crc_disabled": false
+    }
+}
+
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.US915.basic.clksrc0 b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.US915.basic.clksrc0
new file mode 100644
index 0000000..68033d8
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTAC_LORA_1_5.US915.basic.clksrc0
@@ -0,0 +1,192 @@
+{
+	"SX1301_conf": {
+		"lorawan_public": true,
+		"antenna_gain": 0,
+		"clksrc": 0,
+		"radio_0": {
+			"enable": true,
+			"freq": 902700000,
+			"rssi_offset": -165,
+			"tx_enable": true,
+			"tx_freq_max": 928000000,
+			"tx_freq_min": 902000000,
+			"type": "SX1257"
+		},
+		"radio_1": {
+			"enable": true,
+			"freq": 903500000,
+			"rssi_offset": -165,
+			"tx_enable": false,
+			"type": "SX1257"
+		},
+		"chan_FSK": {
+			"enable": false,
+			"radio": 0
+		},
+		"chan_Lora_std": {
+			"bandwidth": 500000,
+			"enable": true,
+			"if": 300000,
+			"radio": 0,
+			"spread_factor": 8
+		},
+		"chan_multiSF_0": {
+			"enable": true,
+			"if": -400000,
+			"radio": 0
+		},
+		"chan_multiSF_1": {
+			"enable": true,
+			"if": -200000,
+			"radio": 0
+		},
+		"chan_multiSF_2": {
+			"enable": true,
+			"if": 0,
+			"radio": 0
+		},
+		"chan_multiSF_3": {
+			"enable": true,
+			"if": 200000,
+			"radio": 0
+		},
+		"chan_multiSF_4": {
+			"enable": true,
+			"if": -400000,
+			"radio": 1
+		},
+		"chan_multiSF_5": {
+			"enable": true,
+			"if": -200000,
+			"radio": 1
+		},
+		"chan_multiSF_6": {
+			"enable": true,
+			"if": 0,
+			"radio": 1
+		},
+		"chan_multiSF_7": {
+			"enable": true,
+			"if": 200000,
+			"radio": 1
+		},
+		"lbt_cfg": {
+			"enable": false,
+			"nb_channel": 1,
+			"rssi_target": 160,
+			"scan_time_us": 5000,
+			"start_freq": 869525000,
+			"tx_delay_1ch_us": 4000000,
+			"tx_delay_2ch_us": 4000000
+		},
+		"tx_lut_0": {
+			"dig_gain": 0,
+			"mix_gain": 11,
+			"pa_gain": 0,
+			"rf_power": -6
+		},
+		"tx_lut_1": {
+			"dig_gain": 0,
+			"mix_gain": 13,
+			"pa_gain": 0,
+			"rf_power": -3
+		},
+		"tx_lut_2": {
+			"dig_gain": 0,
+			"mix_gain": 9,
+			"pa_gain": 1,
+			"rf_power": 0
+		},
+		"tx_lut_3": {
+			"dig_gain": 0,
+			"mix_gain": 10,
+			"pa_gain": 1,
+			"rf_power": 3
+		},
+		"tx_lut_4": {
+			"dig_gain": 0,
+			"mix_gain": 12,
+			"pa_gain": 1,
+			"rf_power": 6
+		},
+		"tx_lut_5": {
+			"dig_gain": 0,
+			"mix_gain": 10,
+			"pa_gain": 2,
+			"rf_power": 10
+		},
+		"tx_lut_6": {
+			"dig_gain": 0,
+			"mix_gain": 11,
+			"pa_gain": 2,
+			"rf_power": 11
+		},
+		"tx_lut_7": {
+			"dig_gain": 0,
+			"mix_gain": 11,
+			"pa_gain": 2,
+			"rf_power": 12
+		},
+		"tx_lut_8": {
+			"dig_gain": 0,
+			"mix_gain": 12,
+			"pa_gain": 2,
+			"rf_power": 13
+		},
+		"tx_lut_9": {
+			"dig_gain": 0,
+			"mix_gain": 13,
+			"pa_gain": 2,
+			"rf_power": 14
+		},
+		"tx_lut_10": {
+			"dig_gain": 0,
+			"mix_gain": 15,
+			"pa_gain": 2,
+			"rf_power": 16
+		},
+		"tx_lut_11": {
+			"dig_gain": 0,
+			"mix_gain": 10,
+			"pa_gain": 3,
+			"rf_power": 20
+		},
+		"tx_lut_12": {
+			"dig_gain": 0,
+			"mix_gain": 12,
+			"pa_gain": 3,
+			"rf_power": 23
+		},
+		"tx_lut_13": {
+			"dig_gain": 0,
+			"mix_gain": 13,
+			"pa_gain": 3,
+			"rf_power": 25
+		},
+		"tx_lut_14": {
+			"dig_gain": 0,
+			"mix_gain": 15,
+			"pa_gain": 3,
+			"rf_power": 26
+		},
+		"tx_lut_15": {
+			"dig_gain": 0,
+			"mix_gain": 15,
+			"pa_gain": 3,
+			"rf_power": 27
+		}
+	},
+	"gateway_conf": {
+		"forward_crc_disabled": false,
+		"forward_crc_error": false,
+		"forward_crc_valid": true,
+		"gateway_ID": "<WILL-BE-REPLACED-WITH-LORA-EUI>",
+		"keepalive_interval": 12,
+		"push_timeout_ms": 120,
+		"serv_port_down": 1780,
+		"serv_port_up": 1780,
+		"server_address": "us01-iot.semtech.com",
+		"stat_interval": 20,
+		"synch_word": 52
+	}
+}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init
index 396b291..fa4e1b4 100755
--- a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init
+++ b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init
@@ -9,6 +9,7 @@ ENABLED="yes"
 
 run_dir=/var/run/lora
 conf_dir=/var/config/lora
+conf_file=$conf_dir/global_conf.json
 
 pkt_fwd=$run_dir/1/lora_pkt_fwd
 pkt_fwd_log=/var/log/lora-pkt-fwd-1.log
@@ -33,38 +34,25 @@ read_card_info() {
     lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null)
 }
 
-card_found() {                                                           
-    if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then  
-        ln -sf /dev/spidev32766.2 /dev/spidev0.0                         
+card_found() {
+    if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then
+        ln -sf /dev/spidev32766.2 /dev/spidev0.0
     elif [ -d $port2 ] && [[ $(cat $port2/hw-version) = $lora_hw ]]; then
         ln -sf /dev/spidev32765.2 /dev/spidev0.0
-    fi                                                      
-                                                                                
-    if [[ "$lora_id" =~ "$lora_mtac_id" ]]; then                                
-        GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_0                    
+    fi
+
+    if [[ "$lora_id" =~ "$lora_mtac_id" ]]; then
         if [ "$lora_hw" = "$lora_1_0_hw" ] && [[ ! "$lora_id" =~ .*-SPI ]]; then
-            ln -sf /opt/lora/basic_pkt_fwd-usb $pkt_fwd             
-        else                                                        
-            if [ "$lora_hw" = "$lora_1_5_h_hw" ]; then              
-                GLOBAL_CONF=/opt/lora/global_conf.json.MTAC_LORA_1_5
-            fi                                    
+            ln -sf /opt/lora/basic_pkt_fwd-usb $pkt_fwd
+        else
             ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd
-        fi                             
-                                                                
-        # ignore error of diff command                          
-        set +e                                                  
-        diff $GLOBAL_CONF /opt/lora/global_conf.json 1>/dev/null
-        if [ $? -ne 0 ]; then                         
-            cp $GLOBAL_CONF /opt/lora/global_conf.json
-        fi                            
-        set -e                        
-                                   
+        fi
+
         return 0                   
-    else                           
-        echo MTAC_LORA not detected                          
-        return 1                                       
-    fi                 
-} 
+    else
+        return 1
+    fi
+}
 
 
 do_start() {
diff --git a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
index ceda0b5..51996f5 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
+++ b/recipes-connectivity/lora/lora-packet-forwarder_3.1.0.bb
@@ -16,10 +16,10 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
            file://lora-packet-forwarder.init \
            file://lora-packet-forwarder.default \
            file://global_conf.json.3.0.0.PCB_E336.EU868.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 \
-           file://global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 \
+           file://global_conf.json.3.1.0.MTAC_LORA_1_0.EU868.basic.clksrc0 \
+           file://global_conf.json.3.1.0.MTAC_LORA_1_0.US915.basic.clksrc0 \
+           file://global_conf.json.3.1.0.MTAC_LORA_1_5.EU868.basic.clksrc0 \
+           file://global_conf.json.3.1.0.MTAC_LORA_1_5.US915.basic.clksrc0 \
            file://global_conf.json.3.1.0.MTCAP-LORA-1-5.EU868.basic \
            file://global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic \
            file://local_conf.json \
@@ -60,13 +60,13 @@ do_install() {
 }
 
 do_install_append_mtcdt() {
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0.EU868
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.EU868
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_0.US915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0.US915
-  install -m 755 ${WORKDIR}/global_conf.json.3.0.0.MTAC_LORA_1_5.US915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.US915
+  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json
+  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0
+  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5
+  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTAC_LORA_1_0.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0.EU868
+  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTAC_LORA_1_5.EU868.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.EU868
+  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTAC_LORA_1_0.US915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_0.US915
+  install -m 755 ${WORKDIR}/global_conf.json.3.1.0.MTAC_LORA_1_5.US915.basic.clksrc0 ${D}${LORA_DIR}/global_conf.json.MTAC_LORA_1_5.US915
 }
 
 do_install_append_mtcap() {
-- 
cgit v1.2.3


From f5ed95a4341428467a08402c66cff9c757c7a1fa Mon Sep 17 00:00:00 2001
From: Mykyta Dorokhin <mykyta.dorokhin@globallogic.com>
Date: Fri, 26 May 2017 13:46:04 -0500
Subject: merge lora-packet-forwarder mtcdt and mtcap init scripts into one

---
 ...obal_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic |  20 +--
 .../lora-packet-forwarder.init                     | 167 +++++++++++++++++++++
 .../mtcap/lora-packet-forwarder.init               | 132 ----------------
 .../mtcdt/lora-packet-forwarder.init               | 121 ---------------
 4 files changed, 169 insertions(+), 271 deletions(-)
 create mode 100755 recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init
 delete mode 100755 recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.init
 delete mode 100755 recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init

diff --git a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic
index 6d56f3b..c357414 100644
--- a/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic
+++ b/recipes-connectivity/lora/lora-packet-forwarder/global_conf.json.3.1.0.MTCAP-LORA-1-5.US915.basic
@@ -1,7 +1,7 @@
 {
 	"SX1301_conf" : 
 	{
-		"antenna_gain" : 0, /* antenna gain, in dBi */
+		"antenna_gain" : 0,
 		"chan_FSK" : 
 		{
 			"bandwidth" : 125000,
@@ -71,7 +71,7 @@
 		{
 			"enable" : false,
 			"nb_channel" : 1,
-			"rssi_target" : 160, /* rssi in dBm = -lbt_rssi_target/2 */
+			"rssi_target" : 160,
 			"scan_time_us" : 5000,
 			"start_freq" : 869525000,
 			"tx_delay_1ch_us" : 4000000,
@@ -100,7 +100,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 11,
-			/* TX gain table, index 0 */
 			"pa_gain" : 0,
 			"rf_power" : -6
 		},
@@ -108,7 +107,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 13,
-			/* TX gain table, index 1 */
 			"pa_gain" : 0,
 			"rf_power" : -3
 		},
@@ -116,7 +114,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 15,
-			/* TX gain table, index 10 */
 			"pa_gain" : 2,
 			"rf_power" : 16
 		},
@@ -124,7 +121,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 10,
-			/* TX gain table, index 11 */
 			"pa_gain" : 3,
 			"rf_power" : 20
 		},
@@ -132,7 +128,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 12,
-			/* TX gain table, index 12 */
 			"pa_gain" : 3,
 			"rf_power" : 23
 		},
@@ -140,7 +135,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 13,
-			/* TX gain table, index 13 */
 			"pa_gain" : 3,
 			"rf_power" : 25
 		},
@@ -148,7 +142,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 15,
-			/* TX gain table, index 14 */
 			"pa_gain" : 3,
 			"rf_power" : 26
 		},
@@ -156,7 +149,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 15,
-			/* TX gain table, index 15 */
 			"pa_gain" : 3,
 			"rf_power" : 27
 		},
@@ -164,7 +156,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 9,
-			/* TX gain table, index 2 */
 			"pa_gain" : 1,
 			"rf_power" : 0
 		},
@@ -172,7 +163,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 10,
-			/* TX gain table, index 3 */
 			"pa_gain" : 1,
 			"rf_power" : 3
 		},
@@ -180,7 +170,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 12,
-			/* TX gain table, index 4 */
 			"pa_gain" : 1,
 			"rf_power" : 6
 		},
@@ -188,7 +177,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 10,
-			/* TX gain table, index 5 */
 			"pa_gain" : 2,
 			"rf_power" : 10
 		},
@@ -196,7 +184,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 11,
-			/* TX gain table, index 6 */
 			"pa_gain" : 2,
 			"rf_power" : 11
 		},
@@ -204,7 +191,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 11,
-			/* TX gain table, index 7 */
 			"pa_gain" : 2,
 			"rf_power" : 12
 		},
@@ -212,7 +198,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 12,
-			/* TX gain table, index 8 */
 			"pa_gain" : 2,
 			"rf_power" : 13
 		},
@@ -220,7 +205,6 @@
 		{
 			"dig_gain" : 0,
 			"mix_gain" : 13,
-			/* TX gain table, index 9 */
 			"pa_gain" : 2,
 			"rf_power" : 14
 		}
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init
new file mode 100755
index 0000000..ec81b9d
--- /dev/null
+++ b/recipes-connectivity/lora/lora-packet-forwarder/lora-packet-forwarder.init
@@ -0,0 +1,167 @@
+#!/bin/bash
+
+
+NAME="lora-packet-forwarder"
+ENABLED="yes"
+
+
+[ -f /etc/default/$NAME ] && source /etc/default/$NAME
+
+run_dir=/var/run/lora
+opt_conf_dir=/opt/lora
+conf_dir=/var/config/lora
+conf_file=$conf_dir/global_conf.json
+conf_file_local=$conf_dir/local_conf.json
+
+pkt_fwd=$run_dir/1/lora_pkt_fwd
+pkt_fwd_log=/var/log/lora-pkt-fwd-1.log
+pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid
+
+port1=/sys/devices/platform/mts-io/ap1
+port2=/sys/devices/platform/mts-io/ap2
+
+lora_mtac_id="MTAC-LORA"
+lora_1_0_hw="MTAC-LORA-1.0"
+lora_1_5_h_hw="MTAC-LORA-1.5"
+
+lora_mtcap_id="MTCAP-LORA"
+lora_mtcap_id868="MTCAP-LORA-868"
+lora_mtcap_id915="MTCAP-LORA-915"
+
+read_lora_hw_info() {
+    # product-id of first lora card
+    lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null)
+    lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null)
+    # remove all colons
+    lora_eui_raw=${lora_eui//:/}
+    lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null)
+}
+
+hardware_found() {
+    if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then
+        ln -sf /dev/spidev32766.2 /dev/spidev0.0
+    elif [ -d $port2 ] && [[ $(cat $port2/hw-version) = $lora_hw ]]; then
+        ln -sf /dev/spidev32765.2 /dev/spidev0.0
+    fi
+
+    if [[ "$lora_id" =~ "$lora_mtac_id" ]]; then
+        #
+        # MTCDT
+        #
+        if [ "$lora_hw" = "$lora_1_0_hw" ] && [[ ! "$lora_id" =~ .*-SPI ]]; then
+            ln -sf /opt/lora/basic_pkt_fwd-usb $pkt_fwd
+        else
+            ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd
+        fi
+
+        return 0
+    elif [[ "$lora_id" =~ "$lora_mtcap_id" ]]; then
+        #
+        # MTCAP
+        #
+        # Generate default forwarder configuration based on detected LORA hardware
+        #
+        if [ "$lora_id" = "$lora_mtcap_id868" ]; then
+            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.EU868
+        elif [ "$lora_id" = "$lora_mtcap_id915" ]; then
+            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.US915
+        else
+            return 1
+        fi
+
+        opt_conf_file=$opt_conf_dir/global_conf.json
+        opt_conf_file_local=$opt_conf_dir/local_conf.json
+
+        cp $GLOBAL_CONF $opt_conf_file
+        sed -i "s/\"gateway_ID\": \".*\"/\"gateway_ID\": \"$lora_eui_raw\"/" $opt_conf_file
+
+        if ! [ -f $conf_file ]; then
+            mkdir -p /var/config/lora/
+            cp $opt_conf_file $conf_file
+            cp $opt_conf_file_local $conf_file_local
+        fi
+
+        ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd
+
+        return 0
+    fi
+
+    return 1
+}
+
+
+do_start() {
+
+    mkdir -p $run_dir/1
+    rm -rf $run_dir/1/*
+
+    read_lora_hw_info
+
+    if hardware_found; then
+        echo "Found $lora_id with $lora_hw hardware"
+    else
+        echo "$0: LORA card not detected"
+        exit 1
+    fi
+
+    if ! [ -f $conf_file ]; then
+        echo "$0: $conf_file missing"
+        exit 1
+    fi
+
+    echo -n "Starting $NAME: "
+
+    #
+    # copy conf files to the run directory
+    #
+    cp $conf_file $run_dir/1/
+    if [ -f $conf_file_local ]; then
+        cp $conf_file_local $run_dir/1/
+    fi
+
+    #
+    # start packet forwarder
+    #
+    /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \
+        --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd"
+
+    renice -n -20 -p $(pgrep $(basename $pkt_fwd))
+
+    echo "OK"
+}
+
+
+do_stop() {
+    echo -n "Stopping $NAME: "
+    start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5
+    rm -f $pkt_fwd_pidfile
+    echo "OK"
+}
+
+
+if [ "$ENABLED" != "yes" ]; then
+    echo "$NAME: disabled in /etc/default"
+    exit
+fi
+
+
+case "$1" in
+    "start")
+    do_start
+        ;;
+    "stop")
+    do_stop
+        ;;
+    "restart")
+        ## Stop the service and regardless of whether it was
+        ## running or not, start it again.
+        do_stop
+        do_start
+        ;;
+    *)
+        ## If no parameters are given, print which are avaiable.
+        echo "Usage: $0 {start|stop|restart}"
+        exit 1
+    ;;
+esac
+
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.init
deleted file mode 100755
index b17a3d8..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/mtcap/lora-packet-forwarder.init
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/bin/bash
-
-NAME="lora-packet-forwarder"
-ENABLED="yes"
-
-[ -f /etc/default/$NAME ] && source /etc/default/$NAME
-
-run_dir=/var/run/lora
-conf_file=/var/config/lora/global_conf.json
-conf_file_local=/var/config/lora/local_conf.json
-opt_conf_file=/opt/lora/global_conf.json
-opt_conf_file_local=/opt/lora/local_conf.json
-log_file=/var/log/lora-pkt-fwd.log
-
-pkt_fwd=$run_dir/1/lora_pkt_fwd
-pkt_fwd_log=/var/log/lora-pkt-fwd-1.log
-pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid
-
-lora_mtcap_id="MTCAP-LORA"
-lora_mtcap_id868="MTCAP-LORA-868"
-lora_mtcap_id915="MTCAP-LORA-915"
-
-read_lora_hw_info() {
-    # product-id of first lora card
-    lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null)
-    lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null)
-    # remove all colons
-    lora_eui_raw=${lora_eui//:/}
-    lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null)
-}
-
-hardware_found() {
-    if [[ "$lora_id" =~ "$lora_mtcap_id" ]]; then
-        #
-        # create /opt/lora/global_conf.json based on detected LORA card
-        #
-        if [ "$lora_id" = "$lora_mtcap_id868" ]; then
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.EU868
-        elif [ "$lora_id" = "$lora_mtcap_id915" ]; then
-            GLOBAL_CONF=/opt/lora/global_conf.json.MTCAP_LORA_1_5.US915
-        else
-            return 1
-        fi
-
-        cp $GLOBAL_CONF $opt_conf_file
-        echo "Setting gateway_id in $opt_conf_file to $lora_eui_raw"
-        sed -i "s/\"gateway_ID\": \".*\"/\"gateway_ID\": \"$lora_eui_raw\"/" $opt_conf_file
-
-        #
-        # copy global_json.conf and local_json.conf files to /var/config/ if it is not there yet
-        #
-        if ! [ -f $conf_file ]; then
-            mkdir -p /var/config/lora/
-            cp $opt_conf_file $conf_file
-            cp $opt_conf_file_local $conf_file_local
-        fi
-
-        ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd
-    else
-        return 1
-    fi
-
-}
-
-do_start() {
-    # create run directory
-    mkdir -p $run_dir/1
-    rm -rf $run_dir/1/*
-
-    read_lora_hw_info
-
-    if hardware_found; then
-        echo "Found $lora_id with $lora_hw hardware"
-    else
-        echo "$0: LORA not detected"
-        exit 1
-    fi
-
-    # copy conf files to the run directory
-    if [ -f $conf_file ]; then
-        cp $conf_file $run_dir/1/
-    fi
-
-    if [ -f $conf_file_local ]; then
-        cp $conf_file_local $run_dir/1/
-    fi
-
-    # start packet forwarder
-    echo -n "Starting $NAME: "
-    /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \
-        --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd > $log_file 2>&1"
-
-    renice -n -20 -p $(pgrep $(basename $pkt_fwd))
-
-    echo "OK"
-}
-
-
-do_stop() {
-    echo -n "Stopping $NAME: "
-    start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5
-    rm -f $pkt_fwd_pidfile
-    echo "OK"
-}
-
-
-if [ "$ENABLED" != "yes" ]; then
-    echo "$NAME: disabled in /etc/default"
-    exit
-fi
-
-
-case "$1" in
-    "start")
-    do_start
-        ;;
-    "stop")
-    do_stop
-        ;;
-    "restart")
-    ## Stop the service and regardless of whether it was
-        ## running or not, start it again.
-        do_stop
-        do_start
-        ;;
-    *)
-        ## If no parameters are given, print which are avaiable.
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-    ;;
-esac
-
diff --git a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init b/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init
deleted file mode 100755
index fa4e1b4..0000000
--- a/recipes-connectivity/lora/lora-packet-forwarder/mtcdt/lora-packet-forwarder.init
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-
-
-NAME="lora-packet-forwarder"
-ENABLED="yes"
-
-
-[ -f /etc/default/$NAME ] && source /etc/default/$NAME
-
-run_dir=/var/run/lora
-conf_dir=/var/config/lora
-conf_file=$conf_dir/global_conf.json
-
-pkt_fwd=$run_dir/1/lora_pkt_fwd
-pkt_fwd_log=/var/log/lora-pkt-fwd-1.log
-pkt_fwd_pidfile=$run_dir/lora-pkt-fwd-1.pid
-
-
-port1=/sys/devices/platform/mts-io/ap1
-port2=/sys/devices/platform/mts-io/ap2
-
-
-lora_mtac_id="MTAC-LORA"
-lora_1_0_hw="MTAC-LORA-1.0"
-lora_1_5_h_hw="MTAC-LORA-1.5"
-
-
-read_card_info() {
-    # product-id of first lora card
-    lora_id=$(mts-io-sysfs show lora/product-id 2> /dev/null)
-    lora_eui=$(mts-io-sysfs show lora/eui 2> /dev/null)
-    # remove all colons
-    lora_eui_raw=${lora_eui//:/}
-    lora_hw=$(mts-io-sysfs show lora/hw-version 2> /dev/null)
-}
-
-card_found() {
-    if [ -d $port1 ] && [[ $(cat $port1/hw-version) = $lora_hw ]]; then
-        ln -sf /dev/spidev32766.2 /dev/spidev0.0
-    elif [ -d $port2 ] && [[ $(cat $port2/hw-version) = $lora_hw ]]; then
-        ln -sf /dev/spidev32765.2 /dev/spidev0.0
-    fi
-
-    if [[ "$lora_id" =~ "$lora_mtac_id" ]]; then
-        if [ "$lora_hw" = "$lora_1_0_hw" ] && [[ ! "$lora_id" =~ .*-SPI ]]; then
-            ln -sf /opt/lora/basic_pkt_fwd-usb $pkt_fwd
-        else
-            ln -sf /opt/lora/lora_pkt_fwd $pkt_fwd
-        fi
-
-        return 0                   
-    else
-        return 1
-    fi
-}
-
-
-do_start() {
-
-    mkdir -p $run_dir/1
-    read_card_info
-
-    if ! [ -f $conf_file ]; then
-        echo "$0: $conf_file missing"
-        exit 1
-    fi
-
-
-    if card_found; then
-        echo "Found $lora_id with $lora_hw hardware"
-    else
-        echo "$0: MTAC-LORA not detected"
-        exit 1
-    fi
-    echo -n "Starting $NAME: "
-    # start packet forwarder
-    cp $conf_dir/global_conf.json $run_dir/1/global_conf.json
-    /usr/sbin/start-stop-daemon --chdir $run_dir/1 --background --start --make-pidfile \
-        --pidfile $pkt_fwd_pidfile --startas /bin/bash -- -c "exec $pkt_fwd"
-
-    renice -n -20 -p $(pgrep $(basename $pkt_fwd))
-
-
-    echo "OK"
-}
-
-
-do_stop() {
-    echo -n "Stopping $NAME: "
-    start-stop-daemon --stop --quiet --oknodo --pidfile $pkt_fwd_pidfile --retry 5
-    rm -f $pkt_fwd_pidfile
-    echo "OK"
-}
-
-
-if [ "$ENABLED" != "yes" ]; then
-    echo "$NAME: disabled in /etc/default"
-    exit
-fi
-
-
-case "$1" in
-    "start")
-    do_start
-        ;;
-    "stop")
-    do_stop
-        ;;
-    "restart")
-    ## Stop the service and regardless of whether it was
-        ## running or not, start it again.
-        do_stop
-        do_start
-        ;;
-    *)
-        ## If no parameters are given, print which are avaiable.
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-    ;;
-esac
-
-- 
cgit v1.2.3


From 590fd14948074678931bed40fe0e3c912288b658 Mon Sep 17 00:00:00 2001
From: Jason Reiss <jreiss@multitech.com>
Date: Fri, 26 May 2017 13:57:05 -0500
Subject: lora: update network server to 1.0.35

---
 .../lora/lora-network-server_1.0.34.bb             | 49 ----------------------
 .../lora/lora-network-server_1.0.35.bb             | 49 ++++++++++++++++++++++
 2 files changed, 49 insertions(+), 49 deletions(-)
 delete mode 100644 recipes-connectivity/lora/lora-network-server_1.0.34.bb
 create mode 100644 recipes-connectivity/lora/lora-network-server_1.0.35.bb

diff --git a/recipes-connectivity/lora/lora-network-server_1.0.34.bb b/recipes-connectivity/lora/lora-network-server_1.0.34.bb
deleted file mode 100644
index f2b377b..0000000
--- a/recipes-connectivity/lora/lora-network-server_1.0.34.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-DESCRIPTION = "MultiTech LoRa Network Server"
-PRIORITY = "optional"
-SECTION = "console/utils"
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7ffae4666a986c4ccf45e99e464f8402"
-DEPENDS = "jsoncpp libmts mosquitto sqlite3"
-RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash"
-PR = "r1"
-
-SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \
-           file://lora-network-server.init \
-           file://lora-network-server.default \
-           file://lora-network-server.logrotate.conf \
-          "
-
-SRC_URI[md5sum] = "efc72db6ea064c6dcb867e83682d84d2"
-SRC_URI[sha256sum] = "73f22ff5cadc5565450a2a3d1f2231b002552ecac254717b68b526d3f261986c"
-
-# 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 ${D}${LORA_DIR}/
-    install -m 0644 lora-network-server.conf.sample ${D}${LORA_DIR}/lora-network-server.conf.sample
-
-    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
-    install -d ${D}${sysconfdir}/logrotate.d
-    install -m 0644 ${WORKDIR}/lora-network-server.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-network-server.conf
-}
-
-CONFFILES_${PN} = "${sysconfdir}/default/lora-network-server"
-FILES_${PN} += "${LORA_DIR}"
-FILES_${PN}-dbg += "${LORA_DIR}/.debug"
diff --git a/recipes-connectivity/lora/lora-network-server_1.0.35.bb b/recipes-connectivity/lora/lora-network-server_1.0.35.bb
new file mode 100644
index 0000000..e5c7bf7
--- /dev/null
+++ b/recipes-connectivity/lora/lora-network-server_1.0.35.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "MultiTech LoRa Network Server"
+PRIORITY = "optional"
+SECTION = "console/utils"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7ffae4666a986c4ccf45e99e464f8402"
+DEPENDS = "jsoncpp libmts mosquitto sqlite3"
+RDEPENDS_${PN} += "lora-packet-forwarder logrotate bash"
+PR = "r1"
+
+SRC_URI = "http://multitech.net/downloads/lora-network-server_${TUNE_PKGARCH}_${PV}.tar.gz \
+           file://lora-network-server.init \
+           file://lora-network-server.default \
+           file://lora-network-server.logrotate.conf \
+          "
+
+SRC_URI[md5sum] = "2eeb170827e49a0962a2f563ccdeeca5"
+SRC_URI[sha256sum] = "d706ec6a7f7cb7b76dace93ea5b3411495f62cc00f90683e40d9d1502b4a247f"
+
+# 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 ${D}${LORA_DIR}/
+    install -m 0644 lora-network-server.conf.sample ${D}${LORA_DIR}/lora-network-server.conf.sample
+
+    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
+    install -d ${D}${sysconfdir}/logrotate.d
+    install -m 0644 ${WORKDIR}/lora-network-server.logrotate.conf ${D}${sysconfdir}/logrotate.d/lora-network-server.conf
+}
+
+CONFFILES_${PN} = "${sysconfdir}/default/lora-network-server"
+FILES_${PN} += "${LORA_DIR}"
+FILES_${PN}-dbg += "${LORA_DIR}/.debug"
-- 
cgit v1.2.3


From 01878a827266697253f74c9f0d92ee7f7062b939 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 31 May 2017 15:29:56 -0500
Subject: add bash dependency

---
 recipes-core/mlinux-scripts/mlinux-scripts-1.0.inc | 2 ++
 recipes-core/multitech/reset-handler_1.0.bb        | 1 +
 recipes-support/multitech/jsparser_0.3.bb          | 1 +
 recipes-support/ntp/ntp_%.bbappend                 | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/recipes-core/mlinux-scripts/mlinux-scripts-1.0.inc b/recipes-core/mlinux-scripts/mlinux-scripts-1.0.inc
index 979fc4c..0f5c136 100644
--- a/recipes-core/mlinux-scripts/mlinux-scripts-1.0.inc
+++ b/recipes-core/mlinux-scripts/mlinux-scripts-1.0.inc
@@ -3,6 +3,8 @@ PRIORITY = "optional"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
+RDEPENDS_${PN} += "bash"
+
 SRC_URI = "file://mlinux-wifi-ap \
 	file://mlinux-dhcpd \
 	file://mlinux-set-apn \
diff --git a/recipes-core/multitech/reset-handler_1.0.bb b/recipes-core/multitech/reset-handler_1.0.bb
index 9ccd475..39abaab 100644
--- a/recipes-core/multitech/reset-handler_1.0.bb
+++ b/recipes-core/multitech/reset-handler_1.0.bb
@@ -3,6 +3,7 @@ SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 PR = "r1"
+RDEPENDS_${PN} += "bash"
 
 inherit update-rc.d
 
diff --git a/recipes-support/multitech/jsparser_0.3.bb b/recipes-support/multitech/jsparser_0.3.bb
index a7a4645..c289d30 100644
--- a/recipes-support/multitech/jsparser_0.3.bb
+++ b/recipes-support/multitech/jsparser_0.3.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "MultiTech Command Line JSON Parser"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
 DEPENDS = "jsoncpp libmts"
+RDEPENDS_${PN} += "bash"
 
 PR = "r0"
 SRCREV="${PV}"
diff --git a/recipes-support/ntp/ntp_%.bbappend b/recipes-support/ntp/ntp_%.bbappend
index 6c75feb..6ce3cb2 100644
--- a/recipes-support/ntp/ntp_%.bbappend
+++ b/recipes-support/ntp/ntp_%.bbappend
@@ -7,6 +7,8 @@ SRC_URI += " file://ntpd-default \
 		"
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
+RDEPENDS_${PN} += "bash"
+
 python do_patch_prepend () {
     import os
 }
-- 
cgit v1.2.3


From cf37d12755e21c2d2ff74452900861427cfad433 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 31 May 2017 16:09:30 -0500
Subject: Update cellular_radios.rules for udev adding LAT3, LVW3 and LEU3 new
 modem rules

---
 recipes-core/udev/eudev/cellular_radios.rules | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/recipes-core/udev/eudev/cellular_radios.rules b/recipes-core/udev/eudev/cellular_radios.rules
index aa05e96..fd36bbd 100644
--- a/recipes-core/udev/eudev/cellular_radios.rules
+++ b/recipes-core/udev/eudev/cellular_radios.rules
@@ -14,6 +14,13 @@ ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="08", SYMLINK+="modem4"
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0a", SYMLINK+="modem5"
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="0c", SYMLINK+="modem6"
+# LAT3, LVW3 and LEU3
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="02", SYMLINK+="modem1"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="04", SYMLINK+="modem2"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem3"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="08", SYMLINK+="modem4"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="0a", SYMLINK+="modem5"
 # EV3
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="00", SYMLINK+="modem0"
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="01", SYMLINK+="modem1"
@@ -34,6 +41,9 @@ ATTRS{idVendor}=="1199", ATTRS{idProduct}=="0028", SYMLINK+="modem$env{ID_PORT}"
 # H5: ttyACM0, ttyACM3
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0021", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1"
+# LAT3, LVW3 and LEU3
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="00", SYMLINK+="modem_at0"
+ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="0036", ENV{ID_IFACE}=="06", SYMLINK+="modem_at1"
 # EV3: ttyUSB2, ttyUSB3
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="02", SYMLINK+="modem_at0"
 ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1010", ENV{ID_IFACE}=="03", SYMLINK+="modem_at1"
-- 
cgit v1.2.3


From cb8fd323883b74500f70f139befba6a4f7c70d49 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 1 Jun 2017 17:18:00 -0500
Subject: Add ruby-sqlite3 and monit to the factory image

---
 recipes-core/images/mlinux-factory-image.bb      | 11 ++---
 recipes-extended/monit/monit_5.21.0.bb           | 47 ----------------------
 recipes-extended/monit/monit_5.22.0.bb           | 51 ++++++++++++++++++++++++
 recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb | 21 +++++++---
 4 files changed, 70 insertions(+), 60 deletions(-)
 delete mode 100644 recipes-extended/monit/monit_5.21.0.bb
 create mode 100644 recipes-extended/monit/monit_5.22.0.bb

diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb
index 9e59bfb..9da3040 100644
--- a/recipes-core/images/mlinux-factory-image.bb
+++ b/recipes-core/images/mlinux-factory-image.bb
@@ -18,8 +18,8 @@ IMAGE_INSTALL += "sqlite3"
 
 IMAGE_INSTALL += "autossh"
 
-# Monit system/process monitor  TBD
-#IMAGE_INSTALL += "monit"
+# Monit system/process monitor
+IMAGE_INSTALL += "monit"
 
 # LoRa support (MTAC-LORA accessory card)
 IMAGE_INSTALL += "lora-gateway-utils lora-network-server lora-query lora-packet-forwarder-usb"
@@ -61,12 +61,7 @@ python-xml \
 # Ruby support
 IMAGE_INSTALL += "ruby"
 
-# Ruby-sqlite3 build for 2.2 Ruby requires
-# ruby-hoe native, which is not in openembedded.
-# In Debian the build needs ruby-redcloth,
-# rake, ruby-minitest.  Openembedded does not
-# support this stuff.  TBD
-#IMAGE_INSTALL += "ruby-sqlite3"
+IMAGE_INSTALL += "ruby-sqlite3"
 IMAGE_INSTALL += "ruby-serialport"
 
 # OpenJDK Java runtime
diff --git a/recipes-extended/monit/monit_5.21.0.bb b/recipes-extended/monit/monit_5.21.0.bb
deleted file mode 100644
index 8bef5c6..0000000
--- a/recipes-extended/monit/monit_5.21.0.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "Monit"
-HOMEPAGE = "http://mmonit.com/"
-LICENSE = "AGPL-3.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51"
-DEPENDS = "libpam"
-
-PR = "r1"
-
-SRC_URI = "http://mmonit.com/monit/dist/monit-5.21.0.tar.gz \
-           file://monitrc \
-           file://monit.init \
-           file://monit.default \
-	   file://monit-remove-atomic.patch;patch=1;pnum=1 \
-	   file://monit-libtool.patch;patch=1;pnum=1 \
-           "
-# file://monit-libtool.patch;patch=1;pnum=1
-
-SRC_URI[md5sum] = "6e300f87fd108d85844cee9a64f0c7fb"
-SRC_URI[sha256sum] = "fbf76163ed4a180854d378af60fed0cdbc5a8772823957234efc182ead10c03c"
-
-
-inherit autotools
-
-EXTRA_OECONF += "--with-ssl-lib-dir=${STAGING_LIBDIR} \
-                --with-ssl-incl-dir=${STAGING_INCDIR} \
-                "
-
-EXTRA_OECONF_append_armv5 = " libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes "
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "monit"
-INITSCRIPT_PARAMS = "defaults 99 10"
-
-do_install_append() {
-    install -d ${D}${sysconfdir}
-    install -d ${D}${sysconfdir}/monit.d
-    install -m 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/
-
-    install -d ${D}${sysconfdir}/init.d
-    install -m 0755 ${WORKDIR}/monit.init ${D}${sysconfdir}/init.d/monit
-
-    install -d ${D}${sysconfdir}/default
-    install -m 0644 ${WORKDIR}/monit.default ${D}${sysconfdir}/default/monit
-}
-
-CONFFILES_${PN} += "${sysconfdir}/monitrc ${sysconfdir}/default/monit"
diff --git a/recipes-extended/monit/monit_5.22.0.bb b/recipes-extended/monit/monit_5.22.0.bb
new file mode 100644
index 0000000..3ad3074
--- /dev/null
+++ b/recipes-extended/monit/monit_5.22.0.bb
@@ -0,0 +1,51 @@
+DESCRIPTION = "Monit"
+HOMEPAGE = "http://mmonit.com/"
+LICENSE = "AGPL-3.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51"
+DEPENDS = "libpam zlib openssl"
+
+PR = "r0"
+
+SRC_URI = "http://mmonit.com/monit/dist/monit-5.22.0.tar.gz \
+           file://monitrc \
+           file://monit.init \
+           file://monit.default \
+           "
+
+SRC_URI[md5sum] = "768a637b8d23b6cbce271a8ff125c61f"
+SRC_URI[sha256sum] = "9fc58b5e3caafd64f0b6fff3e65ae757239fab37d04fb33efce177da15176183"
+
+inherit autotools-brokensep
+
+EXTRA_OECONF += "--with-ssl-lib-dir=${STAGING_LIBDIR} \
+                --with-ssl-incl-dir=${STAGING_INCDIR} \
+                "
+
+# Regenerate autoconfig generated aclocal.m4/m4 contained in the tarball
+EXTRA_AUTORECONF += " --force"
+
+do_configure_prepend() {
+    rm ${S}/aclocal.m4
+    rm -Rf ${S}/m4
+}
+
+EXTRA_OECONF_append_arm = " libmonit_cv_setjmp_available=yes libmonit_cv_vsnprintf_c99_conformant=yes "
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "monit"
+INITSCRIPT_PARAMS = "defaults 99 10"
+
+do_install_append() {
+    install -d ${D}${sysconfdir}
+    install -d ${D}${sysconfdir}/monit.d
+    install -m 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/
+
+    install -d ${D}${sysconfdir}/init.d
+    install -m 0755 ${WORKDIR}/monit.init ${D}${sysconfdir}/init.d/monit
+
+    install -d ${D}${sysconfdir}/default
+    install -m 0644 ${WORKDIR}/monit.default ${D}${sysconfdir}/default/monit
+}
+
+CONFFILES_${PN} += "${sysconfdir}/monitrc ${sysconfdir}/default/monit"
diff --git a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
index 35e473c..82998bc 100644
--- a/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
+++ b/recipes-ruby/ruby-sqlite3/ruby-sqlite3_1.3.13.bb
@@ -1,17 +1,28 @@
 DESCRIPTION = "Ruby bindings for the SQLite3 embedded database"
 HOMEPAGE = "https://github.com/sparklemotion/sqlite3-ruby"
-LICENSE = "MIT"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f24ce0d57c8f8576a36e2803d35bcfec"
 SECTION = "console/utils"
 PRIORITY = "optional"
+
 DEPENDS = "ruby sqlite3"
 
-inherit ruby
-PR = "r0"
+SRC_URI = "git://github.com/sparklemotion/sqlite3-ruby.git;branch=1-3-stable;tag=v${PV}"
+S = "${WORKDIR}/git"
+
+# Position independent code for shared lib
+CFLAGS += "-fPIC"
 
-SRC_URI = "git://github.com/sparklemotion/sqlite3-ruby.git;tag=v${PV};branch=1-3-stable;protocol=git"
+do_compile() {
+  ${CC} ${CFLAGS} ${LDFLAGS} -Iext/sqlite3 -Iext/native -I${STAGING_INCDIR}/ruby-2.2.0 -I${STAGING_INCDIR}/ruby-2.2.0/arm-linux-gnueabi -c ext/sqlite3/*.c -DHAVE_RB_INTEGER_PACK
+  ${CC} ${CFLAGS} ${LDFLAGS} --shared -o ext/sqlite3/sqlite3_native.so *.o -lsqlite3
+}
 
-S = "${WORKDIR}/git"
+do_install() {
+  install -d ${D}${libdir}/ruby ${D}${libdir}/ruby/sqlite3
+  install lib/sqlite3.rb ${D}${libdir}/ruby/sqlite3.rb
+  install lib/sqlite3/* ext/sqlite3/sqlite3_native.so -t ${D}${libdir}/ruby/sqlite3
+}
 
 FILES_${PN} = "${libdir}/ruby/sqlite3*"
 FILES_${PN}-dbg += "${libdir}/ruby/sqlite3/.debug*"
-- 
cgit v1.2.3


From 867420dd9d519505b392ae0e08185fba833267e7 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 5 Jun 2017 11:52:04 -0500
Subject: fatrace needs autotools-brokensep

---
 recipes-extended/fatrace/fatrace_0.9.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-extended/fatrace/fatrace_0.9.bb b/recipes-extended/fatrace/fatrace_0.9.bb
index b47637b..866a801 100644
--- a/recipes-extended/fatrace/fatrace_0.9.bb
+++ b/recipes-extended/fatrace/fatrace_0.9.bb
@@ -1,3 +1,4 @@
+inherit autotools-brokensep
 DESCRIPTION = "Fatrace - report system wide file access events"
 HOMEPAGE = "https://launchpad.net/fatrace"
 LICENSE = "GPL-3.0"
-- 
cgit v1.2.3


From 0bc3f6247f8a821983fdd9efb6a49a47b8fc5b29 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Mon, 5 Jun 2017 15:51:11 -0500
Subject: bluez5 build gattool and test programs

---
 recipes-connectivity/bluez/bluez4_4.101.bbappend | 16 ----------------
 recipes-connectivity/bluez/bluez5_%.bbappend     |  4 ++++
 2 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 recipes-connectivity/bluez/bluez4_4.101.bbappend
 create mode 100644 recipes-connectivity/bluez/bluez5_%.bbappend

diff --git a/recipes-connectivity/bluez/bluez4_4.101.bbappend b/recipes-connectivity/bluez/bluez4_4.101.bbappend
deleted file mode 100644
index b478630..0000000
--- a/recipes-connectivity/bluez/bluez4_4.101.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-EXTRA_OECONF += " --enable-pand"
-SUMMARY_${PN}-plugins = "Sample Bluez4 plugins"
-S = "${WORKDIR}/bluez-${PV}"
-PACKAGES =+ "${PN}-plugins"
-RPROVIDES_${PN}-plugins = "bluetooth-plugins"
-FILES_${PN}-plugins = "${libdir}/bluetooth/plugins/*.o"
-do_install_append () {
-	echo "JAK from is ${S} and to is ${D} and PN is ${PN}"
-        echo "libdir is ${libdir}"
-        echo "JAK FILES_ is ${FILES_bluez4-plugins}"
-        install -m0755 -d ${D}/usr/lib/bluetooth/plugins
-	install -m0755 ${S}/plugins/*.o ${D}/usr/lib/bluetooth/plugins
-}
-
-
-
diff --git a/recipes-connectivity/bluez/bluez5_%.bbappend b/recipes-connectivity/bluez/bluez5_%.bbappend
new file mode 100644
index 0000000..c99f5c8
--- /dev/null
+++ b/recipes-connectivity/bluez/bluez5_%.bbappend
@@ -0,0 +1,4 @@
+EXTRA_OECONF += "--enable-deprecated --enable-experimental"
+
+
+
-- 
cgit v1.2.3


From c7cae6cae274c2ede411b240b15db55bb115274d Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 6 Jun 2017 09:50:14 -0500
Subject: inherit npm-base required for node-red

---
 recipes-devtools/node-red/node-red_0.11.1.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-devtools/node-red/node-red_0.11.1.bb b/recipes-devtools/node-red/node-red_0.11.1.bb
index 9e441c6..4a73335 100644
--- a/recipes-devtools/node-red/node-red_0.11.1.bb
+++ b/recipes-devtools/node-red/node-red_0.11.1.bb
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 DEPENDS = "nodejs nodejs-native"
 PR = "r0"
 
-inherit npm
+inherit npm-base
+
 
 S = "${WORKDIR}"
 
-- 
cgit v1.2.3


From 7dcc7c35c014236ae71a9dc1f83546bc481805ab Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 6 Jun 2017 10:52:38 -0500
Subject: remove serialport from node-red due to 6.2 g++ error

---
 recipes-devtools/node-red/node-red_0.11.1.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-devtools/node-red/node-red_0.11.1.bb b/recipes-devtools/node-red/node-red_0.11.1.bb
index 4a73335..1dba51a 100644
--- a/recipes-devtools/node-red/node-red_0.11.1.bb
+++ b/recipes-devtools/node-red/node-red_0.11.1.bb
@@ -16,7 +16,9 @@ do_install() {
     oe_runnpm install --prefix ./ node-red@0.11.1
 
     # npm install more stuff
-    oe_runnpm install --prefix ./node_modules/node-red serialport nodemailer
+    # serialport dropped because of compiler error (g++ 6.2) in morty:
+    #
+    oe_runnpm install --prefix ./node_modules/node-red nodemailer
 
     # modules needed for loragw
     oe_runnpm install --prefix ./node_modules/node-red extend dissolve node-constants
-- 
cgit v1.2.3


From c21cdf16bf3abf574527a7a5374945a48c894dd1 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 6 Jun 2017 11:32:51 -0500
Subject: build-feed-extras.sh

---
 scripts/build-feed-extras.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build-feed-extras.sh b/scripts/build-feed-extras.sh
index 4b111c8..fb58eca 100755
--- a/scripts/build-feed-extras.sh
+++ b/scripts/build-feed-extras.sh
@@ -4,7 +4,7 @@
 FS_PACKAGES="sshfs-fuse fuse-exfat exfat-utils"
 NET_PACKAGES="wget netcat ipsec-tools openvpn iftop dnsmasq strongswan stunnel tunctl ethtool"
 UTIL_PACKAGES="logrotate fatrace stressapptest gawk rsyslog zip gnupg rrdtool"
-DEV_PACKAGES="node-red mono gdb git vim python-pip python-pyopenssl"
+DEV_PACKAGES="node-red mono gdb git vim python-pip python-pyopenssl openjdk-8"
 SUP_PACKAGES="pps-tools setserial"
 
 bitbake linux-firmware $FS_PACKAGES $NET_PACKAGES $UTIL_PACKAGES $DEV_PACKAGES $SUP_PACKAGES
-- 
cgit v1.2.3


From fa905ea07df7229ded71691e85f8fa4d504b7180 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 6 Jun 2017 14:16:34 -0500
Subject: Add serialport back into the build.

---
 recipes-devtools/node-red/files/errnopatch.txt | 14 ++++++++++++++
 recipes-devtools/node-red/node-red_0.11.1.bb   |  9 ++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 recipes-devtools/node-red/files/errnopatch.txt

diff --git a/recipes-devtools/node-red/files/errnopatch.txt b/recipes-devtools/node-red/files/errnopatch.txt
new file mode 100644
index 0000000..39e2a7c
--- /dev/null
+++ b/recipes-devtools/node-red/files/errnopatch.txt
@@ -0,0 +1,14 @@
+diff -Naru old/node_modules/node-red/node_modules/node-red-node-serialport/node_modules/serialport/src/serialport_poller.cpp new/node_modules/node-red/node_modules/node-red-node-serialport/node_modules/serialport/src/serialport_poller.cpp
+--- old/node_modules/node-red/node_modules/node-red-node-serialport/node_modules/serialport/src/serialport_poller.cpp	2015-05-09 10:20:06.000000000 -0500
++++ new/node_modules/node-red/node_modules/node-red-node-serialport/node_modules/serialport/src/serialport_poller.cpp	2017-06-06 13:19:56.156266989 -0500
+@@ -35,8 +35,8 @@
+     #ifdef UV_ERRNO_H_
+     const char* err_string = uv_strerror(status);
+     #else
+-    uv_err_t errno = uv_last_error(uv_default_loop());
+-    const char* err_string = uv_strerror(errno);
++    uv_err_t err = uv_last_error(uv_default_loop());
++    const char* err_string = uv_strerror(err);
+     #endif
+     snprintf(this->errorString, sizeof(this->errorString), "Error %s on polling", err_string);
+     argv[0] = v8::Exception::Error(NanNew<v8::String>(this->errorString));
diff --git a/recipes-devtools/node-red/node-red_0.11.1.bb b/recipes-devtools/node-red/node-red_0.11.1.bb
index 1dba51a..0eb3ab6 100644
--- a/recipes-devtools/node-red/node-red_0.11.1.bb
+++ b/recipes-devtools/node-red/node-red_0.11.1.bb
@@ -4,6 +4,8 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 DEPENDS = "nodejs nodejs-native"
 PR = "r0"
+FILESEXTRAPATHS_prepend := ":${THISDIR}/files:"
+SRC_URI += "file://errnopatch.txt"
 
 inherit npm-base
 
@@ -15,10 +17,11 @@ do_install() {
     # npm install locally
     oe_runnpm install --prefix ./ node-red@0.11.1
 
+    # Patch for 6.2 compiler and errno overload issue
+    patch -N -p1 <errnopatch.txt
+
     # npm install more stuff
-    # serialport dropped because of compiler error (g++ 6.2) in morty:
-    #
-    oe_runnpm install --prefix ./node_modules/node-red nodemailer
+    oe_runnpm install --prefix ./node_modules/node-red nodemailer serialport
 
     # modules needed for loragw
     oe_runnpm install --prefix ./node_modules/node-red extend dissolve node-constants
-- 
cgit v1.2.3


From cb560a2d27a63190c83ac3329d50066fa754b5c7 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 6 Jun 2017 15:57:32 -0500
Subject: Add /sbin and usr/sbin to the mtadm PATH

---
 recipes-core/useradd/useradd.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/recipes-core/useradd/useradd.bb b/recipes-core/useradd/useradd.bb
index 0afa3b1..458facf 100644
--- a/recipes-core/useradd/useradd.bb
+++ b/recipes-core/useradd/useradd.bb
@@ -45,3 +45,13 @@ FILES_${PN} = "/home/mtadm/.ssh"
 # debugsources.list: No such file or directory:
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
+pkg_postinst_${PN} () {
+   profile=/home/mtadm/.profile
+   if ! grep 'sbin' ${profile} ; then
+     Sub='${PA'
+     Sub=${Sub}'TH}:/sbin:/usr/sbin'
+     echo 'PATH='${Sub} >>/home/mtadm/.profile
+     echo 'export PATH'  >>/home/mtadm/.profile
+   fi
+}
+
-- 
cgit v1.2.3


From 6fc48b75d08f5b1fc0d4b8aaddd664bc52687abb Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 7 Jun 2017 11:38:08 -0500
Subject: Build patched node-red serialport and remove x86_64 serialport
 package

---
 recipes-devtools/node-red/files/errnopatch.txt | 14 --------------
 recipes-devtools/node-red/node-red_0.11.1.bb   | 12 ++++++++----
 2 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 recipes-devtools/node-red/files/errnopatch.txt

diff --git a/recipes-devtools/node-red/files/errnopatch.txt b/recipes-devtools/node-red/files/errnopatch.txt
deleted file mode 100644
index 39e2a7c..0000000
--- a/recipes-devtools/node-red/files/errnopatch.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naru old/node_modules/node-red/node_modules/node-red-node-serialport/node_modules/serialport/src/serialport_poller.cpp new/node_modules/node-red/node_modules/node-red-node-serialport/node_modules/serialport/src/serialport_poller.cpp
---- old/node_modules/node-red/node_modules/node-red-node-serialport/node_modules/serialport/src/serialport_poller.cpp	2015-05-09 10:20:06.000000000 -0500
-+++ new/node_modules/node-red/node_modules/node-red-node-serialport/node_modules/serialport/src/serialport_poller.cpp	2017-06-06 13:19:56.156266989 -0500
-@@ -35,8 +35,8 @@
-     #ifdef UV_ERRNO_H_
-     const char* err_string = uv_strerror(status);
-     #else
--    uv_err_t errno = uv_last_error(uv_default_loop());
--    const char* err_string = uv_strerror(errno);
-+    uv_err_t err = uv_last_error(uv_default_loop());
-+    const char* err_string = uv_strerror(err);
-     #endif
-     snprintf(this->errorString, sizeof(this->errorString), "Error %s on polling", err_string);
-     argv[0] = v8::Exception::Error(NanNew<v8::String>(this->errorString));
diff --git a/recipes-devtools/node-red/node-red_0.11.1.bb b/recipes-devtools/node-red/node-red_0.11.1.bb
index 0eb3ab6..fc9809e 100644
--- a/recipes-devtools/node-red/node-red_0.11.1.bb
+++ b/recipes-devtools/node-red/node-red_0.11.1.bb
@@ -3,6 +3,7 @@ HOMEPAGE = "http://nodered.org"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 DEPENDS = "nodejs nodejs-native"
+RDEPENDS_${PN} += "bash"
 PR = "r0"
 FILESEXTRAPATHS_prepend := ":${THISDIR}/files:"
 SRC_URI += "file://errnopatch.txt"
@@ -17,11 +18,11 @@ do_install() {
     # npm install locally
     oe_runnpm install --prefix ./ node-red@0.11.1
 
-    # Patch for 6.2 compiler and errno overload issue
-    patch -N -p1 <errnopatch.txt
-
     # npm install more stuff
-    oe_runnpm install --prefix ./node_modules/node-red nodemailer serialport
+    oe_runnpm install --prefix./node_modules/node-red nodemailer 
+    # Build patched serialport.
+    # Original is https://registry.npmjs.org/serialport/-/serialport-1.7.4.tgz
+    oe_runnpm install  --prefix ./node_modules/node-red http://multitech.net/mlinux/sources/node-red-serialport-1.7.4-mt1.tgz
 
     # modules needed for loragw
     oe_runnpm install --prefix ./node_modules/node-red extend dissolve node-constants
@@ -38,6 +39,9 @@ do_install() {
     rm ./node_modules/node-red/nodes/core/hardware/nrgpio
     rm ./node_modules/node-red/nodes/core/hardware/nrgpio.py
 
+    # remove x86_64 serialport 0.0.5
+    rm -r ./node_modules/node-red/node_modules/node-red-node-serialport
+
     # install node-red
     install -d ${D}/opt/node-red
     cp -r ./node_modules/node-red/* ${D}/opt/node-red/
-- 
cgit v1.2.3


From 1efd30ba7b8941abdbb504ef0684061d5b51a64d Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 7 Jun 2017 13:39:00 -0500
Subject: Not using patch in bitbake recipe

---
 recipes-devtools/node-red/node-red_0.11.1.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/recipes-devtools/node-red/node-red_0.11.1.bb b/recipes-devtools/node-red/node-red_0.11.1.bb
index fc9809e..bcf5a67 100644
--- a/recipes-devtools/node-red/node-red_0.11.1.bb
+++ b/recipes-devtools/node-red/node-red_0.11.1.bb
@@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7ca
 DEPENDS = "nodejs nodejs-native"
 RDEPENDS_${PN} += "bash"
 PR = "r0"
-FILESEXTRAPATHS_prepend := ":${THISDIR}/files:"
-SRC_URI += "file://errnopatch.txt"
 
 inherit npm-base
 
-- 
cgit v1.2.3


From 56c40e89f8550ed2417c8abf1db068fd4679425b Mon Sep 17 00:00:00 2001
From: Jeff Hatch <Jeff.Hatch@multitech.com>
Date: Fri, 2 Jun 2017 16:35:34 -0500
Subject: Update radio-cmd and radio-query recipes to 0.4 versions for both

---
 recipes-support/multitech/radio-cmd_0.3.bb   | 22 ----------------------
 recipes-support/multitech/radio-cmd_0.4.bb   | 22 ++++++++++++++++++++++
 recipes-support/multitech/radio-query_0.2.bb | 22 ----------------------
 recipes-support/multitech/radio-query_0.4.bb | 22 ++++++++++++++++++++++
 4 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 recipes-support/multitech/radio-cmd_0.3.bb
 create mode 100644 recipes-support/multitech/radio-cmd_0.4.bb
 delete mode 100644 recipes-support/multitech/radio-query_0.2.bb
 create mode 100644 recipes-support/multitech/radio-query_0.4.bb

diff --git a/recipes-support/multitech/radio-cmd_0.3.bb b/recipes-support/multitech/radio-cmd_0.3.bb
deleted file mode 100644
index b8e5b23..0000000
--- a/recipes-support/multitech/radio-cmd_0.3.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "MultiTech cellular radio command tool"
-HOMEPAGE = "http://www.multitech.net/"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-DEPENDS = "jsoncpp libmts libmts-io"
-
-PR = "r0"
-SRCREV = "${PV}"
-
-SRC_URI = "git://git.multitech.net/radio-cmd;branch=master"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-    oe_runmake
-}
-
-do_install() {
-    oe_runmake install DESTDIR=${D}
-}
-
diff --git a/recipes-support/multitech/radio-cmd_0.4.bb b/recipes-support/multitech/radio-cmd_0.4.bb
new file mode 100644
index 0000000..b8e5b23
--- /dev/null
+++ b/recipes-support/multitech/radio-cmd_0.4.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "MultiTech cellular radio command tool"
+HOMEPAGE = "http://www.multitech.net/"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+DEPENDS = "jsoncpp libmts libmts-io"
+
+PR = "r0"
+SRCREV = "${PV}"
+
+SRC_URI = "git://git.multitech.net/radio-cmd;branch=master"
+
+S = "${WORKDIR}/git"
+
+do_compile() {
+    oe_runmake
+}
+
+do_install() {
+    oe_runmake install DESTDIR=${D}
+}
+
diff --git a/recipes-support/multitech/radio-query_0.2.bb b/recipes-support/multitech/radio-query_0.2.bb
deleted file mode 100644
index 5e0b60a..0000000
--- a/recipes-support/multitech/radio-query_0.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "MultiTech cellular radio query tool"
-HOMEPAGE = "http://www.multitech.net/"
-LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-DEPENDS = "jsoncpp libmts libmts-io"
-
-PR = "r0"
-SRCREV = "${PV}"
-
-SRC_URI = "git://git.multitech.net/radio-query;branch=master"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-    oe_runmake
-}
-
-do_install() {
-    oe_runmake install DESTDIR=${D}
-}
-
diff --git a/recipes-support/multitech/radio-query_0.4.bb b/recipes-support/multitech/radio-query_0.4.bb
new file mode 100644
index 0000000..5e0b60a
--- /dev/null
+++ b/recipes-support/multitech/radio-query_0.4.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "MultiTech cellular radio query tool"
+HOMEPAGE = "http://www.multitech.net/"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+DEPENDS = "jsoncpp libmts libmts-io"
+
+PR = "r0"
+SRCREV = "${PV}"
+
+SRC_URI = "git://git.multitech.net/radio-query;branch=master"
+
+S = "${WORKDIR}/git"
+
+do_compile() {
+    oe_runmake
+}
+
+do_install() {
+    oe_runmake install DESTDIR=${D}
+}
+
-- 
cgit v1.2.3


From 7f6d3b7a890a1e818cd1a81dc382bc4d68f785fd Mon Sep 17 00:00:00 2001
From: Jeff Hatch <Jeff.Hatch@multitech.com>
Date: Mon, 5 Jun 2017 10:25:16 -0500
Subject: Update libmts-io recipe to 1.0.1 to pull in LNA radio changes

---
 recipes-support/multitech/libmts-io_1.0.0.bb | 30 ----------------------------
 recipes-support/multitech/libmts-io_1.0.1.bb | 30 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 recipes-support/multitech/libmts-io_1.0.0.bb
 create mode 100644 recipes-support/multitech/libmts-io_1.0.1.bb

diff --git a/recipes-support/multitech/libmts-io_1.0.0.bb b/recipes-support/multitech/libmts-io_1.0.0.bb
deleted file mode 100644
index 34115be..0000000
--- a/recipes-support/multitech/libmts-io_1.0.0.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "MultiTech IO C++ Library"
-HOMEPAGE = "http://www.multitech.net/"
-LICENSE = "LGPL-2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
-
-DEPENDS = "libmts jsoncpp cmake-native cppunit"
-BBCLASSEXTEND = "native"
-
-PR = "r0"
-SRCREV = "${PV}"
-SRC_URI = "git://git.multitech.net/libmts-io;branch=master"
-
-S = "${WORKDIR}/git"
-
-do_compile() {
-	oe_runmake
-}
-
-# build and run tests for native recipe
-do_compile_append_virtclass-native() {
-	cd test
-	cmake .
-	oe_runmake
-	./TestRunnerClient
-}
-
-do_install() {
-	oe_runmake install DESTDIR=${D}
-}
-
diff --git a/recipes-support/multitech/libmts-io_1.0.1.bb b/recipes-support/multitech/libmts-io_1.0.1.bb
new file mode 100644
index 0000000..34115be
--- /dev/null
+++ b/recipes-support/multitech/libmts-io_1.0.1.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "MultiTech IO C++ Library"
+HOMEPAGE = "http://www.multitech.net/"
+LICENSE = "LGPL-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
+
+DEPENDS = "libmts jsoncpp cmake-native cppunit"
+BBCLASSEXTEND = "native"
+
+PR = "r0"
+SRCREV = "${PV}"
+SRC_URI = "git://git.multitech.net/libmts-io;branch=master"
+
+S = "${WORKDIR}/git"
+
+do_compile() {
+	oe_runmake
+}
+
+# build and run tests for native recipe
+do_compile_append_virtclass-native() {
+	cd test
+	cmake .
+	oe_runmake
+	./TestRunnerClient
+}
+
+do_install() {
+	oe_runmake install DESTDIR=${D}
+}
+
-- 
cgit v1.2.3


From 730563e7493790e22edddb9282b6fa01b1e88e11 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 7 Jun 2017 14:09:48 -0500
Subject: Developer release 1

---
 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 9e54052..450b106 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,7 +1,7 @@
 DISTRO = "mlinux"
 DISTRO_NAME = "mLinux"
 DISTRO_BASE_VERSION = "4.0"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.Beta"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.dev1
 DISTRO_CODENAME = ""
 SDK_VENDOR = "-mlinux"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
-- 
cgit v1.2.3


From 33d4f79c2450575c1aa543b519aedde8a4ec9337 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 7 Jun 2017 14:18:48 -0500
Subject: 4.0.0dev1 release fix syntax

---
 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 450b106..83034a7 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,7 +1,7 @@
 DISTRO = "mlinux"
 DISTRO_NAME = "mLinux"
 DISTRO_BASE_VERSION = "4.0"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.dev1
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.dev1"
 DISTRO_CODENAME = ""
 SDK_VENDOR = "-mlinux"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
-- 
cgit v1.2.3


From a209217e4abb8019ff3cde8fefa6ea0b24e8036e Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 7 Jun 2017 14:23:35 -0500
Subject: Remove invalid morty protocol svk

---
 classes/mlinux-mirrors.bbclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/classes/mlinux-mirrors.bbclass b/classes/mlinux-mirrors.bbclass
index 7f80d46..1e95651 100644
--- a/classes/mlinux-mirrors.bbclass
+++ b/classes/mlinux-mirrors.bbclass
@@ -6,7 +6,6 @@ hg://.*/.*  http://multitech.net/mlinux/sources/
 bzr://.*/.* http://multitech.net/mlinux/sources/
 osc://.*/.* http://multitech.net/mlinux/sources/
 p4://.*/.*  http://multitech.net/mlinux/sources/
-svk://.*/.* http://multitech.net/mlinux/sources/
 }
 
 MIRRORS_append () {
-- 
cgit v1.2.3


From 140d44a8557acffbdda3d344c23a4e3481a3997a Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Wed, 7 Jun 2017 17:18:12 -0500
Subject: Add the extra .0 in 4.0.0

---
 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 83034a7..d09700e 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,7 +1,7 @@
 DISTRO = "mlinux"
 DISTRO_NAME = "mLinux"
 DISTRO_BASE_VERSION = "4.0"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.dev1"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev1"
 DISTRO_CODENAME = ""
 SDK_VENDOR = "-mlinux"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
-- 
cgit v1.2.3