diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-16 09:52:46 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-16 09:52:46 +0000 |
commit | 315ec6614a58a250f864e21ee86ff081cd5f6280 (patch) | |
tree | 27f90d372819e33997e7bdd6e43079798c7fff83 /run-bootstrap-in-chroot | |
parent | 8af6ae20a6f942a3a16a0cb561b3bc079494481a (diff) | |
parent | b574e357509f553b5ea4a5261398827a7cdeb40a (diff) | |
download | morph-315ec6614a58a250f864e21ee86ff081cd5f6280.tar.gz |
Merge branch 'master' into rm/morph-pass1-merge
Diffstat (limited to 'run-bootstrap-in-chroot')
-rwxr-xr-x | run-bootstrap-in-chroot | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot index 9fec89d2..460e480b 100755 --- a/run-bootstrap-in-chroot +++ b/run-bootstrap-in-chroot @@ -97,7 +97,6 @@ then echo You have to set DEBIAN_MIRROR and other environment variables 1>&2 exit 1 fi -#DEBIAN_MIRROR="http://192.168.1.185/debian" # prepare the ccache directory in the chroot, if necessary if [ "x$CCACHE_HOST_DIR" = "x" ]; then @@ -125,10 +124,10 @@ squeeze "$dir" "$DEBIAN_MIRROR" # We need a backport of tar 1.26. On ARM, older versions (possibly # prior to 1.25) have a bug unpacking things onto an NFS filesystem. - # code.liw.fi has the backport, so we'll add that to apt's sources.list + # We have a custom apt repository, so we'll add that to apt's sources.list # and install tar manually. cat <<EOF >> "$dir/etc/apt/sources.list" -deb http://code.liw.fi/debian squeeze main +deb http://roadtrain.codethink.co.uk/debrock/ squeeze main EOF ./do-squeeze-chroot apt-get update ./do-squeeze-chroot apt-get install --allow-unauthenticated tar python-cliapp |