[oe-commits] Martin Jansa : bitbake.conf: define shared PERSISTENT_DIR

[git version control]

Module: openembedded.git
Branch: master
Commit: 4f883343de0427769de3df96ed8adaa589279112
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4f883343de0427769de3df96ed8adaa589279112

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Fri Feb 25 23:27:16 2011 +0000

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 at linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/bitbake.conf |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index e57a7ad..6946be5 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"