From ad7558982f72d8a378bb18f8f1340aaf6cc482bd Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Fri, 17 Jul 2020 02:19:35 -0500
Subject: Bump to 6.0.0dev6

---
 conf/distro/mlinux.conf | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'conf')

diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index 58d999e..c903762 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,9 +1,7 @@
 DISTRO = "mlinux"
 DISTRO_NAME = "mLinux"
-#DISTRO_BASE_VERSION = "5.0"
 DISTRO_BASE_VERSION = "6.0"
-#DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev34"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev1"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.dev6"
 DISTRO_CODENAME = ""
 SDK_VENDOR = "-mlinux"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
@@ -25,7 +23,7 @@ DISTRO_FEATURES_MLINUX = "argp largefile xattr \
                            bluetooth irda usbgadget usbhost wifi \
                            cramfs ext2 smbfs nfs \
                            libc-crypt pam \
-                           sysvinit"
+                           sysvinit x11"
 DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_MLINUX}"
 
 # disable pulseaudio
@@ -71,7 +69,7 @@ PREFERRED_PROVIDER_jpeg = "jpeg"
 PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
 require java.inc
 
-PREFERRED_VERSION_nodejs ?= "10.%"
-PREFERRED_VERSION_nodejs-native ?= "10.%"
+PREFERRED_VERSION_nodejs ?= "0.10.%"
+PREFERRED_VERSION_nodejs-native ?= "0.10.%"
 
-PREFERRED_VERSION_gpsd ?= "3.18.%"
+PREFERRED_VERSION_gpsd ?= "3.16"
-- 
cgit v1.2.3