diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-03-09 14:45:54 +0000 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-03-09 14:45:54 +0000 |
| commit | cd94699c6a39948e1d91c968819303b03573b529 (patch) | |
| tree | e4f145a1daf7c587840ff1b55ccf2854dac61a2b /run-bootstrap-in-chroot | |
| parent | 6c32048e2bdf58596c4c7c5a9885be56425ea8d7 (diff) | |
| download | morph-cd94699c6a39948e1d91c968819303b03573b529.tar.gz | |
Fix quotes and ccache preparation for real.
Diffstat (limited to 'run-bootstrap-in-chroot')
| -rwxr-xr-x | run-bootstrap-in-chroot | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot index cc3157bd..4db6f165 100755 --- a/run-bootstrap-in-chroot +++ b/run-bootstrap-in-chroot @@ -78,8 +78,8 @@ if mount -t proc proc "$dir/proc"; then if mount -t sysfs sysfs "$dir/sys"; then trap "umount \"$dir/proc\" \"$dir/sys\"" INT TERM EXIT if [ "x$CCACHE_HOST_DIR" != "x" ]; then - if mount --bind \"$CCACHE_HOST_DIR\" \"$dir/var/tmp/ccache\"; then - trap "umount \"$dir/proc\" \"$dir/sys\"" \"$dir/var/tmp/ccache\" \ + if mount --bind "$CCACHE_HOST_DIR" "$dir/var/tmp/ccache"; then + trap "umount \"$dir/proc\" \"$dir/sys\" \"$dir/var/tmp/ccache\"" \ INT TERM EXIT chroot "$dir" "\$@" fi @@ -101,6 +101,12 @@ fi #DEBIAN_MIRROR="http://192.168.1.185/debian" #LFS_MIRROR=http://192.168.1.185/lfs/ +# prepare the ccache directory in the chroot, if necessary +if [ "x$CCACHE_HOST_DIR" = "x" ]; then + # print a warning if the CCACHE_HOST_DIR is not set + echo "CCACHE_HOST_DIR is unspecified, but that's ok" >&2 +fi + unmount_virtual "$dir" rm -rf "$dir" mkdir "$dir" @@ -116,14 +122,8 @@ gawk,bison,python,autoconf,autopoint,automake,gettext,libtool,\ help2man,texinfo,sudo,ccache \ squeeze "$dir" "$DEBIAN_MIRROR" - # prepare the ccache directory in the chroot, if necessary - if [ "x$CCACHE_HOST_DIR" = "x" ]; then - # print a warning if the CCACHE_HOST_DIR is not set - echo "CCACHE_HOST_DIR is unspecified, but that's ok" >&2 - else - # create the directory for cached ccache object files - mkdir -p "$dir/var/tmp/ccache" - fi + # 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. |