From: Jo-Philipp Wich Date: Mon, 23 Jan 2017 13:25:38 +0000 (+0100) Subject: phase2: set CCACHE_BASEDIR X-Git-Tag: v1~190 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6197b16e8daabe674c7a647c55a23c631d913961;p=buildbot.git phase2: set CCACHE_BASEDIR Add CCACHE_BASEDIR to make environment in order to improve cache hit rate for the global shared cache. Signed-off-by: Jo-Philipp Wich --- diff --git a/phase2/master.cfg b/phase2/master.cfg index d6d2e22..bff0b18 100644 --- a/phase2/master.cfg +++ b/phase2/master.cfg @@ -198,6 +198,14 @@ def GetNumJobs(props): else: return 1 +def GetCwd(props): + if props.hasProperty("builddir"): + return props["builddir"] + elif props.hasProperty("workdir"): + return props["workdir"] + else: + return "/" + c['builders'] = [] @@ -314,7 +322,8 @@ for arch in arches: name = "compile", description = "Building packages", workdir = "build/sdk", - command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "IGNORE_ERRORS=n m y", "BUILD_LOG=1", "CONFIG_SIGNED_PACKAGES=y", "CONFIG_AUTOREMOVE=y"])) + command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "IGNORE_ERRORS=n m y", "BUILD_LOG=1", "CONFIG_SIGNED_PACKAGES=y", "CONFIG_AUTOREMOVE=y"], + env = {'CCACHE_BASEDIR': WithProperties("%(cwd)s", cwd=GetCwd)})) factory.addStep(ShellCommand( name = "mkfeedsconf",