summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-27 14:52:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-27 14:52:22 +0000
commit24023149ccebde34f51740441fc601deb3720d5b (patch)
treeee0cac05b00b04078f47213eb39b4804b1fa69e8
parent2659f276cfb805c38f98f05fe90629ec7d9155eb (diff)
parent26dcc1139bea291473c4507c60e95396bf200d6f (diff)
downloadpoky-24023149ccebde34f51740441fc601deb3720d5b.tar.gz
Merge 1.3.1 release into danny branch
-rw-r--r--meta-yocto/conf/distro/poky.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 406ddfcada..92bd3d3e14 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -1,6 +1,6 @@
1DISTRO = "poky" 1DISTRO = "poky"
2DISTRO_NAME = "Poky 8.0 (Yocto Project 1.3 Reference Distro)" 2DISTRO_NAME = "Poky 8.0.1 (Yocto Project 1.3.1 Reference Distro)"
3DISTRO_VERSION = "1.3" 3DISTRO_VERSION = "1.3.1"
4SDK_VENDOR = "-pokysdk" 4SDK_VENDOR = "-pokysdk"
5SDK_VERSION := "${DISTRO_VERSION}" 5SDK_VERSION := "${DISTRO_VERSION}"
6 6
@@ -73,6 +73,7 @@ SANITY_TESTED_DISTROS ?= " \
73 Yocto (Built by Poky 8.0) 1.3 \n \ 73 Yocto (Built by Poky 8.0) 1.3 \n \
74 Poky 7.0 (Yocto Project 1.2 Reference Distro) 1.2 \n \ 74 Poky 7.0 (Yocto Project 1.2 Reference Distro) 1.2 \n \
75 Poky 8.0 (Yocto Project 1.3 Reference Distro) 1.3 \n \ 75 Poky 8.0 (Yocto Project 1.3 Reference Distro) 1.3 \n \
76 Poky 8.0.1 (Yocto Project 1.3.1 Reference Distro) 1.3.1 \n \
76 Ubuntu 10.04.4 LTS \n \ 77 Ubuntu 10.04.4 LTS \n \
77 Ubuntu 11.10 \n \ 78 Ubuntu 11.10 \n \
78 Ubuntu 12.04 LTS \n \ 79 Ubuntu 12.04 LTS \n \