From 78c793fbf4ac4e3ddfe2120aeb69eeacb23593a3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 19 Jul 2008 14:19:47 +0000 Subject: bitbake.conf: Add CO_DIR and STAGING_EXECPREFIXDIR from OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4895 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/bitbake.conf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 3005f97ba..c973ce1da 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -219,10 +219,11 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" TMPDIR = "${TOPDIR}/tmp" CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" -CVSDIR = "${DL_DIR}/cvs" -SVNDIR = "${DL_DIR}/svn" -GITDIR = "${DL_DIR}/git" -BZRDIR = "${DL_DIR}/bzr" +CO_DIR = "${DL_DIR}" +CVSDIR = "${CO_DIR}/cvs" +SVNDIR = "${CO_DIR}/svn" +GITDIR = "${CO_DIR}/git" +BZRDIR = "${CO_DIR}/bzr" STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}" WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" @@ -246,6 +247,7 @@ STAGING_BINDIR = "${STAGING_DIR_HOST}${layout_bindir}" STAGING_LIBDIR = "${STAGING_DIR_HOST}${layout_libdir}" STAGING_INCDIR = "${STAGING_DIR_HOST}${layout_includedir}" STAGING_DATADIR = "${STAGING_DIR_HOST}${layout_datadir}" +STAGING_EXECPREFIXDIR = "${STAGING_DIR_HOST}${layout_exec_prefix}" STAGING_LOADER_DIR = "${STAGING_DIR_HOST}/loader" STAGING_FIRMWARE_DIR = "${STAGING_DIR_HOST}/firmware" STAGING_PYDIR = "${STAGING_DIR}/lib/python2.4" -- cgit v1.2.3