Introduce SDK_VERSION which is based on DISTRO_VERSION for fixing bug 586

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 95ca0970c33d2da3a6965b73e24f7bd8046ea44a..ee390dca85212fa20694c77a0c0062f549c7cd56 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -4,6 +4,7 @@
 DISTRO = "poky"
 DISTRO_NAME = "Yocto (Built by Poky 4.0)"
 DISTRO_VERSION = "0.9+snapshot-${DATE}"
+SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
 MAINTAINER = "Poky <poky@yoctoproject.org>"
 
@@ -60,7 +61,7 @@ POKYLIBC ?= "eglibc"
 require conf/distro/include/poky-${POKYLIBC}.inc
 
 SDK_NAME = "${DISTRO}-${POKYLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
-SDKPATH = "/opt/${DISTRO}/${DISTRO_VERSION}"
+SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
 
 CACHE = "${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))]}"