summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorJeff Hatch <jhatch@multitech.com>2019-05-08 10:52:00 -0500
committerJeff Hatch <jhatch@multitech.com>2019-05-08 10:52:00 -0500
commit59c967a1fccd46ebe0612df29840fc0280cfb133 (patch)
treefa0015742039669e00e1d6f0c1ba46a01a06ddce /conf
parent46c0dfd29d55c9db1d8b614d25f5b004e77cf148 (diff)
parent1eb511049142fe12e5ea4215fe7ce56abe1fdbc9 (diff)
downloadmeta-mlinux-59c967a1fccd46ebe0612df29840fc0280cfb133.tar.gz
meta-mlinux-59c967a1fccd46ebe0612df29840fc0280cfb133.tar.bz2
meta-mlinux-59c967a1fccd46ebe0612df29840fc0280cfb133.zip
Merge branch 'Linux4' of gitlab.multitech.net:mirrors/meta-mlinux into Linux4
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/mlinux.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index cb60ee5..8d9abde 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,7 +1,7 @@
DISTRO = "mlinux"
DISTRO_NAME = "mLinux"
DISTRO_BASE_VERSION = "5.0"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev29"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev33"
DISTRO_CODENAME = ""
SDK_VENDOR = "-mlinux"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
@@ -72,4 +72,4 @@ require java.inc
PREFERRED_VERSION_nodejs ?= "0.10.%"
PREFERRED_VERSION_nodejs-native ?= "0.10.%"
-PREFERRED_VERSION_gpsd ?= "3.18.1"
+PREFERRED_VERSION_gpsd ?= "3.16"