From f4a701c4f92bcfa1074beaf94b6a81e10e606dd0 Mon Sep 17 00:00:00 2001
From: Patrick Murphy <Patrick.Murphy@multitech.com>
Date: Thu, 30 Apr 2020 13:04:00 -0500
Subject: moved 5.2.1 changes to master

---
 recipes-core/images/mlinux-commissioning-image.bb  |  7 ++
 recipes-core/images/mlinux-factory-test-image.bb   |  8 ++
 .../images/mlinux-mtcap-commissioning-image.bb     |  7 ++
 recipes-core/images/mlinux-mtcap-test-image.bb     | 87 ++++++++++++++++++++++
 4 files changed, 109 insertions(+)
 create mode 100644 recipes-core/images/mlinux-commissioning-image.bb
 create mode 100644 recipes-core/images/mlinux-factory-test-image.bb
 create mode 100644 recipes-core/images/mlinux-mtcap-commissioning-image.bb
 create mode 100644 recipes-core/images/mlinux-mtcap-test-image.bb

(limited to 'recipes-core/images')

diff --git a/recipes-core/images/mlinux-commissioning-image.bb b/recipes-core/images/mlinux-commissioning-image.bb
new file mode 100644
index 0000000..5ba16a6
--- /dev/null
+++ b/recipes-core/images/mlinux-commissioning-image.bb
@@ -0,0 +1,7 @@
+require mlinux-rs9113-factory-image.bb
+DESCRIPTION = "mLinux factory image with commissioning support"
+
+# Extra stuff to install
+IMAGE_INSTALL_append = " dnsmasq bluez5-noinst-tools python-dbus commissioning commissioning-php-fpm rs9113-rm"
+IMAGE_INSTALL_remove = "useradd"
+ROOTFS_POSTPROCESS_COMMAND_remove = "mlinux_set_root_password;"
diff --git a/recipes-core/images/mlinux-factory-test-image.bb b/recipes-core/images/mlinux-factory-test-image.bb
new file mode 100644
index 0000000..82ed75d
--- /dev/null
+++ b/recipes-core/images/mlinux-factory-test-image.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "mLinux factory test image"
+LICENSE = "MIT"
+
+require mlinux-factory-image.bb
+
+IMAGE_INSTALL_append = " i2c-tools spitools "
+#Open console for testing
+CONSOLE = "sysvinit-inittab-start-open"
diff --git a/recipes-core/images/mlinux-mtcap-commissioning-image.bb b/recipes-core/images/mlinux-mtcap-commissioning-image.bb
new file mode 100644
index 0000000..9e933b1
--- /dev/null
+++ b/recipes-core/images/mlinux-mtcap-commissioning-image.bb
@@ -0,0 +1,7 @@
+require mlinux-mtcap-image.bb
+DESCRIPTION = "mtcap image with commissioning support"
+
+#install
+IMAGE_INSTALL_append = " commissioning commissioning-php-fpm"
+IMAGE_INSTALL_remove = "useradd"
+ROOTFS_POSTPROCESS_COMMAND_remove = "mlinux_set_root_password;"
diff --git a/recipes-core/images/mlinux-mtcap-test-image.bb b/recipes-core/images/mlinux-mtcap-test-image.bb
new file mode 100644
index 0000000..58e2448
--- /dev/null
+++ b/recipes-core/images/mlinux-mtcap-test-image.bb
@@ -0,0 +1,87 @@
+DESCRIPTION = "mLinux Conduit Access Point image"
+
+require mlinux-minimal-image.bb
+require mtcap-modules.inc
+
+# For now we don't put this in MTR or AEP
+# Password restrictions library from Redhat
+IMAGE_INSTALL += "libpwquality"
+
+
+# Test image features
+IMAGE_INSTALL += "i2c-tools \
+                  spitools \
+                 "
+
+FILESYSTEM_FEATURES = "dosfstools \
+                       cifs-utils \
+                       lsof \
+                       "
+
+NETWORKING_FEATURES += "bridge-utils \
+                       inetutils-ftp \
+                       openssl \
+                       rsync \
+                       iperf \
+                       mii-diag \
+                       tcpdump \
+                       netcat \
+                       wget \
+                       strongswan \
+                       busybox-ifplugd \
+                       "
+
+# No accessory cards for MTAC
+MULTITECH_MTAC = ""
+
+TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
+                 tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
+                 tzdata-misc \
+                 cronie \
+                 ntpdate \
+                 "
+
+WIFI_FEATURES = "libnl \
+                wpa-supplicant \
+                wireless-tools \
+                iw \
+                hostap-daemon hostap-utils \
+                wilc1000 \
+                "
+
+MULTITECH_FEATURES += " \
+                 u-boot-linux-utils \
+                 mlinux-scripts \
+                 reset-handler \
+                 radio-cmd radio-query \
+                 cell-radio-carrierswitch \
+                 jsparser \
+                 protobuf \
+                 annex-client \
+                 "
+
+IMAGE_INSTALL += "lora-gateway-utils \
+                  lora-query \
+                  lora-packet-forwarder \
+                  lora-network-server \
+                  logrotate \
+                  mosquitto mosquitto-clients \
+                 "
+
+MISC_FEATURES = "minicom lrzsz nano lxfp"
+
+# Extra stuff to install
+#   Someday add wifi features
+#               ${WIFI_FEATURES}
+#
+IMAGE_INSTALL += " \
+                ${FILESYSTEM_FEATURES} \
+                ${TIME_FEATURES} \
+                ${MISC_FEATURES} \
+                "
+
+# Open console for testing
+CONSOLE = "sysvinit-inittab-start-open"
+
+# Multi-Tech SMS Utility (see http://git.multitech.net)
+IMAGE_INSTALL += "sms-utils"
-- 
cgit v1.2.3