diff options
-rwxr-xr-x | baserock-bootstrap | 18 | ||||
-rwxr-xr-x | run-bootstrap-in-chroot | 2 |
2 files changed, 11 insertions, 9 deletions
diff --git a/baserock-bootstrap b/baserock-bootstrap index a4fe61e2..0cbcdb49 100755 --- a/baserock-bootstrap +++ b/baserock-bootstrap @@ -47,13 +47,13 @@ pass1_directories() pass1_get_sources_with_morph() { - cd /tree/baserock/gits/morph - $HOST_MKDIR -p /baserock/cache + cd $LFS/baserock/gits/morph + $HOST_MKDIR -p $LFS/baserock/cache export PATH="/usr/bin:/bin:$tools/bin:$tools/sbin" while ! python ./morph --verbose update-gits \ morphs rm/morph-pass1 bootstrap-pass1.morph \ - --cachedir=/tree/baserock/cache \ - --log=/tree/baserock/morph.log \ + --cachedir=$LFS/baserock/cache \ + --log=$LFS/baserock/morph.log \ --dump-memory-profile=none \ --keep-path \ --bundle-server="$GIT_BUNDLES" @@ -64,16 +64,18 @@ pass1_get_sources_with_morph() pass1_build_with_morph() { - cd /tree/baserock/gits/morph - $HOST_MKDIR -p /baserock/cache + cd $LFS/baserock/gits/morph + $HOST_MKDIR -p $LFS/baserock/cache + $HOST_MKDIR -p $LFS/tmp export PATH="/usr/bin:/bin:$tools/bin:$tools/sbin" python ./morph --verbose build \ morphs rm/morph-pass1 bootstrap-pass1.morph \ --no-git-update \ --no-distcc \ --bootstrap \ - --cachedir=/tree/baserock/cache \ - --log=/baserock/morph.log \ + --cachedir=$LFS/baserock/cache \ + --tempdir=$LFS/tmp + --log=$LFS/baserock/morph.log \ --dump-memory-profile=none \ --keep-path \ --prefix="$tools" \ diff --git a/run-bootstrap-in-chroot b/run-bootstrap-in-chroot index 9fdec2f2..76f32cc5 100755 --- a/run-bootstrap-in-chroot +++ b/run-bootstrap-in-chroot @@ -118,7 +118,7 @@ then else debootstrap \ --include=build-essential,\ -gawk,bison,python,autoconf,autopoint,automake,gettext,libtool,\ +gawk,bison,flex,python,autoconf,autopoint,automake,gettext,libtool,\ help2man,texinfo,sudo,ccache \ squeeze "$dir" "$DEBIAN_MIRROR" |