X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=phase1%2Fmaster.cfg;h=1d9cec27e72a728a3feb23a98ec8a964e36a070c;hb=e22ad789262646a1d23bfc768945f982693a18f5;hp=edc3f280501e8127028fa9a70304bf28c4fbbc77;hpb=b71f4a13b2986dff0a6ed551ea4123e99a58df4a;p=buildbot.git

diff --git a/phase1/master.cfg b/phase1/master.cfg
index edc3f28..1d9cec2 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -312,7 +312,7 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
 		command = ["make", "defconfig"]
 	))
 
-	# check arch / libc
+	# check arch
 	factory.addStep(ShellCommand(
 		name = "checkarch",
 		description = "Checking architecture",
@@ -323,15 +323,12 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
 		haltOnFailure = True
 	))
 
-	factory.addStep(ShellCommand(
-		name = "checklibc",
-		description = "Checking libc flavor",
-		command = ["grep", "-sq", 'CONFIG_LIBC="musl"', ".config"],
-		logEnviron = False,
-		want_stdout = False,
-		want_stderr = False,
-		haltOnFailure = True
-	))
+	# find libc suffix
+	factory.addStep(SetProperty(
+		name = "libc",
+		property = "libc",
+		description = "Finding libc suffix",
+		command = ["sed", "-ne", '/^CONFIG_LIBC=/ { s!^CONFIG_LIBC="\\(.*\\)"!\\1!; s!^musl$!!; s!.\\+!-&!p }', ".config"]))
 
 	# install build key
 	factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="key-build", mode=0600))
@@ -438,7 +435,7 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
 	factory.addStep(ShellCommand(
 		name = "targetupload",
 		description = "Uploading target files",
-		command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "bin/targets/%s/%s/" %(ts[0], ts[1]), "%s/targets/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
+		command=["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "bin/targets/%s/%s%s/" %(ts[0], ts[1], WithProperties("%(libc)s")), "%s/targets/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
 		env={'RSYNC_PASSWORD': rsync_bin_key},
 		haltOnFailure = True,
 		logEnviron = False
@@ -448,7 +445,7 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
 		factory.addStep(ShellCommand(
 			name = "sourceupload",
 			description = "Uploading source archives",
-			command=["rsync", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "dl/", "%s/" %(rsync_src_url)],
+			command=["rsync", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "dl/", "%s/" %(rsync_src_url)],
 			env={'RSYNC_PASSWORD': rsync_src_key},
 			haltOnFailure = True,
 			logEnviron = False
@@ -458,7 +455,7 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
 		factory.addStep(ShellCommand(
 			name = "packageupload",
 			description = "Uploading package files",
-			command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "bin/packages/", "%s/packages/" %(rsync_bin_url)],
+			command=["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "bin/packages/", "%s/packages/" %(rsync_bin_url)],
 			env={'RSYNC_PASSWORD': rsync_bin_key},
 			haltOnFailure = False,
 			logEnviron = False
@@ -469,7 +466,7 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
 		factory.addStep(ShellCommand(
 			name = "upload",
 			description = "Uploading logs",
-			command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
+			command=["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
 			env={'RSYNC_PASSWORD': rsync_bin_key},
 			haltOnFailure = False,
 			alwaysRun = True,
@@ -498,7 +495,7 @@ if ini.has_option("status", "bind"):
 			# change any of these to True to enable; see the manual for more
 			# options
 			auth=auth.BasicAuth([(ini.get("status", "user"), ini.get("status", "password"))]),
-			gracefulShutdown = False,
+			gracefulShutdown = 'auth',
 			forceBuild = 'auth', # use this to test your slave once it is set up
 			forceAllBuilds = 'auth',
 			pingBuilder = False,