Merge yocto-2.2 (morty) into master

83 files changed, 611 insertions, 1102 deletions

diff --git a/classes/mlinux-image.bbclass b/classes/mlinux-image.bbclass
index 4af7d9e..580901d 100644
--- a/classes/mlinux-image.bbclass
+++ b/classes/mlinux-image.bbclass
@@ -1,13 +1,15 @@
 # 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 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;"
@@ -58,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() {
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 () {
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/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index 1ad1f27..d09700e 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}.0dev1"
 DISTRO_CODENAME = ""
 SDK_VENDOR = "-mlinux"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
@@ -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"
diff --git a/contrib/local.conf b/contrib/local.conf
index 1e83060..7bfed06 100644
--- a/contrib/local.conf
+++ b/contrib/local.conf
@@ -49,3 +49,19 @@ PRSERV_HOST = "localhost:0"
 INHERIT += "buildhistory"
 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"
+
+PACKAGECONFIG_append_pn-boost = " python"
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"
+
+
+
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/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.35.bb b/recipes-connectivity/lora/lora-network-server_1.0.35.bb
index 4ab657d..e5c7bf7 100644
--- a/recipes-connectivity/lora/lora-network-server_1.0.35.bb
+++ b/recipes-connectivity/lora/lora-network-server_1.0.35.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 7ca1ffb..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,11 +3,13 @@ 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"
 
+EXTRA_OEMAKE = " -e"
+
 # tag v1.4.1
 SRCREV = "0011a60759a7d81656a5393e97089daab1ff1a81"
 
@@ -23,13 +25,14 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
 "
 
 S = "${WORKDIR}/git"
+B = "${S}"
 
 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 bc5d8ec..51996f5 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}"
@@ -28,13 +29,14 @@ SRC_URI = "git://github.com/Lora-net/packet_forwarder.git;protocol=git \
 
 
 S = "${WORKDIR}/git"
+B = "${S}"
 
 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
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 3f035a7..133a0e0 100644
--- a/recipes-connectivity/mosquitto/mosquitto_1.4.bb