From e78d586006f14eb5032d9c9601b6526d94b30002 Mon Sep 17 00:00:00 2001 From: Jessica Zhang Date: Tue, 14 Dec 2010 13:55:26 -0800 Subject: Introduce SDK_VERSION which is based on DISTRO_VERSION for fixing bug 586 Signed-off-by: Jessica Zhang --- meta/conf/distro/poky.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/conf/distro/poky.conf') 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 @@ 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 " @@ -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))]}" -- cgit v1.2.3-54-g00ecf