diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2017-10-12 09:03:03 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-10-12 09:03:03 +0200 |
commit | c15d3d5be4011f9bfc7e36fb1629529c1eb2e009 (patch) | |
tree | b9795c693cbbd7d1ee2d6af666981ac861d57517 /buildos | |
parent | 86f6a19d36b1738c1e9d4a95a1c7e7d310f9960c (diff) |
Various fixes and cleanups for base upgrade
systemd 234
qemu 2.10
linux 4.13
Diffstat (limited to 'buildos')
-rwxr-xr-x | buildos | 28 |
1 files changed, 15 insertions, 13 deletions
@@ -29,12 +29,21 @@ function error () exit 1 } -# Network timeouts: 30 seconds to connect, 10 minutes to complete. Note that -# the toolchain archives can be quite sizable. +# Network timeouts: 60 seconds to connect, 10 minutes to complete, 4 retries +# (5 attempts total). These are similar to bbot timeouts. Note that the +# toolchain archives can be quite sizable. # -curl=(curl -f -L -s -S --connect-timeout 30 --max-time 600) -bpkg=(bpkg --fetch curl --fetch-option --connect-timeout --fetch-option 30 \ - --fetch-option --max-time --fetch-option 600) +curl=(curl -f -L -s -S \ + --retry 4 \ + --retry-max-time 600 \ + --max-time 600 \ + --connect-timeout 60) + +bpkg=(bpkg --fetch curl \ + --fetch-option --retry --fetch-option 4 \ + --fetch-option --retry-max-time --fetch-option 600 \ + --fetch-option --max-time --fetch-option 600 \ + --fetch-option --connect-timeout --fetch-option 60) info "starting build os monitor..." @@ -99,14 +108,6 @@ for v in "${cmdline[@]}"; do fi done -# Make sure /dev/kvm has correct permissions (while all the udev scripts seem -# to be there, it does not work for some reason). -# -if sudo test -c /dev/kvm; then - sudo chgrp kvm /dev/kvm - sudo chmod 0660 /dev/kvm -fi - hname="$(hostname)" # Get the build id. @@ -950,6 +951,7 @@ EOF fi tp="${toolchains["$tn"]}" + tr="$(toolchain_value "$tp" toolchain_root)" # Or those that have no controllers (maybe it would have been better # to build it but not start). |