summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorJessica Zhang <jessica.zhang@intel.com>2010-12-14 13:55:26 -0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-16 15:53:09 +0000
commite78d586006f14eb5032d9c9601b6526d94b30002 (patch)
tree07feaf8a483bc1e9da0cc9b55582b76c6cfe84c3 /meta/conf
parentfcd14a23074ab5d58162a93a2aff0ac4cf2db84a (diff)
downloadpoky-e78d586006f14eb5032d9c9601b6526d94b30002.tar.gz
Introduce SDK_VERSION which is based on DISTRO_VERSION for fixing bug 586
Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/poky.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 95ca0970c3..ee390dca85 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -4,6 +4,7 @@
4DISTRO = "poky" 4DISTRO = "poky"
5DISTRO_NAME = "Yocto (Built by Poky 4.0)" 5DISTRO_NAME = "Yocto (Built by Poky 4.0)"
6DISTRO_VERSION = "0.9+snapshot-${DATE}" 6DISTRO_VERSION = "0.9+snapshot-${DATE}"
7SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
7 8
8MAINTAINER = "Poky <poky@yoctoproject.org>" 9MAINTAINER = "Poky <poky@yoctoproject.org>"
9 10
@@ -60,7 +61,7 @@ POKYLIBC ?= "eglibc"
60require conf/distro/include/poky-${POKYLIBC}.inc 61require conf/distro/include/poky-${POKYLIBC}.inc
61 62
62SDK_NAME = "${DISTRO}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}" 63SDK_NAME = "${DISTRO}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
63SDKPATH = "/opt/${DISTRO}/${DISTRO_VERSION}" 64SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
64 65
65CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}" 66CACHE = "${TMPDIR}/cache/${POKYMODE}-${POKYLIBC}${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}${@['', '/' + str(bb.data.getVar('SDKMACHINE', d, 1))][bool(bb.data.getVar('SDKMACHINE', d, 1))]}"
66 67