Merge branch 'ap/temp' into mtre-dunfell

8 files changed, 9 insertions, 6 deletions

diff --git a/recipes-core/images/mlinux-base-image.bb b/recipes-core/images/mlinux-base-image.bb
index e61a7f7..3bdbd77 100644
--- a/recipes-core/images/mlinux-base-image.bb
+++ b/recipes-core/images/mlinux-base-image.bb
@@ -37,7 +37,7 @@ BLUETOOTH_INIT ??= "bluez5-mlinit"
 
 # 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 \
+TIME_FEATURES = "tzdata-core tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
 				 tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
 				 tzdata-misc \
 				 cronie \
diff --git a/recipes-core/images/mlinux-mtcap-commissioning-image.bb b/recipes-core/images/mlinux-mtcap-commissioning-image.bb
index b1edd03..1a86488 100644
--- a/recipes-core/images/mlinux-mtcap-commissioning-image.bb
+++ b/recipes-core/images/mlinux-mtcap-commissioning-image.bb
@@ -14,4 +14,5 @@ LIGHTTPD = "lighttpd \
 IMAGE_INSTALL += "${LIGHTTPD}"
 IMAGE_INSTALL_append = " commissioning commissioning-php-fpm"
 IMAGE_INSTALL_remove = "useradd"
+IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils"
 ROOTFS_POSTPROCESS_COMMAND_remove = "mlinux_set_root_password;"
diff --git a/recipes-core/images/mlinux-mtcap-image.bb b/recipes-core/images/mlinux-mtcap-image.bb
index c298a86..aae9076 100644
--- a/recipes-core/images/mlinux-mtcap-image.bb
+++ b/recipes-core/images/mlinux-mtcap-image.bb
@@ -26,7 +26,7 @@ NETWORKING_FEATURES_append = " \
                        busybox-ifplugd \
                        "
 
-TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
+TIME_FEATURES = "tzdata-core tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
                  tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
                  tzdata-misc \
                  cronie \
diff --git a/recipes-core/images/mlinux-mtcap-test-image.bb b/recipes-core/images/mlinux-mtcap-test-image.bb
index c2b83bb..318c20b 100644
--- a/recipes-core/images/mlinux-mtcap-test-image.bb
+++ b/recipes-core/images/mlinux-mtcap-test-image.bb
@@ -39,7 +39,7 @@ NETWORKING_FEATURES += "bridge-utils \
 # No accessory cards for MTAC
 MULTITECH_MTAC = ""
 
-TIME_FEATURES = "tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
+TIME_FEATURES = "tzdata-core tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
                  tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
                  tzdata-misc \
                  cronie \
@@ -62,6 +62,7 @@ MULTITECH_FEATURES += " \
                  cell-radio-carrierswitch \
                  jsparser \
                  protobuf \
+                 mts-io-skipcharge \
                  "
 
 IMAGE_INSTALL += "lora-gateway-utils \
diff --git a/recipes-core/images/mlinux-mtr-image.bb b/recipes-core/images/mlinux-mtr-image.bb
index 863e63d..c817a30 100644
--- a/recipes-core/images/mlinux-mtr-image.bb
+++ b/recipes-core/images/mlinux-mtr-image.bb
@@ -44,7 +44,7 @@ BLUETOOTH_FEATURES = "bluez5 bluez5-pand"
 
 # 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 \
+TIME_FEATURES = "tzdata-core tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
 				 tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
 				 tzdata-misc \
 				 cronie \
diff --git a/recipes-core/images/mlinux-mtrv1-image.bb b/recipes-core/images/mlinux-mtrv1-image.bb
index 15d7c0f..5a0a32d 100644
--- a/recipes-core/images/mlinux-mtrv1-image.bb
+++ b/recipes-core/images/mlinux-mtrv1-image.bb
@@ -42,7 +42,7 @@ BLUETOOTH_FEATURES = "bluez5 bluez5-pand"
 
 # 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 \
+TIME_FEATURES = "tzdata-core tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
 				 tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
 				 tzdata-misc \
 				 cronie \
diff --git a/recipes-core/images/mlinux-rs9113-mtrv1-image.bb b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb
index 4d6e452..583a4e6 100644
--- a/recipes-core/images/mlinux-rs9113-mtrv1-image.bb
+++ b/recipes-core/images/mlinux-rs9113-mtrv1-image.bb
@@ -44,7 +44,7 @@ BLUETOOTH_FEATURES = "bluez5 bluez5-pand"
 
 # 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 \
+TIME_FEATURES = "tzdata-core tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic \
 				 tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific \
 				 tzdata-misc \
 				 cronie \
diff --git a/recipes-core/images/mtcap-modules.inc b/recipes-core/images/mtcap-modules.inc
index 0980aa9..94c7cf1 100644
--- a/recipes-core/images/mtcap-modules.inc
+++ b/recipes-core/images/mtcap-modules.inc
@@ -9,6 +9,7 @@ include common-modules.inc
 
 IMAGE_INSTALL_append_mtcap = "\
     kernel-module-spi-atmel \
+    kernel-module-tmp102 \
 "
 # Modules for mtrv1 and mtr