summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2020-07-17 02:19:35 -0500
committerJohn Klug <john.klug@multitech.com>2020-07-17 02:19:35 -0500
commitad7558982f72d8a378bb18f8f1340aaf6cc482bd (patch)
tree087e5826e76ffa98e126779643991a18aa929eb3 /conf
parentb89dfa780e74a7d927cead024768404e2df24db2 (diff)
downloadmeta-mlinux-ad7558982f72d8a378bb18f8f1340aaf6cc482bd.tar.gz
meta-mlinux-ad7558982f72d8a378bb18f8f1340aaf6cc482bd.tar.bz2
meta-mlinux-ad7558982f72d8a378bb18f8f1340aaf6cc482bd.zip
Bump to 6.0.0dev6
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/mlinux.conf12
1 files changed, 5 insertions, 7 deletions
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"