summaryrefslogtreecommitdiff
path: root/recipes-core
diff options
context:
space:
mode:
authorJason Reiss <jreiss@multitech.com>2017-01-17 14:32:25 -0600
committerJason Reiss <jreiss@multitech.com>2017-01-17 14:32:25 -0600
commitbf44a677041abcef9f224de290fcd5ad4cf37ea8 (patch)
tree263308ac22db5128374d26c857d12d1a79a251e8 /recipes-core
parente16cbd0bf5b2985cd78a26a82868d5cd3eb96da2 (diff)
parent3959907c3a6a8d78368de3c624155260a2d418fe (diff)
downloadmeta-mlinux-bf44a677041abcef9f224de290fcd5ad4cf37ea8.tar.gz
meta-mlinux-bf44a677041abcef9f224de290fcd5ad4cf37ea8.tar.bz2
meta-mlinux-bf44a677041abcef9f224de290fcd5ad4cf37ea8.zip
Merge branch 'master' of gitlab.multitech.net:mirrors/meta-mlinux
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/busybox/busybox-1.22.1/defconfig4
-rw-r--r--recipes-core/images/mlinux-factory-image.bb4
2 files changed, 5 insertions, 3 deletions
diff --git a/recipes-core/busybox/busybox-1.22.1/defconfig b/recipes-core/busybox/busybox-1.22.1/defconfig
index 0387a9d..aa1e514 100644
--- a/recipes-core/busybox/busybox-1.22.1/defconfig
+++ b/recipes-core/busybox/busybox-1.22.1/defconfig
@@ -570,8 +570,8 @@ CONFIG_HEXDUMP=y
CONFIG_HWCLOCK=y
CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
CONFIG_LOSETUP=y
# CONFIG_LSPCI is not set
# CONFIG_LSUSB is not set
diff --git a/recipes-core/images/mlinux-factory-image.bb b/recipes-core/images/mlinux-factory-image.bb
index 6ce05ab..b8d2676 100644
--- a/recipes-core/images/mlinux-factory-image.bb
+++ b/recipes-core/images/mlinux-factory-image.bb
@@ -80,6 +80,8 @@ IMAGE_INSTALL += "sms-utils"
# Multi-Tech GPS Utility
IMAGE_INSTALL += "venus-gps"
IMAGE_INSTALL += "pps-tools"
-IMAGE_INSTALL += "gpsd"
+
+# When ntp is to use the GPS, gps-utils is required
+IMAGE_INSTALL += "gpsd ntp ntp-utils gps-utils gpsd-udev"
IMAGE_INSTALL += "uvccapture"