--- targets/stage1/stage1-preclean-chroot.sh (revision 1234) +++ targets/stage1/stage1-preclean-chroot.sh (working copy) @@ -1,6 +1,6 @@ #!/bin/bash -. /tmp/chroot-functions.sh +. ./tmp/chroot-functions.sh # Now, some finishing touches to initialize gcc-config.... unset ROOT @@ -9,12 +9,12 @@ setup_binutils # Stage1 is not going to have anything in zoneinfo, so save our Factory timezone -if [ -d /usr/share/zoneinfo ] +if [ -d ./usr/share/zoneinfo ] then - rm -f /etc/localtime - cp /usr/share/zoneinfo/Factory /etc/localtime + rm -f ./etc/localtime + cp ./usr/share/zoneinfo/Factory ./etc/localtime else - echo UTC > /etc/TZ + echo UTC > ./etc/TZ fi #if [ -n "${clst_CCACHE}" ] --- targets/stage1/stage1-chroot.sh (revision 1234) +++ targets/stage1/stage1-chroot.sh (working copy) @@ -1,13 +1,13 @@ #!/bin/bash -. /tmp/chroot-functions.sh +. ./tmp/chroot-functions.sh update_env_settings setup_myfeatures # Setup our environment -export clst_buildpkgs="$(/tmp/build.py)" +export clst_buildpkgs="$(./tmp/build.py)" export STAGE1_USE="$(portageq envvar STAGE1_USE)" export USE="-* build ${STAGE1_USE}" export FEATURES="${clst_myfeatures} nodoc noman noinfo" @@ -25,7 +27,7 @@ clst_root_path=/ setup_portage run_emerge "--noreplace --oneshot ${clst_buildpkgs}" -rm -f /var/lib/portage/world -touch /var/lib/portage/world +rm -f ./var/lib/portage/world +touch ./var/lib/portage/world -rm -f /var/log/emerge.log +rm -f ./var/log/emerge.log --- targets/support/chroot-functions.sh (revision 1234) +++ targets/support/chroot-functions.sh (working copy) @@ -96,9 +96,9 @@ } setup_gcc(){ - if [ -x /usr/bin/gcc-config ] + if [ -x ./usr/bin/gcc-config ] then - mythang=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 ) + mythang=$( cd ./etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 ) if [ -z "${mythang}" ] then mythang=1 @@ -108,9 +108,9 @@ } setup_binutils(){ - if [ -x /usr/bin/binutils-config ] + if [ -x ./usr/bin/binutils-config ] then - mythang=$( cd /etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 ) + mythang=$( cd ./etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 ) if [ -z "${mythang}" ] then mythang=1