Merge tag 'dey-2.2-r2.2' into dey-2.2/master

Tweaked to maintain some recipes' revisions to AUTOREV instead of the
fixed SHA1s from the tag.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>

README.md

@@ -17,10 +17,12 @@ Software for the following hardware platforms is in production support:
 
 * Digi ConnectCore 6UL
   * [Digi P/N CC-WMX-JN58-NE](http://www.digi.com/products/models/cc-wmx-jn58-ne)
+  * [Digi P/N CC-MX-JN58-Z1](https://www.digi.com/products/models/cc-mx-jn58-z1)
+  * Digi P/N CC-WMX-JN7A-NE
 * Digi ConnectCore 6UL SBC Express
-  * [Digi P/N CC-WMX6UL-START](http://www.digi.com/products/models/cc-wmx6ul-start) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001514/default.htm#concept/yocto/c_get_started_with_yocto.htm))
+  * [Digi P/N CC-WMX6UL-START](http://www.digi.com/products/models/cc-wmx6ul-start) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001548/default.htm#concept/yocto/c_get_started_with_yocto.htm))
 * Digi ConnectCore 6UL SBC Pro
-  * [Digi P/N CC-WMX6UL-KIT](https://www.digi.com/products/models/cc-wmx6ul-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001515/default.htm#concept/yocto/c_get_started_with_yocto.htm))
+  * [Digi P/N CC-WMX6UL-KIT](https://www.digi.com/products/models/cc-wmx6ul-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001547/default.htm#concept/yocto/c_get_started_with_yocto.htm))
 
 * Digi ConnectCore 6
   * [Digi P/N CC-WMX-J97C-TN](http://www.digi.com/products/models/cc-wmx-j97c-tn)
@@ -37,7 +39,7 @@ Software for the following hardware platforms is in production support:
   * Digi P/N CC-WMX-J98C-FJA-1
 
 * Digi ConnectCore 6 Development Kit
-  * [Digi P/N CC-WMX6-KIT](http://www.digi.com/products/models/cc-wmx6-kit) ([Get Started](http://www.digi.com/resources/documentation/digidocs/90001945-13/default.htm#concept/yocto/c_get_started_with_yocto.htm%3FTocPath%3DDigi%2520Embedded%2520Yocto%7CGet%2520started%7C_____0))
+  * [Digi P/N CC-WMX6-KIT](http://www.digi.com/products/models/cc-wmx6-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001546/default.htm#concept/yocto/c_get_started_with_yocto.htm))
 
 * Digi ConnectCore 6 SBC
   * [Digi P/N CC-SB-WMX-J97C-1](http://www.digi.com/products/models/cc-sb-wmx-j97c-1)
@@ -51,14 +53,14 @@ hardware.
 
 Documentation is available online on the Digi documentation site:
 
-* [Digi ConnectCore 6UL SBC Express](http://www.digi.com/resources/documentation/Digidocs/90001514/default.htm)
+* [Digi ConnectCore 6UL SBC Express](https://www.digi.com/resources/documentation/digidocs/90001548/default.htm)
-* [Digi ConnectCore 6UL SBC Pro](http://www.digi.com/resources/documentation/Digidocs/90001515/default.htm)
+* [Digi ConnectCore 6UL SBC Pro](https://www.digi.com/resources/documentation/digidocs/90001547/default.htm)
-* [Digi ConnectCore 6 Jumpstart Development Kit](http://www.digi.com/resources/documentation/Digidocs/90001945-13/default.htm)
+* [Digi ConnectCore 6 Jumpstart Development Kit](https://www.digi.com/resources/documentation/digidocs/90001546/default.htm)
 
 # Downloads
 
-* Demo images: ftp://ftp1.digi.com/support/digiembeddedyocto/2.2/r1/images/
+* Demo images: ftp://ftp1.digi.com/support/digiembeddedyocto/2.2/r2/images/
-* Software Development Kit (SDK): ftp://ftp1.digi.com/support/digiembeddedyocto/2.2/r1/sdk/
+* Software Development Kit (SDK): ftp://ftp1.digi.com/support/digiembeddedyocto/2.2/r2/sdk/
 
 # Release Changelog
 
@@ -68,11 +70,28 @@ Documentation is available online on the Digi documentation site:
 
 ## 2.2-r2
 
-* Digi Embedded Yocto
+* Use NetworkManager for ethernet, wireless (station) and cellular network interfaces
-  * Support to connect to AWS IoT with AWS IoT Device SDK for embedded C.
+* Updated kernel version to v4.1.41 for CC6 platform
-  * Added support for Digi XBee Cellular 3G Global, with P/N XBC-M5-UT-001
+* Added support for SPI Slave mode on CC6UL platform
-  * Added support for U-Blox TOBY L-200/L-210
+* Added support for Atmel Cryptochip ATEC508A using Cryptoauthlib
-  * Added support for Quectel EC-25
+* Network failover mechanism
+* Powered by AWS certified on all supported hardware platforms including:
+  * AWS GreenGrass core software
+  * AWS IoT Device SDK for embedded C
+* Updated AR6233 firmware for Radio Equipment Directive module certification
+* QCA6564 WorldWide board data file available on request
+* Includes MCA firmware v1.0:
+  * MCA analog tamper detection
+  * MCA ADC-based analog comparators
+* Updated U-Boot to version 2015.04-r9
+  * Added support for CC6UL variant 0x4
+  * Added dynamic environment location and bad block handling for the environment
+  * TrustFence:
+    * Move RootFS encryption key to 'safe' partition
+    * Added support for four tamper interfaces
+    * Disable external memory boot in OTP for secure boot
+  * Skip initial scanning of bad blocks for faster boot on NAND
+  * Updated documentation
 
 ## 2.2-r1
 
@@ -81,9 +100,11 @@ Documentation is available online on the Digi documentation site:
   * Updated Qt 5.7
   * Updated ModemManager with validated support for:
     * Digi's XBee Cellular LTE Cat 1 (USA/Verizon), with P/N XBC-V1-UT-001
+    * Digi's XBee Cellular 3G Global, with P/N XBC-M5-UT-001
+    * U-Blox's TOBY L-200/L-210
     * Telit's LE910 and HE910
     * Huawei's ME909u
-    * Quectel's EC21
+    * Quectel's EC21 and EC25
   * Modified default networking settings:
     * Defalt to dynamic IP addresses assignments
     * Default station and softAP concurrent wireless mode
@@ -123,6 +144,7 @@ boot a signed U-Boot only.
   performance is optimized
 * When working as an access point, DFS capable channels in band A are not
   currently supported.
+* The QCA6564 wireless chip does not support Wake On Wireless LAN
 
 ## Digi ConnectCore 6
 
@@ -156,5 +178,5 @@ When you contact Digi Technical Support, include important system details and
 device information to help Digi resolve the issue more quickly.
 
 1. In the device, run the command 'sysinfo'. This generates the following file:
-   /tmp/<current timestamp>.txt.gz.
+   /tmp/&lt;current timestamp>.txt.gz.
-2. Attach the <current timestamp>.txt.gz file to your support ticket.
+2. Attach the &lt;current timestamp>.txt.gz file to your support ticket.

meta-digi-arm/conf/machine/include/ccimx6ul.inc

@@ -42,4 +42,4 @@ KERNEL_IMAGETYPE = "zImage"
 MKUBIFS_BOOT_ARGS ?= "-m 2048 -e 126976 -c 127"
 
 # mkfs.ubifs parameters for rootfs partition
-MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 2047"
+MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 8191"

meta-digi-arm/recipes-digi/mca/mca-tool_1.9.bb

@@ -7,8 +7,8 @@ LICENSE = "CLOSED"
 PKGNAME = "mca_tool"
 SRC_URI = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "f44b2547333b2900477a8b89b58d08a1"
+SRC_URI[md5sum] = "3d954ceb361efa8325c9fae280c95775"
-SRC_URI[sha256sum] = "9659f591438955eab27fda7092fe4ba1d6874c276a4bc6d70689f91dc4bdccd8"
+SRC_URI[sha256sum] = "874f02bc1ad7d1768879cff563888666c70691b12404a986af2e5743b3e3e628"
 
 S = "${WORKDIR}/${PKGNAME}-${PV}"
 

meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm.sh

@@ -18,7 +18,7 @@
 # At this point of the boot (udev script), the system log (syslog) is not
 # available yet, so use the kernel log buffer from userspace.
 log() {
-	printf "<5>qca6564: $1\n" >/dev/kmsg
+	printf "<$1>qca6564: $2\n" >/dev/kmsg
 }
 
 # Do nothing if the module is already loaded
@@ -60,7 +60,7 @@ case "${DTB_REGION_CODE}" in
 		REGULATORY_DOMAIN="${DTB_REGION_CODE}";;
 	*)
 		if [ -n "${DTB_REGION_CODE}" ]; then
-			log "[WARN] Invalid region code in device tree, using OTP value"
+			log "5" "[WARN] Invalid region code in device tree, using OTP value"
 		fi
 		REGULATORY_DOMAIN="${OTP_REGION_CODE}";;
 esac
@@ -74,19 +74,19 @@ esac
 	BDATA_SOURCE="bdwlan30_US.bin"
 	case "${REGULATORY_DOMAIN}" in
 		${US_CODE})
-			log "Setting US wireless region";;
+			log "5" "Setting US wireless region";;
 		${WW_CODE}|${JP_CODE})
 			if [ -f "bdwlan30_World.bin" ]; then
-				log "Setting WW (world wide) wireless region"
+				log "5" "Setting WW (world wide) wireless region"
 				BDATA_SOURCE="bdwlan30_World.bin"
 			else
-				log "[WARN] No WW (worldwide) board data file, using US"
+				log "5" "[WARN] No WW (worldwide) board data file, using US"
 			fi
 			;;
 		"")
-			log "[WARN] region code not found, using US";;
+			log "5" "[WARN] region code not found, using US";;
 		*)
-			log "[WARN] Invalid region code, using US";;
+			log "5" "[WARN] Invalid region code, using US";;
 	esac
 
 	# We don't want to rewrite NAND every time we boot so only
@@ -100,12 +100,16 @@ esac
 )
 
 # Load the wireless module with the params defined in modprobe.d/qualcomm.conf
+# and reduce the console log level to avoid debug messages at boot time
+LOGLEVEL="$(sed -ne 's,^kernel.printk[^=]*=[[:blank:]]*\(.*\)$,\1,g;T;p' /etc/sysctl.conf 2>/dev/null)"
+[ -n "${LOGLEVEL}" ] && sysctl -q -w kernel.printk="${LOGLEVEL}"
 modprobe wlan
 
 # Verify the interface is present
 if [ -d "/sys/class/net/wlan0" ]; then
 	# Create 'wlan1' virtual interface
-	virtwlans.sh
+	VIRTWLANS_OUT="$(virtwlans.sh)"
+	[ -n "${VIRTWLANS_OUT}" ] && log "3" "${VIRTWLANS_OUT}"
 else
-	log "[ERROR] Loading qca6564 module"
+	log "3" "[ERROR] Loading qca6564 module"
 fi

meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig

@@ -274,6 +274,7 @@ CONFIG_USB_GADGET=y
 CONFIG_USB_ETH=m
 CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_SERIAL=m
+CONFIG_USB_CDC_COMPOSITE=m
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y

meta-digi-dey/conf/distro/dey.conf

@@ -24,6 +24,7 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DE
 # Removed DISTRO_FEATURES
 #   'wayland' -> not supported at the moment
 #   'ptest'   -> fails to build QT5 toolchain
+DISTRO_FEATURES_DEFAULT_remove = "3g nfc nfs zeroconf"
 POKY_DEFAULT_DISTRO_FEATURES_remove = "ptest wayland"
 
 GRAPHICAL_BACKEND = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'fb', d)}"

meta-digi-dey/recipes-connectivity/hostapd/hostapd/ccimx6ul/hostapd_wlan1.conf

@@ -16,7 +16,3 @@ hw_mode=a
 channel=36
 ieee80211ac=1
 ieee80211n=1
-
-# IEEE 802.11d - Country Code
-ieee80211d=1
-country_code=US

meta-digi-dey/recipes-connectivity/hostapd/hostapd/hostapd_wlan0.conf

@@ -16,7 +16,3 @@ hw_mode=a
 channel=36
 ieee80211ac=1
 ieee80211n=1
-
-# IEEE 802.11d - Country Code
-ieee80211d=1
-country_code=US

meta-digi-dey/recipes-connectivity/hostapd/hostapd/init

@@ -34,7 +34,7 @@ case "$1" in
 	;;
     stop)
 	echo -n "Stopping $DESC: "
-	start-stop-daemon -K --oknodo -x $DAEMON -p ${PIDFILE}
+	start-stop-daemon -K --oknodo -q -x $DAEMON -p ${PIDFILE}
 	echo "$NAME."
 	;;
     restart)

meta-digi-dey/recipes-connectivity/libmbim/libmbim_%.bbappend

@@ -1,3 +1,3 @@
 # Copyright (C) 2017 Digi International Inc.
 
-RDEPENDS_${PN} += "glibc-gconv-utf-16"
+RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16"

meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/78-mm-digi-xbee-cellular.rules

@@ -4,10 +4,10 @@ ACTION!="add|change|move", GOTO="mm_digi_xbee_cellular_modem_end"
 # baudrates may be used by setting the ID_MM_TTY_BAUDRATE udev tag.
 
 # ConnectCore 6 SBC
-DEVPATH=="/devices/soc0/soc.0/2100000.aips-bus/21f4000.serial/tty/ttymxc4", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1"
+DEVPATH=="/devices/soc0/soc.0/2100000.aips-bus/21f4000.serial/tty/ttymxc4", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular"
-DEVPATH=="/devices/soc0/soc/2100000.aips-bus/21f4000.serial/tty/ttymxc4", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1"
+DEVPATH=="/devices/soc0/soc/2100000.aips-bus/21f4000.serial/tty/ttymxc4", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular"
 
 # ConnectCore 6UL SBC Pro
-DEVPATH=="/devices/platform/soc/2100000.aips-bus/21e8000.serial/tty/ttymxc1", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1"
+DEVPATH=="/devices/platform/soc/2100000.aips-bus/21e8000.serial/tty/ttymxc1", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular"
 
 LABEL="mm_digi_xbee_cellular_modem_end"

meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/NetworkManager.conf

@@ -1,9 +1,13 @@
 [main]
 plugins=ifupdown,keyfile
 no-auto-default=type:ethernet
+rc-manager=file
 
 [ifupdown]
 managed=false
 
 [keyfile]
-unmanaged-devices=interface-name:p2p0;interface-name:wlan1
+unmanaged-devices=interface-name:p2p*;interface-name:wlan1
+
+[device]
+wifi.scan-rand-mac-address=no

meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/networkmanager-init

@@ -8,7 +8,7 @@ case "${1}" in
 	start)
 		mkdir -p /var/run/NetworkManager
 		echo -n "Starting ${DESC}: "
-		${DAEMON}
+		${DAEMON} && (sleep 40 && mmcli --scan-modems 1>/dev/null 2>&1) &
 		echo "done"
 		;;
 	stop)

meta-digi-dey/recipes-connectivity/networkmanager/networkmanager/nm.cellular

@@ -9,5 +9,9 @@ password=##CELLULAR_PASSWORD##
 pin=##CELLULAR_PIN##
 username=##CELLULAR_USER##
 
+[ppp]
+lcp-echo-failure=3
+lcp-echo-interval=5
+
 [ipv6]
 method=ignore

meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend

@@ -14,13 +14,16 @@ SRC_URI += " \
     file://nm.wlan0.static \
 "
 
-# 'polkit' and 'consolekit' require 'x11' distro feature, so disable them for non-X11 distros
+# 'polkit' depends on 'consolekit', and this requires 'x11' distro feature. So
-DEPENDS_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'polkit', d)}"
+# disable those compile time options to be able to build for framebuffer
-PACKAGECONFIG_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'consolekit', d)}"
+# based images.
-EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '--enable-polkit=disabled', d)}"
+DEPENDS_remove = "polkit"
+EXTRA_OECONF += "--enable-polkit=disabled"
+PACKAGECONFIG_remove = "consolekit"
 
-PACKAGECONFIG_remove = "dnsmasq netconfig"
+# Adjust other compile time options to save space
-PACKAGECONFIG_append = " concheck modemmanager ppp"
+PACKAGECONFIG_remove = "dnsmasq netconfig nss"
+PACKAGECONFIG_append = " concheck gnutls modemmanager ppp"
 
 #
 # NetworkManager only accepts IP addresses in CIDR format

meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_1.8.2.bb

@@ -0,0 +1,117 @@
+SUMMARY = "NetworkManager is a network management framework"
+DESCRIPTION = "NetworkManager is a system network service that manages \
+your network devices and connections, attempting to keep active network \
+connectivity when available."
+HOMEPAGE = "http://www.gnome.org/projects/NetworkManager/"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = " \
+    file://COPYING;md5=cbbffd568227ada506640fe950a4823b \
+    file://libnm-util/COPYING;md5=1c4fa765d6eb3cd2fbd84344a1b816cd \
+    file://docs/api/html/license.html;md5=eb0c003714e5391000fdfd9c9615cccf \
+"
+
+DEPENDS = " \
+    intltool-native \
+    libnl \
+    dbus \
+    dbus-glib \
+    dbus-glib-native \
+    libgudev \
+    util-linux \
+    libndp \
+    libnewt \
+    polkit \
+    jansson \
+    python3-pygobject-native \
+"
+
+inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection
+
+SRC_URI = "${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz"
+SRC_URI[md5sum] = "1acf7a551905ae85d9987aadbb5f7205"
+SRC_URI[sha256sum] = "71a5efcd9e4c237ab57b2893ccc8f91f884ace3bec0e2bd4b31a4c9677ff1bf4"
+
+S = "${WORKDIR}/NetworkManager-${PV}"
+
+PACKAGECONFIG ??= "nss ifupdown netconfig dhclient dnsmasq \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wifi', '', d)} \
+"
+PACKAGECONFIG[systemd] = " \
+    --with-systemdsystemunitdir=${systemd_unitdir}/system --with-session-tracking=systemd --enable-polkit, \
+    --without-systemdsystemunitdir, \
+    polkit \
+"
+PACKAGECONFIG[bluez5] = "--enable-bluez5-dun,--disable-bluez5-dun,bluez5"
+# consolekit is not picked by shlibs, so add it to RDEPENDS too
+PACKAGECONFIG[consolekit] = "--with-session-tracking=consolekit,,consolekit,consolekit"
+PACKAGECONFIG[concheck] = "--enable-concheck,--disable-concheck,curl"
+PACKAGECONFIG[modemmanager] = "--with-modem-manager-1=yes,--with-modem-manager-1=no,modemmanager"
+PACKAGECONFIG[ppp] = "--enable-ppp,--disable-ppp,ppp,ppp"
+# Use full featured dhcp client instead of internal one
+PACKAGECONFIG[dhclient] = "--with-dhclient=${base_sbindir}/dhclient,,,dhcp-client"
+PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq"
+PACKAGECONFIG[nss] = "--with-crypto=nss,,nss"
+PACKAGECONFIG[gnutls] = "--with-crypto=gnutls,,gnutls"
+PACKAGECONFIG[wifi] = "--enable-wifi=yes,--enable-wifi=no,wireless-tools,wpa-supplicant wireless-tools"
+PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown"
+PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no"
+PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free"
+
+EXTRA_OECONF = " \
+    --disable-ifcfg-rh \
+    --disable-ifnet \
+    --disable-ifcfg-suse \
+    --disable-more-warnings \
+    --with-iptables=${sbindir}/iptables \
+    --with-tests \
+    --with-nmtui=yes \
+    --with-udev-dir=${base_libdir}/udev \
+"
+
+do_compile_prepend() {
+	export GIR_EXTRA_LIBS_PATH="${B}/libnm/.libs:${B}/libnm-glib/.libs:${B}/libnm-util/.libs"
+}
+
+PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-nmtui ${PN}-nmtui-doc ${PN}-adsl"
+
+FILES_libnmutil += "${libdir}/libnm-util.so.*"
+FILES_libnmglib += "${libdir}/libnm-glib.so.*"
+FILES_libnmglib-vpn += "${libdir}/libnm-glib-vpn.so.*"
+
+FILES_${PN}-adsl = "${libdir}/NetworkManager/libnm-device-plugin-adsl.so"
+
+FILES_${PN} += " \
+    ${libexecdir} \
+    ${libdir}/pppd/*/nm-pppd-plugin.so \
+    ${libdir}/NetworkManager/*.so \
+    ${libdir}/NetworkManager/conf.d \
+    ${libdir}/NetworkManager/VPN \
+    ${datadir}/polkit-1 \
+    ${datadir}/dbus-1 \
+    ${base_libdir}/udev/* \
+    ${systemd_unitdir}/system \
+"
+
+FILES_${PN}-dev += " \
+    ${datadir}/NetworkManager/gdb-cmd \
+    ${libdir}/pppd/*/*.la \
+    ${libdir}/NetworkManager/*.la \
+"
+
+FILES_${PN}-nmtui = " \
+    ${bindir}/nmtui \
+    ${bindir}/nmtui-edit \
+    ${bindir}/nmtui-connect \
+    ${bindir}/nmtui-hostname \
+"
+
+FILES_${PN}-nmtui-doc = " \
+    ${mandir}/man1/nmtui* \
+"
+
+RRECOMMENDS_${PN} += "iptables ${@bb.utils.contains('PACKAGECONFIG', 'dnsmasq', 'dnsmasq', '', d)}"
+RCONFLICTS_${PN} = "connman"
+
+SYSTEMD_SERVICE_${PN} = "NetworkManager.service NetworkManager-dispatcher.service"

meta-digi-dey/recipes-connectivity/ppp/ppp-2.4.7/mm_cellular

@@ -1,26 +0,0 @@
-# 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
-
-# Replace default route if already exists.
-replacedefaultroute
-
-# Makes pppd "dial again" when the connection is lost.
-persist
-
-# Do not ask the remote to authenticate.
-noauth
-
-# Detach 'pppd' from its controlling terminal
-updetach
-
-# Don't use the modem control lines
-local
-
-# Lock the device to ensure exclusive access
-lock

meta-digi-dey/recipes-connectivity/ppp/ppp_2.4.7.bbappend

@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+# Copyright (C) 2017 Digi International Inc.
-
-SRC_URI += "file://mm_cellular"
 
 do_install_append() {
-        mkdir -p ${D}${sysconfdir}/ppp/peers
+	# NetworkManager manages the 'resolv.conf' file globally, so
-        install -m 0755 ${WORKDIR}/mm_cellular ${D}${sysconfdir}/ppp/peers/mm_cellular
+	# remove the 'pppd' specific scripts for DNS.
+	rm -f ${D}${sysconfdir}/ppp/ip-up.d/08setupdns
+	rm -f ${D}${sysconfdir}/ppp/ip-down.d/92removedns
 }

meta-digi-dey/recipes-core/busybox/busybox-1.24.1/defconfig

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.23.2
+# Busybox version: 1.24.1
-# Fri Oct 23 17:59:44 2015
+# Wed Jul 26 16:56:27 2017
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -156,6 +156,7 @@ CONFIG_BZIP2=y
 CONFIG_GZIP=y
 CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
 CONFIG_GZIP_FAST=0
+# CONFIG_FEATURE_GZIP_LEVELS is not set
 # CONFIG_LZOP is not set
 # CONFIG_LZOP_COMPR_HIGH is not set
 # CONFIG_RPM is not set
@@ -183,10 +184,17 @@ CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
 CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_FEATURE_DD_STATUS=y
 CONFIG_HOSTID=y
 CONFIG_ID=y
 CONFIG_GROUPS=y
 CONFIG_SHUF=y
+CONFIG_SYNC=y
+CONFIG_FEATURE_SYNC_FANCY=y
 CONFIG_TEST=y
 CONFIG_FEATURE_TEST_64=y
 CONFIG_TOUCH=y
@@ -195,6 +203,7 @@ CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUNCATE=y
 CONFIG_UNLINK=y
 CONFIG_BASE64=y
 CONFIG_WHO=y
@@ -211,10 +220,6 @@ CONFIG_CKSUM=y
 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 is not set
-CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_DF=y
 CONFIG_FEATURE_DF_FANCY=y
 CONFIG_DIRNAME=y
@@ -283,7 +288,6 @@ CONFIG_STAT=y
 CONFIG_FEATURE_STAT_FORMAT=y
 CONFIG_STTY=y
 CONFIG_SUM=y
-CONFIG_SYNC=y
 CONFIG_TAC=y
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
@@ -292,6 +296,7 @@ CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
 CONFIG_TRUE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
+CONFIG_UNAME_OSNAME="GNU/Linux"
 CONFIG_UNEXPAND=y
 CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
 CONFIG_UNIQ=y
@@ -444,18 +449,18 @@ CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
 # 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_FEATURE_CALL_TELINIT=y
-CONFIG_TELINIT_PATH=""
+CONFIG_TELINIT_PATH="/sbin/telinit"
-CONFIG_INIT=y
+# CONFIG_INIT is not set
-CONFIG_FEATURE_USE_INITTAB=y
+# CONFIG_FEATURE_USE_INITTAB is not set
-CONFIG_FEATURE_KILL_REMOVED=y
+# CONFIG_FEATURE_KILL_REMOVED is not set
 CONFIG_FEATURE_KILL_DELAY=0
-CONFIG_FEATURE_INIT_SCTTY=y
+# CONFIG_FEATURE_INIT_SCTTY is not set
-CONFIG_FEATURE_INIT_SYSLOG=y
+# CONFIG_FEATURE_INIT_SYSLOG is not set
-CONFIG_FEATURE_EXTRA_QUIET=y
+# CONFIG_FEATURE_EXTRA_QUIET is not set
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 # CONFIG_FEATURE_INITRD is not set
-CONFIG_INIT_TERMINAL_TYPE="linux"
+CONFIG_INIT_TERMINAL_TYPE=""
 # CONFIG_MESG is not set
 # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
 
@@ -549,7 +554,18 @@ CONFIG_FEATURE_MDEV_RENAME=y
 CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+CONFIG_FEATURE_MOUNT_VERBOSE=y
+CONFIG_FEATURE_MOUNT_HELPERS=y
+CONFIG_FEATURE_MOUNT_LABEL=y
+CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+CONFIG_FEATURE_MOUNT_OTHERTAB=y
 CONFIG_REV=y
+CONFIG_UEVENT=y
 CONFIG_ACPID=y
 CONFIG_FEATURE_ACPID_COMPAT=y
 CONFIG_BLKID=y
@@ -595,15 +611,6 @@ CONFIG_LSUSB=y
 CONFIG_MKSWAP=y
 CONFIG_FEATURE_MKSWAP_UUID=y
 CONFIG_MORE=y
-CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_FAKE=y
-CONFIG_FEATURE_MOUNT_VERBOSE=y
-CONFIG_FEATURE_MOUNT_HELPERS=y
-CONFIG_FEATURE_MOUNT_LABEL=y
-CONFIG_FEATURE_MOUNT_NFS=y
-CONFIG_FEATURE_MOUNT_CIFS=y
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
 CONFIG_PIVOT_ROOT=y
 CONFIG_RDATE=y
 # CONFIG_RDEV is not set
@@ -660,10 +667,15 @@ CONFIG_CROND=y
 CONFIG_FEATURE_CROND_D=y
 # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
 CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
+CONFIG_I2CGET=y
+CONFIG_I2CSET=y
+CONFIG_I2CDUMP=y
+CONFIG_I2CDETECT=y
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
 CONFIG_FEATURE_LESS_BRACKETS=y
 CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_TRUNCATE=y
 CONFIG_FEATURE_LESS_MARKS=y
 CONFIG_FEATURE_LESS_REGEXP=y
 CONFIG_FEATURE_LESS_WINCH=y
@@ -758,6 +770,13 @@ CONFIG_NC_EXTRA=y
 CONFIG_PING=y
 CONFIG_PING6=y
 CONFIG_FEATURE_FANCY_PING=y
+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_FEATURE_WGET_OPENSSL=y
+CONFIG_FEATURE_WGET_SSL_HELPER=y
 CONFIG_WHOIS=y
 CONFIG_FEATURE_IPV6=y
 # CONFIG_FEATURE_UNIX_LOCAL is not set
@@ -819,6 +838,7 @@ CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y
 # CONFIG_FEATURE_IP_ADDRESS is not set
 # CONFIG_FEATURE_IP_LINK is not set
 # CONFIG_FEATURE_IP_ROUTE is not set
+CONFIG_FEATURE_IP_ROUTE_DIR=""
 # CONFIG_FEATURE_IP_TUNNEL is not set
 # CONFIG_FEATURE_IP_RULE is not set
 # CONFIG_FEATURE_IP_SHORT_FORMS is not set
@@ -885,11 +905,6 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 CONFIG_UDPSVD=y
 # 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=y
 
 #

meta-digi-dey/recipes-core/images/core-image-base.bbappend

@@ -17,3 +17,6 @@ SDKIMAGE_FEATURES ?= "dev-pkgs dbg-pkgs staticdev-pkgs"
 
 # Add our dey-image tweaks to the final image (like /etc/build info)
 inherit dey-image
+
+# Do not install udev-cache
+BAD_RECOMMENDATIONS += "udev-cache"

meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown-1.0/ccimx6ul/virtwlans.sh

@@ -21,8 +21,7 @@ if [ -s "/proc/device-tree/wireless/mac-address1" ] &&
    [ -s "/proc/device-tree/wireless/mac-address3" ]; then
    :
 else
-	echo "WARNING: Using default MAC addresses for virtual interfaces, please "
+	echo "[WARN] Using default MAC addresses for virtual interfaces, please program them referring to the Digi U-Boot Documentation"
-	echo "program them referring to the Digi U-Boot Documentation"
 fi
 
 if [ ! -d "/sys/class/net/wlan1" ]; then

meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo

@@ -274,8 +274,8 @@ fi
 
 IOEXP_NODE="/sys/devices/platform/soc/2100000.aips-bus/21a0000.i2c/i2c-0/0-006e"
 if [ -d "$IOEXP_NODE" ]; then
-	IOEXP_HW_VERSION=$(cat ${IOEXP_NODE}/hw_version) || IOEXP_HW_VERSION="??"
+	IOEXP_HW_VERSION=$(cat ${IOEXP_NODE}/hw_version 2>/dev/null) || IOEXP_HW_VERSION="??"
-	IOEXP_FW_VERSION=$(cat ${IOEXP_NODE}/fw_version) || IOEXP_FW_VERSION="??"
+	IOEXP_FW_VERSION=$(cat ${IOEXP_NODE}/fw_version 2>/dev/null) || IOEXP_FW_VERSION="??"
 	IOEXP_VERSION="HW_VERSION=${IOEXP_HW_VERSION}  FW_VERSION=${IOEXP_FW_VERSION}"
 fi
 

meta-digi-dey/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend

@@ -0,0 +1,3 @@
+# Copyright (C) 2017, Digi International Inc.
+
+RDEPENDS_${PN} += "nativesdk-python3-json"

sdk/build.sh

@@ -166,13 +166,13 @@ while read _pl _var _tgt; do
 		fi
 	fi
 	[ -n "${DY_TARGET}" ] && _tgt="${DY_TARGET}" || true
-	eval "${_pl}_var=\"${_var}\""
+	eval "${_pl}_var=\"${_var//,/ }\""
-	eval "${_pl}_tgt=\"${_tgt}\""
+	eval "${_pl}_tgt=\"${_tgt//,/ }\""
 done<<-_EOF_
-	ccardimx28js      - e w wb web web1   dey-image-qt
+	ccardimx28js      -,e,w,wb,web,web1   dey-image-qt
-	ccimx6sbc         DONTBUILDVARIANTS   dey-image-qt
+	ccimx6sbc         DONTBUILDVARIANTS   dey-image-qt,dey-image-aws
-	ccimx6ulsbc       DONTBUILDVARIANTS   dey-image-qt
+	ccimx6ulsbc       DONTBUILDVARIANTS   dey-image-qt,dey-image-aws
-	ccimx6ulstarter   DONTBUILDVARIANTS   core-image-base
+	ccimx6ulstarter   DONTBUILDVARIANTS   core-image-base,dey-image-aws
 	ccimx6ulsom       DONTBUILDVARIANTS   dey-image-mft-module-min
 	ccimx6ulrftest    DONTBUILDVARIANTS   dey-image-mft-module-rf
 _EOF_