bitbake.conf: Simplify CACHE setting

A long time ago the bitbake cache didn't use hashes in it's filename and
hence values such as MACHINE were needed in the path to the cache file
so that when switching MACHINE, a new cache wasn't always parsed.

Times have moved on, we have a hash which represents the configuration
and the caches are reused if there is an existing hash that matches.

This means the values added to CACHE are obsolete and not needed,
we can drop them.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a1f0f624e9c7b1cf4a90d6289b8f0b00c7e386b6..d47568157a783c063fcec7d1e7d8a835cb993e0f 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -392,7 +392,7 @@ TCLIBC ??= "glibc"
 TC_CXX_RUNTIME ??= "gnu"
 TMPDIR ?= "${TOPDIR}/tmp"
 
-CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE'))][bool(d.getVar('MACHINE'))]}${@['', '/' + str(d.getVar('SDKMACHINE'))][bool(d.getVar('SDKMACHINE'))]}"
+CACHE = "${TMPDIR}/cache"
 # The persistent cache should be shared by all builds
 PERSISTENT_DIR = "${TOPDIR}/cache"
 LOG_DIR = "${TMPDIR}/log"