diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-19 14:19:14 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-19 14:19:14 +0000 |
| commit | f226330c349731d89b924e0383852cb93629a6ca (patch) | |
| tree | ad0e49614d38e9eede7f6563021b1289548aa3fb /baserock-bootstrap | |
| parent | 9934e099c9155cb4f22387bb979e8ff2266c1d3e (diff) | |
| parent | 0d60a83a99c80feb14b6d228f9a8426ef1f4579a (diff) | |
| download | morph-f226330c349731d89b924e0383852cb93629a6ca.tar.gz | |
Merge remote branch 'origin/master' into rm/morph-pass1
Diffstat (limited to 'baserock-bootstrap')
| -rwxr-xr-x | baserock-bootstrap | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/baserock-bootstrap b/baserock-bootstrap index 4e43a118..607459f3 100755 --- a/baserock-bootstrap +++ b/baserock-bootstrap @@ -179,9 +179,7 @@ cd /baserock/gits/morph mkdir -p /baserock/cache export PATH="/usr/bin:/bin:$tools/bin:$tools/sbin" while ! python ./morph --verbose update-gits \ - morphs master foundation.morph \ - morphs master devel-bootstrap.morph \ - morphs master linux-stratum.morph \ + morphs master bootstrap-pass2.morph \ --bootstrap \ --cachedir=/baserock/cache \ --log=/baserock/morph.log \ @@ -231,9 +229,7 @@ cd /baserock/gits/morph mkdir -p /baserock/cache export PATH="/usr/bin:/bin:$tools/bin:$tools/sbin" python ./morph --verbose build \ - morphs master foundation.morph \ - morphs master devel-bootstrap.morph \ - morphs master linux-stratum.morph \ + morphs master bootstrap-pass2.morph \ --bootstrap \ --no-git-update \ --cachedir=/baserock/cache \ |