diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-15 10:22:43 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-15 10:22:43 +0000 |
| commit | bfc0c523b3dd272be89967721cc4c4946658dc67 (patch) | |
| tree | 271289e0981e7f852598efe8131ac60bdb678eb7 /baserock-bootstrap | |
| parent | 8d994c4d4e24af50598213c5154221ebdd080b7a (diff) | |
| parent | 1b360e958aaa63593d24ba99d9c7070fc13dfb2c (diff) | |
| download | morph-bfc0c523b3dd272be89967721cc4c4946658dc67.tar.gz | |
Merge branch 'master', remote branch 'origin'
Diffstat (limited to 'baserock-bootstrap')
| -rwxr-xr-x | baserock-bootstrap | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/baserock-bootstrap b/baserock-bootstrap index 3a1fbf83..34cfe697 100755 --- a/baserock-bootstrap +++ b/baserock-bootstrap @@ -787,7 +787,7 @@ 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.morph \ + morphs master devel-bootstrap.morph \ morphs master linux-stratum.morph \ --bootstrap \ --ignore-submodules \ @@ -803,7 +803,7 @@ do done python ./morph --verbose build \ morphs master foundation.morph \ - morphs master devel.morph \ + morphs master devel-bootstrap.morph \ morphs master linux-stratum.morph \ --bootstrap \ --ignore-submodules \ |