diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2012-07-10 16:26:45 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-07-11 16:57:01 +0100 |
commit | 555a1f92be9a7ebaa7d5aabac2cd7624b1680d4f (patch) | |
tree | 07607038c3f3f6b1ce9ece7a2015160f309298e1 /run-bootstrap-in-chroot | |
parent | f653e5fc67c521668d07896ca164c5615c2f9dae (diff) | |
download | morph-555a1f92be9a7ebaa7d5aabac2cd7624b1680d4f.tar.gz |
bootstrap: manually install cliapp in squeeze chroot
Cliapp for arm isn't maintained, so build it from source every time
rather than rely on the .deb
This also removes the out-dated comment about installing a newer
version of tar. This tar didn't work on some ARM architectures and
wasn't needed, since we don't support building over NFS any more.
Diffstat (limited to 'run-bootstrap-in-chroot')
-rwxr-xr-x | run-bootstrap-in-chroot | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot index 7752a667..a272e88a 100755 --- a/run-bootstrap-in-chroot +++ b/run-bootstrap-in-chroot @@ -135,18 +135,12 @@ EOF # create the directory for cached ccache object files mkdir -p "$dir/var/tmp/ccache" - # 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. - # We have a custom apt repository, so we'll add that to apt's - # sources.list and install tar manually. - # cliapp comes from code.liw.fi, so that needs to be added as well - 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 \ - --no-remove --yes python-cliapp + # manually build and install cliapp + "./do-squeeze-chroot" mkdir -p /src + "./do-squeeze-chroot" git clone git://roadtrain.codethink.co.uk/delta/cliapp /src/cliapp + "./do-squeeze-chroot" sh -c 'cd /src/cliapp && "$@"' -- python setup.py build + "./do-squeeze-chroot" sh -c 'cd /src/cliapp && "$@"' -- python setup.py install + if "$snapshot" then |