| 1 |
commit: 224c7e3ec350c4a27cd40acb3a4d346762025da1 |
| 2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 30 15:04:48 2019 +0000 |
| 4 |
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 30 15:04:48 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=224c7e3e |
| 7 |
|
| 8 |
respect ROOT |
| 9 |
|
| 10 |
fix setup_gcc and setup_binutils to respect ROOT |
| 11 |
|
| 12 |
targets/stage1/stage1-preclean-chroot.sh | 2 -- |
| 13 |
targets/support/chroot-functions.sh | 4 ++-- |
| 14 |
2 files changed, 2 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh |
| 17 |
index 1b623f18..ea9056e8 100755 |
| 18 |
--- a/targets/stage1/stage1-preclean-chroot.sh |
| 19 |
+++ b/targets/stage1/stage1-preclean-chroot.sh |
| 20 |
@@ -8,8 +8,6 @@ source /tmp/chroot-functions.sh |
| 21 |
update_env_settings |
| 22 |
show_debug |
| 23 |
|
| 24 |
-# Right now these will parse the unpacked stage3 but change things |
| 25 |
-# inside of /tmp/stage1root due to ROOT env variable |
| 26 |
setup_gcc |
| 27 |
setup_binutils |
| 28 |
|
| 29 |
|
| 30 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
| 31 |
index 506d43f2..05f311cf 100755 |
| 32 |
--- a/targets/support/chroot-functions.sh |
| 33 |
+++ b/targets/support/chroot-functions.sh |
| 34 |
@@ -159,7 +159,7 @@ setup_myemergeopts(){ |
| 35 |
setup_binutils(){ |
| 36 |
if [ -x /usr/bin/binutils-config ] |
| 37 |
then |
| 38 |
- my_binutils=$( cd /etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 ) |
| 39 |
+ my_binutils=$( cd ${ROOT}/etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 ) |
| 40 |
if [ -z "${my_binutils}" ] |
| 41 |
then |
| 42 |
my_binutils=1 |
| 43 |
@@ -171,7 +171,7 @@ setup_binutils(){ |
| 44 |
setup_gcc(){ |
| 45 |
if [ -x /usr/bin/gcc-config ] |
| 46 |
then |
| 47 |
- my_gcc=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 ) |
| 48 |
+ my_gcc=$( cd ${ROOT}/etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 ) |
| 49 |
if [ -z "${my_gcc}" ] |
| 50 |
then |
| 51 |
my_gcc=1 |
Archives