summaryrefslogtreecommitdiff
path: root/recipes-core/images/mlinux-mtcap-test-image.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/images/mlinux-mtcap-test-image.bb')
-rw-r--r--recipes-core/images/mlinux-mtcap-test-image.bb7
1 files changed, 7 insertions, 0 deletions
diff --git a/recipes-core/images/mlinux-mtcap-test-image.bb b/recipes-core/images/mlinux-mtcap-test-image.bb
index 57808cf..bc0d44d 100644
--- a/recipes-core/images/mlinux-mtcap-test-image.bb
+++ b/recipes-core/images/mlinux-mtcap-test-image.bb
@@ -76,6 +76,13 @@ MISC_FEATURES = "minicom lrzsz nano uxfp"
# Someday add wifi features
# ${WIFI_FEATURES}
#
+<<<<<<< HEAD
+=======
+IMAGE_INSTALL_append = " gpsd gpsd-conf gpsd-gpsctl libgps ntp ntp-utils gpspipe gps-utils"
+
+IMAGE_INSTALL_append = " pps-tools"
+
+>>>>>>> 28ec5c7... gpsd-conf must now be added separately to start gpsd automatically
IMAGE_INSTALL += " \
${FILESYSTEM_FEATURES} \
${TIME_FEATURES} \