summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorElizabeth Flanagan <elizabeth.flanagan@intel.com>2013-04-10 00:23:43 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-10 16:25:34 +0100
commit349544d8a250498f1f86c2a88fcad39ebadf5ce8 (patch)
treecb74bcc0fd09765dec7d57a80aea1b2bb07ca0b2 /meta-yocto
parentb52a4d3f088136c1347bf4d2ad2cc052d87ba2b6 (diff)
downloadpoky-349544d8a250498f1f86c2a88fcad39ebadf5ce8.tar.gz
poky.conf: Flipping vars for dylan release
DISTRO/SDKVERSION etc need to be flipped for dylan. This commit is valid only for the dylan branch. (From meta-yocto rev: acf28de230574800e38024df890261d4550e26b4) Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/distro/poky.conf7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 538f3434b5..b9c2758d56 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -1,9 +1,9 @@
1DISTRO = "poky" 1DISTRO = "poky"
2DISTRO_NAME = "Poky 8.0 (Yocto Project 1.3 Reference Distro)" 2DISTRO_NAME = "Poky 9.0 (Yocto Project 1.4 Reference Distro)"
3DISTRO_VERSION = "1.3+snapshot-${DATE}" 3DISTRO_VERSION = "1.4"
4DISTRO_CODENAME = "dylan" 4DISTRO_CODENAME = "dylan"
5SDK_VENDOR = "-pokysdk" 5SDK_VENDOR = "-pokysdk"
6SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" 6SDK_VERSION := "${@'${DISTRO_VERSION}'}"
7 7
8MAINTAINER = "Poky <poky@yoctoproject.org>" 8MAINTAINER = "Poky <poky@yoctoproject.org>"
9 9
@@ -70,6 +70,7 @@ CONNECTIVITY_CHECK_URIS ?= " \
70 http://bugzilla.yoctoproject.org/report.cgi" 70 http://bugzilla.yoctoproject.org/report.cgi"
71 71
72SANITY_TESTED_DISTROS ?= " \ 72SANITY_TESTED_DISTROS ?= " \
73 Yocto-1.3 \n \
73 Yocto-1.2 \n \ 74 Yocto-1.2 \n \
74 Poky-1.2 \n \ 75 Poky-1.2 \n \
75 Poky-1.3 \n \ 76 Poky-1.3 \n \