diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-15 10:22:39 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-15 10:22:39 +0000 |
| commit | 855c6c31db347237b73920b70e48ca45358bf363 (patch) | |
| tree | 036d4c481af1f3d7097268088f1490174b54b64d /run-bootstrap-in-chroot | |
| parent | bcac5a631fe2dfec7076af8b70692a8ef1771eb1 (diff) | |
| download | morph-855c6c31db347237b73920b70e48ca45358bf363.tar.gz | |
bootstrap: more passes and keep cache
baserock-bootstrap: set cachedir so that the git cache
can be reused in pass 2 onwards
run-bootstrap-in-chroot: add more passes
Diffstat (limited to 'run-bootstrap-in-chroot')
| -rwxr-xr-x | run-bootstrap-in-chroot | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot index 008da12d..9fdec2f2 100755 --- a/run-bootstrap-in-chroot +++ b/run-bootstrap-in-chroot @@ -156,20 +156,32 @@ fi # Unpack existing snapshot, or run pass1 of bootstrap and then make snapshot. +if ! "$snapshot" || ! has_pass pass1b +then + run_pass "$dir" pass1a +fi if ! "$snapshot" || ! has_pass pass2a then - run_pass "$dir" pass1 + run_pass "$dir" pass1b fi - if ! "$snapshot" || ! has_pass pass2b then run_pass "$dir" pass2a fi -run_pass "$dir" pass2b -snapshot=false run_pass "$dir" pass3 +if ! "$snapshot" || ! has_pass pass3a +then + run_pass "$dir" pass2b +fi + +if ! "$snapshot" || ! has_pass pass3b +then + run_pass "$dir" pass3a +fi + +snapshot=false run_pass "$dir" pass3b echo "Passes 1, 2, and 3 of bootstrap done (possibly cached)." |