summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Reiss <jreiss@multitech.com>2016-11-04 08:29:18 -0500
committerJason Reiss <jreiss@multitech.com>2016-11-04 08:29:18 -0500
commit54340998220336692c451267ada761d3bc0198a3 (patch)
treecfa6220e8b5edfdf6f9a76222ceabfebd762ffd6
parenta3ee5357efc0e7e821e73b0c0cef71fa7139c48e (diff)
parent33e57a679fe35138beacf87f919bc2104c4092a7 (diff)
downloadmeta-mlinux-54340998220336692c451267ada761d3bc0198a3.tar.gz
meta-mlinux-54340998220336692c451267ada761d3bc0198a3.tar.bz2
meta-mlinux-54340998220336692c451267ada761d3bc0198a3.zip
Merge branch 'Conduit_0.1' of gitlab.multitech.net:mirrors/meta-mlinux into Conduit_0.1
-rw-r--r--conf/distro/mlinux.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/distro/mlinux.conf b/conf/distro/mlinux.conf
index 5f96c3e..9be1ca1 100644
--- a/conf/distro/mlinux.conf
+++ b/conf/distro/mlinux.conf
@@ -1,8 +1,8 @@
DISTRO = "mlinux"
DISTRO_NAME = "mLinux"
-DISTRO_BASE_VERSION = "3.3"
-DISTRO_VERSION = "${DISTRO_BASE_VERSION}.0dev2"
-DISTRO_CODENAME = "dev2"
+DISTRO_BASE_VERSION = "3.2"
+DISTRO_VERSION = "${DISTRO_BASE_VERSION}.1dev1"
+DISTRO_CODENAME = "dev1"
SDK_VENDOR = "-mlinux"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}"