From 4a2b35032323847678e25d8b62d84bcb1c30152a Mon Sep 17 00:00:00 2001 From: John Klug Date: Wed, 9 Aug 2017 13:27:39 -0500 Subject: Remove obsolete nodjs preferred levels --- conf/distro/mlinux.conf | 13 +++++-------- 1 file 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" -- cgit v1.2.3