From: Jo-Philipp Wich Date: Thu, 20 Jun 2019 15:42:17 +0000 (+0200) Subject: phase1: honour version prefix when fetching sha256sums X-Git-Tag: v1~114 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=4870a4eb41b7c61c71030648f45485ed4e71ff91;p=buildbot.git phase1: honour version prefix when fetching sha256sums This is requires for non-master builds which use a slightly different directory layout on the rsync host. Signed-off-by: Jo-Philipp Wich --- diff --git a/phase1/master.cfg b/phase1/master.cfg index f506867..665d41e 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -930,7 +930,7 @@ for target in targets: factory.addStep(ShellCommand( name = "target-sha256sums", description = "Fetching remote sha256sums for target", - command = ["rsync", "-z"] + rsync_defopts + [Interpolate("%(kw:rsyncbinurl)s/targets/%(kw:target)s/%(kw:subtarget)s/sha256sums", rsyncbinurl=rsync_bin_url, target=ts[0], subtarget=ts[1]), "target-sha256sums"], + command = ["rsync", "-z"] + rsync_defopts + [Interpolate("%(kw:rsyncbinurl)s/%(kw:prefix)stargets/%(kw:target)s/%(kw:subtarget)s/sha256sums", rsyncbinurl=rsync_bin_url, target=ts[0], subtarget=ts[1], prefix=GetVersionPrefix), "target-sha256sums"], env={'RSYNC_PASSWORD': rsync_bin_key}, logEnviron = False, haltOnFailure = False,