From 4543d20213e630437685e9ff4964c2e8e1a29216 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 28 Nov 2022 23:47:05 +0000 Subject: [PATCH] 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. (From OE-Core rev: 550ed0a4ce8839946781f18fdce18452de34ddaf) Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index a1f0f624e9..d47568157a 100644 --- 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"