diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-02-29 13:01:25 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-02-29 13:01:25 +0000 |
| commit | 50ed2af2573f121afff25b4dc0fcd34a02948b39 (patch) | |
| tree | f986742387b216271d753c45369db3674bf94cfe /baserock-bootstrap | |
| parent | 4e5cfa4f2a8343e0f68ac22ab393d9bdc9fdea82 (diff) | |
| download | morph-50ed2af2573f121afff25b4dc0fcd34a02948b39.tar.gz | |
bootstrap: remove redundant options, add quotes
The git-base-urls specified are now the defaults, so specifying
them should be redundant.
Also quoted the output for staging-filler
Diffstat (limited to 'baserock-bootstrap')
| -rwxr-xr-x | baserock-bootstrap | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/baserock-bootstrap b/baserock-bootstrap index f2148b5b..585b83b5 100755 --- a/baserock-bootstrap +++ b/baserock-bootstrap @@ -808,9 +808,7 @@ while ! python ./morph --verbose update-gits \ --log=/baserock/morph.log \ --dump-memory-profile=none \ --keep-path \ - --bundle-server="$GIT_BUNDLES" \ - --git-base-url=git://gitorious.org/baserock-morphs/ \ - --git-base-url=git://gitorious.org/baserock/ + --bundle-server="$GIT_BUNDLES" do echo eeekk try again done @@ -864,9 +862,7 @@ python ./morph --verbose build \ --log=/baserock/morph.log \ --dump-memory-profile=none \ --keep-path \ - --bundle-server="$GIT_BUNDLES" \ - --git-base-url=git://gitorious.org/baserock-morphs/ \ - --git-base-url=git://gitorious.org/baserock/ + --bundle-server="$GIT_BUNDLES" EOF $HOST_CHMOD +x "$LFS/baserock/build.sh" local do_chroot="$BASEDIR/do-chroot.bash" @@ -992,9 +988,7 @@ while ! python ./morph --verbose update-gits \ --log=/baserock/morph.log \ --dump-memory-profile=none \ --keep-path \ - --bundle-server="$GIT_BUNDLES" \ - --git-base-url=git://gitorious.org/baserock-morphs/ \ - --git-base-url=git://gitorious.org/baserock/ + --bundle-server="$GIT_BUNDLES" do echo eeekk try again done @@ -1040,15 +1034,13 @@ python ./morph --verbose build \ morphs master linux-stratum.morph \ --staging-chroot \ $(for x in $LFS/baserock/cache.pass2/*.stratum.*; \ - do echo -n "--staging-filler=$x "; done) \ + do echo -n "--staging-filler=\"$x\" "; done) \ --no-git-update \ --cachedir=/baserock/cache \ --log=/baserock/morph.log \ --dump-memory-profile=none \ --keep-path \ - --bundle-server="$GIT_BUNDLES" \ - --git-base-url=git://gitorious.org/baserock-morphs/ \ - --git-base-url=git://gitorious.org/baserock/ + --bundle-server="$GIT_BUNDLES" EOF $HOST_CHMOD +x "$LFS/baserock/build_pass3.sh" local do_chroot="$BASEDIR/do-chroot.bash" |