summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2017-08-09 13:27:39 -0500
committerJohn Klug <john.klug@multitech.com>2017-08-09 13:32:08 -0500
commit4a2b35032323847678e25d8b62d84bcb1c30152a (patch)
tree9296962d2a8bc83fee91d0996eb34195b7d4d6f7
parentc7572591a85bff5213e4af5fbe00999e5453d664 (diff)
downloadmeta-mlinux-4a2b35032323847678e25d8b62d84bcb1c30152a.tar.gz
meta-mlinux-4a2b35032323847678e25d8b62d84bcb1c30152a.tar.bz2
meta-mlinux-4a2b35032323847678e25d8b62d84bcb1c30152a.zip
Remove obsolete nodjs preferred levels
-rw-r--r--conf/distro/mlinux.conf13
1 files changed, 5 insertions, 8 deletions
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index 5e89154..52799b8 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,7 +1,7 @@
DISTRO = "mlinux"
DISTRO_NAME = "mLinux"
-DISTRO_BASE_VERSION = "3.3"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.9"
+DISTRO_BASE_VERSION = "4.0"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev4"
DISTRO_CODENAME = ""
SDK_VENDOR = "-mlinux"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
@@ -36,7 +36,7 @@ DISTRO_EXTRA_RDEPENDS += "mlinux-version"
INHERIT += "mlinux-mirrors"
# Package feed configuration
-DISTRO_FEED_URI = "http://multitech.net/mlinux/feeds/${DISTRO_VERSION}"
+DISTRO_FEED_URI = "http://multitech.net/mlinux/feeds/${DISTRO_BASE_VERSION}"
DISTRO_FEED_PREFIX = "mlinux"
EXTRAOPKGCONFIG = ""
@@ -47,8 +47,8 @@ TCLIBCAPPEND = ""
IPKG_VARIANT = "opkg"
DEFAULT_TIMEZONE = "America/Chicago"
-# default root password
-ROOT_PASSWORD_HASH ?= "e97PZLy9l09O6"
+# default mtadm password
+MTADM_PASSWORD_HASH ?= "e97PZLy9l09O6"
SANITY_TESTED_DISTROS ?= " \
Ubuntu-12.04 \n \
@@ -72,7 +72,4 @@ PREFERRED_PROVIDER_jpeg = "jpeg"
PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
require java.inc
-PREFERRED_VERSION_nodejs ?= "0.10.44"
-PREFERRED_VERSION_nodejs-native ?= "0.10.44"
-
PREFERRED_VERSION_gpsd ?= "3.16"