diff options
Diffstat (limited to 'run-bootstrap-in-chroot')
| -rwxr-xr-x | run-bootstrap-in-chroot | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot index 9a669015..2c2e420d 100755 --- a/run-bootstrap-in-chroot +++ b/run-bootstrap-in-chroot @@ -92,8 +92,7 @@ EOF chmod +x "./do-squeeze-chroot" if ([ "x$DEBIAN_MIRROR" = x ] && echo DEBIAN_MIRROR is unspecified >&2) || - ([ "x$GIT_BUNDLES" = x ] && echo GIT_BUNDLES is unspecified >&2) || - ([ "x$LFS_MIRROR" = x ] && echo LFS_MIRROR is unspecified >&2) + ([ "x$GIT_BUNDLES" = x ] && echo GIT_BUNDLES is unspecified >&2) then echo You have to set DEBIAN_MIRROR and other environment variables 1>&2 exit 1 @@ -116,8 +115,8 @@ then else debootstrap \ --include=build-essential,\ -gawk,bison,python,autoconf,autopoint,automake,gettext,libtool,\ -help2man,texinfo,sudo,ccache \ +gawk,bison,flex,python,autoconf,autopoint,automake,gettext,libtool,\ +help2man,texinfo,sudo,ccache,gperf \ squeeze "$dir" "$DEBIAN_MIRROR" # create the directory for cached ccache object files @@ -127,11 +126,13 @@ squeeze "$dir" "$DEBIAN_MIRROR" # 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 tar + ./do-squeeze-chroot apt-get install --allow-unauthenticated tar python-cliapp if "$snapshot" then @@ -145,29 +146,34 @@ cat <<EOF > "$dir/etc/hosts" 127.0.1.1 `hostname` EOF -if [ "x$LFS_MIRROR" = x ]; then - cp wget-list "$dir/wget-list" -else - perl -M'Env' -lpe 's|^.*/|$LFS_MIRROR|' wget-list >"$dir/wget-list" -fi - - # Unpack existing snapshot, or run pass1 of bootstrap and then make snapshot. +if ! "$snapshot" || ! has_pass pass1b +then + run_pass "$dir" pass1a +fi if ! "$snapshot" || ! has_pass pass2a then - run_pass "$dir" pass1 + run_pass "$dir" pass1b fi - if ! "$snapshot" || ! has_pass pass2b then run_pass "$dir" pass2a fi -run_pass "$dir" pass2b -snapshot=false run_pass "$dir" pass3 +if ! "$snapshot" || ! has_pass pass3a +then + run_pass "$dir" pass2b +fi + +if ! "$snapshot" || ! has_pass pass3b +then + run_pass "$dir" pass3a +fi + +snapshot=false run_pass "$dir" pass3b echo "Passes 1, 2, and 3 of bootstrap done (possibly cached)." |