Merge branch 'master' of gitlab.multitech.net:mirrors/meta-mlinux

5 files changed, 13 insertions, 70 deletions

diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb
index 6423237..6b19725 100644
--- a/recipes-core/images/mlinux-base-image.bb
+++ b/recipes-core/images/mlinux-base-image.bb
@@ -1,3 +1,4 @@
+# Conduit 0.0 or 0.1 without RS9113
 DESCRIPTION = "mLinux base image"
 LICENSE = "MIT"
 
@@ -51,10 +52,9 @@ MULTITECH_FEATURES += " \
 					 reset-handler \
 					 radio-cmd radio-query \
 					 jsparser \
-                     annex-client \
                      "
 
-MISC_FEATURES = "minicom lrzsz nano rs9113"
+MISC_FEATURES = "minicom lrzsz nano"
 
 # Extra stuff to install
 IMAGE_INSTALL += " \
diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb
index 6cc7197..0f8344e 100644
--- a/recipes-core/images/mlinux-factory-image.bb
+++ b/recipes-core/images/mlinux-factory-image.bb
@@ -1,3 +1,4 @@
+# Conduit 0.0 or 0.1 without RS9113
 require mlinux-base-image.bb
 
 LIGHTTPD = "lighttpd \
@@ -78,6 +79,7 @@ IMAGE_INSTALL += "nodejs nodejs-npm"
 IMAGE_INSTALL += "sms-utils"
 # Multi-Tech GPS Utility
 IMAGE_INSTALL += "venus-gps"
+IMAGE_INSTALL += "pps-tools"
+IMAGE_INSTALL += "gpsd"
 
 IMAGE_INSTALL += "uvccapture"
-
diff --git a/recipes-core/images/mlinux-rs9113-base-image.bb b/recipes-core/images/mlinux-rs9113-base-image.bb
new file mode 100644
index 0000000..a4e9f23
--- /dev/null
+++ b/recipes-core/images/mlinux-rs9113-base-image.bb
@@ -0,0 +1,5 @@
+require mlinux-base-image.bb
+DESCRIPTION = "mLinux base image"
+
+# Extra stuff to install
+IMAGE_INSTALL += " rs9113 "
diff --git a/recipes-core/images/mlinux-xrs9113-factory-image.bb b/recipes-core/images/mlinux-rs9113-factory-image.bb
index fe2e698..bf2beaa 100644
--- a/recipes-core/images/mlinux-xrs9113-factory-image.bb
+++ b/recipes-core/images/mlinux-rs9113-factory-image.bb
@@ -1,4 +1,4 @@
-require mlinux-xrs9113-base-image.bb
+require mlinux-rs9113-base-image.bb
 
 LIGHTTPD = "lighttpd \
             lighttpd-module-cgi lighttpd-module-indexfile \
@@ -78,6 +78,7 @@ IMAGE_INSTALL += "nodejs nodejs-npm"
 IMAGE_INSTALL += "sms-utils"
 # Multi-Tech GPS Utility
 IMAGE_INSTALL += "venus-gps"
+IMAGE_INSTALL += "pps-tools"
+IMAGE_INSTALL += "gpsd"
 
 IMAGE_INSTALL += "uvccapture"
-
diff --git a/recipes-core/images/mlinux-xrs9113-base-image.bb b/recipes-core/images/mlinux-xrs9113-base-image.bb
deleted file mode 100644
index b90903a..0000000
--- a/recipes-core/images/mlinux-xrs9113-base-image.bb
+++ /dev/null
@@ -1,65 +0,0 @@
-DESCRIPTION = "mLinux base image"
-LICENSE = "MIT"
-
-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 \
-                       "
-
-WIFI_FEATURES = " \
-                libnl \
-                wpa-supplicant \
-                wireless-tools \
-                iw \
-				hostap-daemon hostap-utils \
-                "
-
-BLUETOOTH_FEATURES = "bluez4"
-
-# Add all timezones available
-# ntpdate will sync time every 30 min by default via cron
-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 \
-                 "
-
-# u-boot-linux-utils: U-Boot environment access from Linux
-# mlinux-scripts: sample scripts for setting up Conduit for various tasks
-# reset-handler: default reset button handler
-# radio-cmd: supports cellular radio activation and other configuration commands
-# radio-query: queries cellular radio for common info (IMEI, RSSI, etc)
-# jsparser: command line tool to parse JSON files
-MULTITECH_FEATURES += " \
-                     u-boot-linux-utils \
-                     mlinux-scripts \
-					 reset-handler \
-					 radio-cmd radio-query \
-					 jsparser \
-                     "
-
-MISC_FEATURES = "minicom lrzsz nano"
-
-# Extra stuff to install
-IMAGE_INSTALL += " \
-				${WIFI_FEATURES} \
-				${BLUETOOTH_FEATURES} \
-				${FILESYSTEM_FEATURES} \
-                ${TIME_FEATURES} \
-                ${MISC_FEATURES} \
-                "