diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-09 11:51:10 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-02-09 16:06:17 +0000 |
| commit | 60515a30bd21d0d1777b13e0fccea2fab3898e84 (patch) | |
| tree | 4de024e9e7faa4c83710ed2abae2821e53be1409 /baserock-bootstrap | |
| parent | 58895001d0f865921d254e084e3da8d7d1ef4b38 (diff) | |
| download | morph-60515a30bd21d0d1777b13e0fccea2fab3898e84.tar.gz | |
Make bootstrap build use git bundles
Also, run morph update-gits in loop until it succeeds. Gitorious or git or
the office network are unreliable enough that otherwise the build pretty
much is guaranteed to fail during the initial cloning and fetching.
Diffstat (limited to 'baserock-bootstrap')
| -rwxr-xr-x | baserock-bootstrap | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/baserock-bootstrap b/baserock-bootstrap index e840eb38..b2103ecb 100755 --- a/baserock-bootstrap +++ b/baserock-bootstrap @@ -790,6 +790,21 @@ set -x cd /baserock/gits/morph mkdir -p /baserock/cache export PATH="/usr/bin:/bin:$tools/bin:$tools/sbin" +while ! python ./morph --verbose update-gits \ + file:///baserock/gits/morphs/ baserock/bootstrap foundation.morph \ + file:///baserock/gits/morphs/ master devel.morph \ + file:///baserock/gits/morphs/ master linux-stratum.morph \ + --bootstrap \ + --cachedir=/baserock/cache \ + --log=/baserock/morph.log \ + --dump-memory-profile=none \ + --keep-path \ + --bundle-server="$GIT_BUNDLES" \ + --git-base-url=git://gitorious.org/baserock/ \ + --git-base-url=git://gitorious.org/baserock-morphs/ +do + echo eeekk try again +done python ./morph --verbose build \ file:///baserock/gits/morphs/ baserock/bootstrap foundation.morph \ file:///baserock/gits/morphs/ master devel.morph \ @@ -799,7 +814,9 @@ python ./morph --verbose build \ --log=/baserock/morph.log \ --dump-memory-profile=none \ --keep-path \ - --git-base-url=file:///baserock/gits/ + --bundle-server="$GIT_BUNDLES" \ + --git-base-url=git://gitorious.org/baserock/ \ + --git-base-url=git://gitorious.org/baserock-morphs/ EOF $HOST_CHMOD +x "$LFS/baserock/build.sh" local do_chroot="$BASEDIR/do-chroot" @@ -832,6 +849,8 @@ EOF pass2_build_devel_system_outside_chroot() { + echo "Building devel system image" + cd "$LFS/.." img="devsys.img" @@ -933,3 +952,5 @@ pass2_prepare_for_chroot pass2_build_with_morph_in_chroot pass2_build_devel_system_outside_chroot +echo "Finished OK" + |