Changed make_destpath to write out ROOT to make.conf, rather than (ab)using the envir...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1353 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 7aedeac819d11beccef97ab0539a2fccf96bd546..c15d7b61794dbebc27aa856c9aa27a94049b4849 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  05 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/chroot-functions.sh:
+  Changed make_destpath to write out ROOT to make.conf, rather than (ab)using
+  the environment.
+
   05 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   targets/support/kmerge.sh:
   Added an additional make_destpath call to kmerge.sh so it'll export ROOT=/

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index de90c1b448e69ad6d470d4bbbf1158a516c6beb2..b5b7e0ee1f04d5cfaadb51952c1d0aa518aa6175 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -215,9 +215,10 @@ die() {
 make_destpath() {
        if  [ "${1}" = "" ]
        then
-               export ROOT=/
+               # ROOT is / by default, so remove any ROOT= settings from make.conf
+               sed -i '/ROOT=/d' /etc/make.conf
        else
-               export ROOT=${1}
+               echo "ROOT=\"${1}\"" >> /etc/make.conf
                if [ ! -d ${ROOT} ]
                then
                        install -d ${ROOT}