X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=phase1%2Fmaster.cfg;h=542c3c546f287d2e0898f89b1d779e8eda6049f1;hb=40ce6542822840834b71d4a63e36b0ea9c5fe4a8;hp=695973f8e0da85a1adbc182404a7ce53a6e3208b;hpb=2ecde598b7c3fdb9769f14ab38d5df24c26e28aa;p=buildbot.git

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 695973f..542c3c5 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -238,10 +238,19 @@ def GetCXX(props):
 	else:
 		return "g++"
 
+def GetCwd(props):
+	if props.hasProperty("builddir"):
+		return props["builddir"]
+	elif props.hasProperty("workdir"):
+		return props["workdir"]
+	else:
+		return "/"
+
 def MakeEnv(overrides=None):
 	env = {
 		'CC': WithProperties("%(cc)s", cc=GetCC),
-		'CXX': WithProperties("%(cxx)s", cxx=GetCXX)
+		'CXX': WithProperties("%(cxx)s", cxx=GetCXX),
+		'CCACHE_BASEDIR': WithProperties("%(cwd)s", cwd=GetCwd)
 	}
 	if overrides is not None:
 		env.update(overrides)
@@ -454,13 +463,6 @@ for target in targets:
 		command=["./scripts/feeds", "install", "-a"],
 		env = MakeEnv()))
 
-	# ccache prepare
-	factory.addStep(ShellCommand(
-                name = "prepccache",
-                description = "Preparing ccache",
-                command = ["./ccache.sh"]
-	))
-
 	# seed config
 	factory.addStep(FileDownload(
 		mastersrc = "config.seed",
@@ -513,6 +515,13 @@ for target in targets:
 		mode = 0755
 	))
 
+	# ccache prepare
+	factory.addStep(ShellCommand(
+                name = "prepccache",
+                description = "Preparing ccache",
+                command = ["./ccache.sh"]
+	))
+
 	# install build key
 	factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="key-build", mode=0600))
 	factory.addStep(FileDownload(mastersrc=home_dir+'/key-build.pub', slavedest="key-build.pub", mode=0600))
@@ -530,7 +539,7 @@ for target in targets:
 	factory.addStep(ShellCommand(
 		name = "dltar",
 		description = "Building GNU tar",
-		command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "tools/tar/install", "V=s"],
+		command = ["make", WithProperties("-j%(jobs)d", jobs=GetNumJobs), "tools/tar/compile", "V=s"],
 		env = MakeEnv(),
 		haltOnFailure = True
 	))