[gentoo-commits] proj/catalyst:master commit in: targets/support/, targets/stage1/

[Rick Farina]

commit:     224c7e3ec350c4a27cd40acb3a4d346762025da1
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 15:04:48 2019 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu May 30 15:04:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=224c7e3e

respect ROOT

fix setup_gcc and setup_binutils to respect ROOT

 targets/stage1/stage1-preclean-chroot.sh | 2 --
 targets/support/chroot-functions.sh      | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/targets/stage1/stage1-preclean-chroot.sh 
b/targets/stage1/stage1-preclean-chroot.sh
index 1b623f18..ea9056e8 100755
--- a/targets/stage1/stage1-preclean-chroot.sh
+++ b/targets/stage1/stage1-preclean-chroot.sh
@@ -8,8 +8,6 @@ source /tmp/chroot-functions.sh
 update_env_settings
 show_debug
 
-# Right now these will parse the unpacked stage3 but change things
-# inside of /tmp/stage1root due to ROOT env variable
 setup_gcc
 setup_binutils
 

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 506d43f2..05f311cf 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -159,7 +159,7 @@ setup_myemergeopts(){
 setup_binutils(){
        if [ -x /usr/bin/binutils-config ]
        then
-               my_binutils=$( cd /etc/env.d/binutils; ls ${clst_CHOST}-* | 
head -n 1 )
+               my_binutils=$( cd ${ROOT}/etc/env.d/binutils; ls 
${clst_CHOST}-* | head -n 1 )
                if [ -z "${my_binutils}" ]
                then
                        my_binutils=1
@@ -171,7 +171,7 @@ setup_binutils(){
 setup_gcc(){
        if [ -x /usr/bin/gcc-config ]
        then
-               my_gcc=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
+               my_gcc=$( cd ${ROOT}/etc/env.d/gcc; ls ${clst_CHOST}-* | head 
-n 1 )
                if [ -z "${my_gcc}" ]
                then
                        my_gcc=1