Merge remote-tracking branch 'origin/master' into Conduit_0.1

1 files changed, 48 insertions, 4 deletions

diff --git a/recipes-core/images/mlinux-picocell-image.bb b/recipes-core/images/mlinux-picocell-image.bb
index 09e0fd6..d839260 100644
--- a/recipes-core/images/mlinux-picocell-image.bb
+++ b/recipes-core/images/mlinux-picocell-image.bb
@@ -1,7 +1,51 @@
-require mlinux-base-image.bb
+DESCRIPTION = "mLinux PicoCell image"
+
+require mlinux-minimal-image.bb
+
+FILESYSTEM_FEATURES = "dosfstools \
+                       cifs-utils \
+                       lsof \
+                       "
+
+NETWORKING_FEATURES += "bridge-utils \
+                       inetutils-ftp \
+                       openssl \
+                       rsync \
+                       iperf \
+                       mii-diag \
+                       tcpdump \
+                       netcat \
+                       wget \
+                       strongswan \
+                       "
+
+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 \
+                 "
+
+MULTITECH_FEATURES += " \
+                 u-boot-linux-utils \
+                 mlinux-scripts \
+                 reset-handler \
+                 radio-cmd radio-query \
+                 jsparser \
+                 "
+
+LORA_FEATURES = "lora-packet-forwarder \
+                 lora-packet-forwarder-dbg"
+
+MISC_FEATURES = "minicom lrzsz nano"
+
+# Extra stuff to install
+IMAGE_INSTALL += " \
+                ${FILESYSTEM_FEATURES} \
+                ${TIME_FEATURES} \
+                ${LORA_FEATURES} \
+                ${MISC_FEATURES} \
+                "
 
 # Multi-Tech SMS Utility (see http://git.multitech.net)
 IMAGE_INSTALL += "sms-utils"
-
-# MQTT server
-IMAGE_INSTALL += "mosquitto mosquitto-clients"