From 23e05b18c9cfd23b4ecde7e57a3d38a4878fddb8 Mon Sep 17 00:00:00 2001
From: Stefan Eichenberger <stefan.eichenberger@netmodule.com>
Date: Wed, 22 Feb 2017 15:08:49 +0100
Subject: [PATCH] nmrouter: add new images (prodtest, container and node-mqtt)

---
 recipes-core/images/nmcontainer-python3.bb    | 14 +++++++++++++
 ...r-minimal.bb => nmrouter-image-minimal.bb} | 20 +++++++++----------
 .../images/nmrouter-image-node-mqtt.bb        | 16 +++++++++++++++
 .../images/nmrouter-image-prodtest.bb         | 15 ++++++++++++++
 4 files changed, 55 insertions(+), 10 deletions(-)
 create mode 100644 recipes-core/images/nmcontainer-python3.bb
 rename recipes-core/images/{nmrouter-minimal.bb => nmrouter-image-minimal.bb} (55%)
 create mode 100644 recipes-core/images/nmrouter-image-node-mqtt.bb
 create mode 100644 recipes-core/images/nmrouter-image-prodtest.bb

diff --git a/recipes-core/images/nmcontainer-python3.bb b/recipes-core/images/nmcontainer-python3.bb
new file mode 100644
index 0000000..845e08c
--- /dev/null
+++ b/recipes-core/images/nmcontainer-python3.bb
@@ -0,0 +1,14 @@
+inherit image
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+SUMMARY = "nmcontainer image minimal python3"
+
+IMAGE_INSTALL = " \
+                python3 \
+                bluez5 \
+                "
+
+LICENSE = "MIT"
+
diff --git a/recipes-core/images/nmrouter-minimal.bb b/recipes-core/images/nmrouter-image-minimal.bb
similarity index 55%
rename from recipes-core/images/nmrouter-minimal.bb
rename to recipes-core/images/nmrouter-image-minimal.bb
index 1425381..ab2780f 100644
--- a/recipes-core/images/nmrouter-minimal.bb
+++ b/recipes-core/images/nmrouter-image-minimal.bb
@@ -2,22 +2,22 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = " wifi bluetooth"
 
 inherit image
 
+IMAGE_FEATURES = "debug-tweaks"
+
+KERNELDEPMODDEPEND = ""
+
 SUMMARY = "Minimal image for bringup"
 
-#IMAGE_FEATURES += " \
-#                "
-
-#IMAGE_INSTALL += " \
-#                lrzsz \
-#                devmem2 \
-#                "
-
+NO_RECOMMENDATIONS = "1"
 
 IMAGE_INSTALL = " \
     packagegroup-core-boot \
     e2fsprogs \
-    lrzsz \
     devmem2 \
+    util-linux-agetty \
+    systemd-serialgetty \
+    networkmanager \
+    modemmanager \
     "
-LICENSE = "BSD"
 
+LICENSE = "BSD"
diff --git a/recipes-core/images/nmrouter-image-node-mqtt.bb b/recipes-core/images/nmrouter-image-node-mqtt.bb
new file mode 100644
index 0000000..d6f49c7
--- /dev/null
+++ b/recipes-core/images/nmrouter-image-node-mqtt.bb
@@ -0,0 +1,16 @@
+require nmrouter-image.bb
+
+SUMMARY = "nmrouter image that includes node-red"
+
+IMAGE_INSTALL_append = " \
+                nodejs \
+                node-mqtt \
+                node-dbus \
+                python3 \
+                python3-pip \
+                python3-misc \
+                "
+
+IMAGE_INSTALL_remove = " \
+                python-pip \
+                "
diff --git a/recipes-core/images/nmrouter-image-prodtest.bb b/recipes-core/images/nmrouter-image-prodtest.bb
new file mode 100644
index 0000000..e682088
--- /dev/null
+++ b/recipes-core/images/nmrouter-image-prodtest.bb
@@ -0,0 +1,15 @@
+require nmrouter-image-minimal.bb
+
+IMAGE_INSTALL_append = " \
+    iperf \
+    python3 \
+    ti-wl18xx-calibrator \
+    linux-firmware-wl18xx \
+    fct \
+    nfs-utils \
+    "
+
+inherit extrausers
+EXTRA_USERS_PARAMS = "\
+     useradd -o -u 0 -g 0 -p '' -s /usr/bin/fct.sh fct; \
+     "