diff options
| -rwxr-xr-x | stage | 7 | ||||
| -rwxr-xr-x | upgrade | 2 |
2 files changed, 6 insertions, 3 deletions
@@ -202,6 +202,9 @@ done # Note that we do the distribution first so that the toolchain changes are # visible before package changes. This is relied upon by the Build OS monitor. # +# We also wse --delay-updates to make things a bit more atomic (we don't want +# to start rebooting before everything is uploaded). +# function sync_dist () # <dist-src> <dist-dst> [<rsync-options>] { local s="$1" @@ -212,8 +215,8 @@ function sync_dist () # <dist-src> <dist-dst> [<rsync-options>] info "Press Enter to start distribution upload to $d" read - rsync -v -rltO -c --chmod=ugo=rwX --copy-unsafe-links --prune-empty-dirs \ - $rsync_ops "$@" "$s/" "$d/" + rsync -v -rltO -c --chmod=ugo=rwX --delay-updates --copy-unsafe-links \ + --prune-empty-dirs $rsync_ops "$@" "$s/" "$d/" } sync_dist "$dist_src" "$dist_dst" $rsync_del @@ -99,7 +99,7 @@ cp -rp "$pcfg" "$pcfg.bak" # BDEP_SYNC=0 b "$bcfg"/libbutl/libbutl/hxx{version} -BDEP_SYNC=0 b "$bcfg"/build2/build2/hxx{version} +BDEP_SYNC=0 b "$bcfg"/build2/libbuild2/hxx{version} BDEP_SYNC=0 bpkg install -d "$bcfg" \ config.install.root=/tmp/build2-install \ |