From: Martin Jansa <martin.jansa@gmail.com>
Date: Fri, 25 Feb 2011 23:27:16 +0000 (+0000)
Subject: bitbake.conf: define shared PERSISTENT_DIR
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f883343de0427769de3df96ed8adaa589279112;p=openembedded.git

bitbake.conf: define shared PERSISTENT_DIR

* import from poky 6a11cf7dfe930461a6660e3b783b546fa2634900
* we had CACHE var pointing to machine specific dir since 2006
  caf077679022f37ce55d758101f130e4e93bd7b5
* current bitbake is looking for cache dir like this:
  cachedir = (bb.data.getVar("PERSISTENT_DIR", d, True) or
              bb.data.getVar("CACHE", d, True))
  which without PERSISTENT_DIR defined picks machine-specific CACHE dir
  so LOCALCOUNT numbers in SRCPV keeps rolling with every MACHINE switch
  in same builddir :/

Acked-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index e57a7ad3da..6946be52fa 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -298,6 +298,8 @@ FILESDIR = "${@bb.which(d.getVar('FILESPATH', 1), '.')}"
 
 TMPDIR = "${TOPDIR}/tmp"
 CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}"
+# The persistent cache should be shared by all builds
+PERSISTENT_DIR = "${TMPDIR}/cache"
 CO_DIR = "${DL_DIR}"
 CVSDIR = "${CO_DIR}/cvs"
 SVNDIR = "${CO_DIR}/svn"